Finish Hotfix-mo-166

src/views/supply/pickup/check.vue

@@ -27,7 +27,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="11" :lg="9">
+            <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="提货人姓名" prop="name">
                 <!-- <el-input v-model="screenForm.name" placeholder="请通过手机验证获取" ></el-input> -->
                  <el-select style="width:100%" v-model="screenForm.name"  placeholder="请选提货人姓名" clearable filterable  @change="onChage">
@@ -44,9 +44,18 @@
                 <el-input v-model="screenForm.idCard" placeholder="请通过手机验证获取" readonly></el-input>
               </el-form-item>
             </el-col>
-               <el-col :xs="24" :sm="8" :lg="8">
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="经销商" prop="customerName">
-             <el-input v-model="screenForm.customerName" placeholder="经销商" readonly></el-input>
+                <el-input v-model="screenForm.customerName" placeholder="经销商" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-form-item label="仓库" prop="warehouse">
+                <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" filterable clearable style="width: 100%">
+                  <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="5" :lg="5">
@@ -232,6 +241,7 @@ import {
   getCode,
   getPickupManInfo,
   checkPassword,
+  getWarehouseList,
 } from "@/api/supply/pickup";
 import { getDealerList, getListCustomer } from "@/api/basic_data/dealer";
 
@@ -264,12 +274,14 @@ export default {
         idCard: "",
         manId: "",
         status: 0,
-        customerName:''
+        customerName: '',
+        warehouse: '',
       },
       statusList: [
         { label: "未打单", value: 0 },
         { label: "已打单", value: 1 },
       ],
+      warehouseList: [],
 
       getCodeText: "获取验证码",
       countDown: 60,
@@ -413,6 +425,16 @@ export default {
       const res = await getDealerList({ pageNum: 1, pageSize: -1 });
       this.dealerList = res.data.records;
     },
+
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then((res) => {
+        this.warehouseList = res.data.records;
+      })
+    },
     
     // 获取短信验证码
     getCode() {
@@ -482,7 +504,8 @@ export default {
         // takerId: this.screenForm.manId,
         status: this.screenForm.status,
         takerPhone: this.screenForm.phone,
-        // customerName:this.screenForm.customerName
+        // customerName:this.screenForm.customerName,
+        correspondId: this.screenForm.warehouse,
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;