bug修改

src/views/salesMange/saleContract/contract/index.vue

@@ -600,45 +600,45 @@ onMounted(() => {
   getList();
 })
 const getTotal = () => {
-  proxy.get("/contract/getHeadCustomerStatistics",sourceList.value.pagination).then((res) => {
+  proxy.post("/contract/getHeadCustomerStatistics",sourceList.value.pagination).then((res) => {
     statConfig.value[0].data = [];
     statConfig.value[0].data.push({
       label: "合计",
       data: [
         {
           label: "数量",
-          num: res.data.sumQuantity,
+          num: res.sumQuantity,
           color: "rgb(171 0 255)",
         },
         {
           label: "金额",
-          num: res.data.sumArrivalAmount,
+          num: res.sumArrivalAmount,
           color: "rgb(171 0 255)",
         },
         {
           label: "到账金额",
-          num: res.data.sumAmount,
+          num: res.sumAmount,
           color: "rgb(171 0 255)",
         },
       ],
     });
-    for (let i = 0; i < res.data.list.length; i++) {
+    for (let i = 0; i < res.list.length; i++) {
       statConfig.value[0].data.push({
-        label: res.data.list[i].sellCorporationName,
+        label: res.list[i].sellCorporationName,
         data: [
           {
             label: "数量",
-            num: res.data.list[i].sumQuantity,
+            num: res.list[i].sumQuantity,
             color: "blue",
           },
           {
             label: "金额",
-            num: res.data.list[i].sumAmount,
+            num: res.list[i].sumAmount,
             color: "blue",
           },
           {
             label: "到账金额",
-            num: res.data.list[i].sumClaimMoney,
+            num: res.list[i].sumClaimMoney,
             color: "blue",
           },
         ],

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -610,42 +610,39 @@ const changeExchangeRate = (row) => {
   openChange.value = true;
   if (row.currencyRateJson) {
     let currencyRateJson = JSON.parse(row.currencyRateJson);
-    formChangeData.data.list = formChangeData.data.list.map((item) => {
-      for (let i = 0; i < currencyRateJson.length; i++) {
-        if (item.type === currencyRateJson[i].type) {
-          item.rate = currencyRateJson[i].rate;
+    //row.currencyList和currencyRateJson进行匹配
+    for (let i = 0; i < row.currencyList.length; i++) {
+      const element = row.currencyList[i];
+      for (let j = 0; j < currencyRateJson.length; j++) {
+        const jelement = currencyRateJson[j];
+        if(element.id == jelement.id){
+          element.rate = jelement.rate;
           break;
         }
       }
-      return {
-        ...item,
-      };
-    });
+    }
+    
+    formChangeData.data.list = row.currencyList
+    // formChangeData.data.list = formChangeData.data.list.map((item) => {
+    //   for (let i = 0; i < currencyRateJson.length; i++) {
+    //     if (item.type === currencyRateJson[i].type) {
+    //       item.rate = currencyRateJson[i].rate;
+    //       break;
+    //     }
+    //   }
+    //   return {
+    //     ...item,
+    //   }; 
+    // });
+    console.log(row.currencyList)
     loadingDialog.value = false;
   } else {
-    proxy.post("/currencyRate/list", {}).then(
-      (res) => {
-        if (res && res.length > 0 && formChangeData.data.list.length > 0) {
-          formChangeData.data.list = formChangeData.data.list.map((item) => {
-            for (let i = 0; i < res.length; i++) {
-              if (item.type === res[i].type) {
-                item.rate = res[i].rate;
-                break;
-              }
-            }
-            return {
-              ...item,
-            };
-          });
-        }
-        loadingDialog.value = false;
-      },
-      (err) => {
-        console.log(err);
-        loadingDialog.value = false;
-      }
-    );
+    formChangeData.data = {
+      id: row.contractId,
+      list: row.currencyList,
+    };
   }
+  loadingDialog.value = false
 };
 const submitChangeForm = () => {
   change.value.handleSubmit(() => {