Merge tag 'Hotfix-zh-180' into develop

Finish Hotfix-zh-180

src/views/finance/rebate_form.vue

@@ -284,7 +284,7 @@ export default {
       const formData = new FormData();
       formData.append("file", file);
 
-      let result = await handleImport("/rebate/order/import/data", formData);
+      let result = await handleImport("/rebate/order/import", formData);
 
       this.importFileList = [];
       if (result.code == 200) {

src/views/supply/pickup/check.vue

@@ -276,6 +276,7 @@ export default {
         status: 0,
         customerName: '',
         warehouse: '',
+        customerId:''
       },
       statusList: [
         { label: "未打单", value: 0 },
@@ -463,6 +464,7 @@ export default {
         this.screenForm.idCard = res.data[0].identity;
         this.screenForm.manId = res.data[0].id;
         this.screenForm.customerName = res.data[0].customerName
+        this.screenForm.customerId = res.data[0].customerId
         this.userList = res.data
         this.getListCustomer()
       });
@@ -476,6 +478,7 @@ export default {
         this.screenForm.idCard = userInfo[0].identity;
         this.screenForm.manId = userInfo[0].id;
         this.screenForm.customerName = userInfo[0].customerName
+        this.screenForm.customerId = userInfo[0].customerId
     },
 
     getListCustomer(){
@@ -492,13 +495,14 @@ export default {
 
     // 查询列表
     getList() {
+
+      console.log(this.screenForm.customerId);
       if (!this.screenForm.manId) {
         return this.$errorMsg("请先查询提货人信息");
       }
       if (!this.screenForm.warehouse) {
         return this.$errorMsg("请选择仓库");
       }
-
       this.listLoading = true;
 
       let params = {
@@ -509,6 +513,7 @@ export default {
         takerPhone: this.screenForm.phone,
         // customerName:this.screenForm.customerName,
         correspondId: this.screenForm.warehouse,
+        customerId:this.screenForm.customerId
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;