提货地址显示

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

@@ -125,8 +125,15 @@
                   v-model="scope.row.receivingName" size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 1)"></el-input>
                 <template v-else>
-                  <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+                  <template v-if="listItem">
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+                    v-model="scope.row.receivingName" size="mini"></el-input>
+                  </template>
+                  <template v-else>
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
                     v-model="scope.row.refLinkman" size="mini"></el-input>
+                  </template>
+               
                 </template>
               </template>
             </el-table-column>
@@ -136,8 +143,17 @@
                   :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
                   v-model="scope.row.phone" size="mini" @input="handleInput($event, scope.row.invoiceId, 2)"></el-input>
                 <template v-else>
-                  <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+
+                  <template v-if="listItem">
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+                    v-model="scope.row.phone" size="mini"></el-input>
+                  </template>
+                  <template v-else>
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
                     v-model="scope.row.refPhone" size="mini"></el-input>
+                  </template>
+
+               
                 </template>
               </template>
             </el-table-column>
@@ -148,8 +164,18 @@
                   v-model="scope.row.address" size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 3)"></el-input>
                 <template v-else>
-                  <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+
+                  <template v-if="listItem">
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
+                    v-model="scope.row.address" size="mini"></el-input>
+                  </template>
+                  <template v-else>
+                    <el-input :disabled="flag || ((scope.row.warehouseFlag == 0 || scope.row.warehouseFlag == null))"
                     v-model="scope.row.refInstallAddress" size="mini"></el-input>
+                  </template>
+
+
+                
                 </template>
               </template>
             </el-table-column>
@@ -440,6 +466,7 @@ export default {
             }
 
           }
+         
         })
         this.deliverList = data.invoicePickBeans
 
@@ -612,10 +639,16 @@ export default {
                   return this.$errorMsg('商家仓必须填写收货地址、电话、收货地址')
                 }
               } else {
-                if (!(el.refLinkman && el.refPhone && el.refInstallAddress)) {
+                if (this.listItem) {
+                  if (!(el.receivingName && el.phone && el.address)) {
                   return this.$errorMsg('商家仓必须填写收货地址、电话、收货地址')
-
                 }
+                } else {
+                  if (!(el.refLinkman && el.refPhone && el.refInstallAddress)) {
+                  return this.$errorMsg('商家仓必须填写收货地址、电话、收货地址')
+                }
+                }
+            
               }
 
             }
@@ -666,12 +699,17 @@ export default {
         if (!(item.orderType === 'TRADE' || item.orderType === 'HOME')) {
 
         } else {
-          if ((item.refLinkman && item.refPhone && item.refInstallAddress)) {
+          if (this.listItem) {
+            
+          }else{
+    if ((item.refLinkman && item.refPhone && item.refInstallAddress)) {
             item.receivingName = item.refLinkman
             item.phone = item.refPhone
             item.address = item.refInstallAddress
           }
 
+          }
+      
         }
         orderList.push({
           warehouseFlag: item.warehouseFlag,