Merge tag 'Hotfix-104' into develop

Finish Hotfix-104

src/views/finance/rebate_form.vue

@@ -280,53 +280,49 @@ export default {
     async handleImport(param) {
       this.listLoading = true;
       const file = param.file;
-
       const formData = new FormData();
       formData.append("file", file);
-
       let result = await handleImport("/rebate/order/import", formData);
-
       this.importFileList = [];
       if (result.code == 200) {
-        let Arr = result.data.items;
-        let list = [];
+        // let Arr = result.data.items;
+        // let list = [];
 
-        for (let v = 0; v < Arr.length; v++) {
-          let arr = await getWalletCustomerList({
-            customerId: Arr[v].customerId,
-            type: "REBATE",
-          });
+        // for (let v = 0; v < Arr.length; v++) {
+        //   let arr = await getWalletCustomerList({
+        //     customerId: Arr[v].customerId,
+        //     type: "REBATE",
+        //   });
 
-          list.push({
-            customerId: Arr[v].customerId,
-            customerNumber: Arr[v].customerNumber,
-            customerName: Arr[v].customerName,
-            customerWalletId: Arr[v].customerWalletId,
-            amount: Arr[v].amount,
-            withholdAmount: Arr[v].withholdAmount,
-            policyFileNo: Arr[v].policyFileNo,
-            policyDocNo: Arr[v].policyDocNo,
-            policyYear: Arr[v].policyYear,
-            policyMonth: Arr[v].policyMonth,
-            policyOrg: Arr[v].policyOrg,
-            customerArea: Arr[v].customerArea,
-            customerAttr: Arr[v].customerAttr,
-            rewardActualCustomers: Arr[v].rewardActualCustomers,
-            remark1: Arr[v].remark1,
-            remark2: Arr[v].remark2,
-            walletName: Arr[v].walletName,
-            walletList: arr.data,
-          });
-        }
-        let aa = [...this.dataList, ...list];
+        //   list.push({
+        //     customerId: Arr[v].customerId,
+        //     customerNumber: Arr[v].customerNumber,
+        //     customerName: Arr[v].customerName,
+        //     customerWalletId: Arr[v].customerWalletId,
+        //     amount: Arr[v].amount,
+        //     withholdAmount: Arr[v].withholdAmount,
+        //     policyFileNo: Arr[v].policyFileNo,
+        //     policyDocNo: Arr[v].policyDocNo,
+        //     policyYear: Arr[v].policyYear,
+        //     policyMonth: Arr[v].policyMonth,
+        //     policyOrg: Arr[v].policyOrg,
+        //     customerArea: Arr[v].customerArea,
+        //     customerAttr: Arr[v].customerAttr,
+        //     rewardActualCustomers: Arr[v].rewardActualCustomers,
+        //     remark1: Arr[v].remark1,
+        //     remark2: Arr[v].remark2,
+        //     walletName: Arr[v].walletName,
+        //     walletList: arr.data,
+        //   });
+        // }
+        // let aa = [...this.dataList, ...list];
 
-        this.dataList = aa;
+        // this.dataList = aa;
         this.$message.success("导入成功");
-        this.listLoading = false;
       } else {
         this.$message.error(result.message);
-        // this.$message.error(1231);
       }
+      this.listLoading = false;
     },
     //下载模板
     async downLoadFn() {