Merge branch 'feature/Feature-home' into develop

src/views/supply/pickup/components/pickup_form.vue

@@ -106,6 +106,23 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
+          <template v-if="logisticsNumber === '001'">
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-form-item label="收货客户" :prop="logisticsNumber === '001' ? 'receivingName' : ''">
+                <el-input v-model="mainForm.receivingName" :disabled="flag" placeholder="请输入收货客户"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-form-item label="电话" :prop="logisticsNumber === '001' ? 'phone' : ''">
+                <el-input v-model="mainForm.phone" :disabled="flag" placeholder="请输入电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="8" :lg="8">
+              <el-form-item label="收货地址" :prop="logisticsNumber === '001' ? 'address' : ''">
+                <el-input v-model="mainForm.address" :disabled="flag" placeholder="请输入收货地址"></el-input>
+              </el-form-item>
+            </el-col>
+          </template>
           <el-col :xs="24" :sm="24" :lg="24">
             <el-form-item label="备注内容" prop="remark">
               <el-input v-model="mainForm.remark" :disabled="flag" placeholder="请输入备注内容"></el-input>
@@ -256,13 +273,19 @@ export default {
         pickupCar: '',
         company: '',
         remark: '',
-        logisticsId: ''
+        logisticsId: '',
+        receivingName: '',
+        phone: '',
+        address: ''
       },
       mainFormRules: {
         date: [{ required: true, message: '请选择预约日期', trigger: 'change' }],
         timeSlot: [{ required: true, message: '请选择预约时段', trigger: 'change' }],
         pickupWay: [{ required: true, message: '请选择提货方式', trigger: 'change' }],
-        pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }]
+        pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }],
+        receivingName: [{ required: true, message: '请填写收货客户', trigger: 'change' }],
+        phone: [{ required: true, message: '请填写电话', trigger: 'change' }],
+        address: [{ required: true, message: '请填写收货地址', trigger: 'change' }]
       },
       formLoading: false,
       tableSelection: [],
@@ -270,7 +293,8 @@ export default {
       pickupWayList: [],
       pickupManList: [],
       pickupCarList: [],
-      companyList: []
+      companyList: [],
+      logisticsNumber: ''
     }
   },
 
@@ -325,8 +349,12 @@ export default {
         this.mainForm.company = data.pickLogistics
         this.mainForm.remark = data.remark
         this.mainForm.logisticsId = data.logisticsId
-
+        this.mainForm.receivingName = data.receivingName
+        this.mainForm.phone = data.phone
+        this.mainForm.address = data.address
         this.deliverList = data.invoicePickBeans
+        const item = this.companyList.find(k => k.id === data.logisticsId)
+        this.logisticsNumber = item.logisticsNumber
       })
     },
 
@@ -378,8 +406,10 @@ export default {
       })
     },
     getLogisticsId(e) {
+      console.log(this.companyList)
       const item = this.companyList.find(k => k.id === e)
       this.mainForm.company = item.logisticsCompany
+      this.logisticsNumber = item.logisticsNumber
     },
     // 查询列表
     getDeliverList() {
@@ -473,6 +503,9 @@ export default {
       if (this.mainForm.pickupWay == '2') {
         params.pickLogistics = this.mainForm.company
         params.logisticsId = this.mainForm.logisticsId
+        params.receivingName = this.mainForm.receivingName
+        params.phone = this.mainForm.phone
+        params.address = this.mainForm.address
       }
       if (this.listItem) {
         params.id = this.listItem.id