Browse Source

bug更改

cz 1 year ago
parent
commit
ab8b4513f8

+ 4 - 4
src/components/PDF/contractPDF.vue

@@ -211,14 +211,14 @@
             style="width: 100px; text-align: center"
           ></div>
           <div class="contentRow" style="width: 100px; text-align: center">
-            {{ statistics("productQuantity", 2) }}
+            {{ statistics("productQuantity", 4) }}
           </div>
           <div
             class="contentRow"
             style="width: 100px; text-align: center"
           ></div>
           <div class="contentRow" style="width: 100px; text-align: center">
-            {{ statistics("amount", 2) }}
+            {{ statistics("amount", 4) }}
           </div>
         </div>
         <!-- <div v-if="printDetails.quotationPayList && printDetails.quotationPayList.length > 0">
@@ -235,7 +235,7 @@
             FREIGHT COST:
           </div>
           <div class="contentRow" style="width: 100px; text-align: center">
-            {{ statisticsTwo("amount", 2) }}
+            {{ statisticsTwo("amount", 4) }}
           </div>
         </div>
         <div class="baseRow" style="display: flex">
@@ -246,7 +246,7 @@
             TOTAL PRICE:
           </div>
           <div class="contentRow" style="width: 100px; text-align: center">
-            {{ printDetails.totalAmount }}
+            {{ moneyFormat(printDetails.totalAmount, 4) }}
           </div>
         </div>
         <div

+ 1 - 1
src/components/process/Contract.vue

@@ -825,7 +825,7 @@ const customerUserList = ref([]);
 const accountList = ref([]);
 const productUnit = ref([]);
 const openProduct = ref(false);
-const activeName = ref("");
+const activeName = ref("1");
 const formData = reactive({
   data: {
     contractType: "1",

+ 1 - 1
src/components/process/ContractAlteration.vue

@@ -749,7 +749,7 @@ const customerUserList = ref([]);
 const accountList = ref([]);
 const productUnit = ref([]);
 const openProduct = ref(false);
-const activeName = ref("");
+const activeName = ref("1");
 const formShowType = ref(false);
 const formData = reactive({
   data: {

+ 3 - 3
src/views/salesMange/saleContract/contract/index.vue

@@ -28,12 +28,12 @@
         <template #amount="{ item }">
           <div>
             <span style="padding-right: 4px">{{ item.currency }}</span>
-            <span>{{ moneyFormat(item.amount, 2) }}</span>
+            <span>{{ moneyFormat(item.amount, 4) }}</span>
           </div>
         </template>
         <template #amountCNY="{ item }">
           <div>
-            <span>{{ moneyFormat(item.amountCNY, 2) }}</span>
+            <span>{{ moneyFormat(item.amountCNY, 4) }}</span>
           </div>
         </template>
         <template #sumClaimMoney="{ item }">
@@ -42,7 +42,7 @@
               <template #reference>
                 <a
                   style="color: #409eff; cursor: pointer; word-break: break-all"
-                  >{{ moneyFormat(item.sumClaimMoney, 2) }}</a
+                  >{{ moneyFormat(item.sumClaimMoney, 4) }}</a
                 >
               </template>
               <template #default>

+ 15 - 11
src/views/salesMange/salesMange/afterSales/index.vue

@@ -58,9 +58,9 @@
       >
         <template #details>
           <div style="width: 100%">
-            <!-- <el-button type="primary" plain @click="openProduct = true">
+            <el-button type="primary" plain @click="openProduct = true">
               添加商品
-            </el-button> -->
+            </el-button>
             <el-table
               :data="formData.data.afterSalesDetailList"
               style="margin-top: 10px"
@@ -266,9 +266,9 @@ const rules = ref({
   customerId: [
     { required: true, message: "请选择客户名称", trigger: "change" },
   ],
-  contractIds: [
-    { required: true, message: "请选择销售合同", trigger: "change" },
-  ],
+  // contractIds: [
+  //   { required: true, message: "请选择销售合同", trigger: "change" },
+  // ],
   type: [{ required: true, message: "请选择售后类型", trigger: "change" }],
   remark: [{ required: true, message: "请输入售后说明", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入售后数量", trigger: "blur" }],
@@ -523,7 +523,9 @@ const config = computed(() => {
 });
 
 const formData = reactive({
-  data: {},
+  data: {
+    afterSalesDetailList: [],
+  },
   followData: {},
 });
 const formOption = reactive({
@@ -589,12 +591,13 @@ const formConfig = computed(() => {
         width: "50%",
       },
     },
-    {
-      type: "title",
-      title: "产品明细",
-    },
+    // {
+    //   type: "title",
+    //   title: "产品明细",
+    // },
     {
       type: "slot",
+      label: "产品明细",
       slotName: "details",
     },
   ];
@@ -810,6 +813,7 @@ const clickAdd = (type) => {
   contractList.value = [];
   formData.data = {
     contractIds: [],
+    afterSalesDetailList: [],
   };
   dialogVisible.value = true;
 };
@@ -839,7 +843,7 @@ const pushGoods = (goods) => {
     ) {
       afterFiltering = goods.filter((item) => {
         let data = formData.data.afterSalesDetailList.filter(
-          (itemProduct) => itemProduct.bussinessId === item.id
+          (itemProduct) => itemProduct.productId === item.id
         );
         if (data && data.length > 0) {
           return false;