Merge branch 'hotfix/Hotfix-zh-309' into develop

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

@@ -148,7 +148,7 @@
         >
           <el-table-column align="center" type="selection" width="55"></el-table-column>
           <template v-if="mainForm.pickupWay == 2 && logisticsNumber == '001'">
-            <el-table-column align="left" label="收货客户" prop="orderTime" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="收货客户" prop="orderTime" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.receivingName"
@@ -157,7 +157,7 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="电话" prop="orderTime" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="电话" prop="orderTime" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.phone"
@@ -166,7 +166,7 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="收货地址" prop="orderTime" min-width="200" show-overflow-tooltip>
+            <el-table-column align="left" label="收货地址" prop="orderTime" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.address"
@@ -176,6 +176,29 @@
               </template>
             </el-table-column>
           </template>
+          <el-table-column align="left" label="收货客户" prop="refLinkman" min-width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{
+                scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME' ? scope.row.refLinkman : ''
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="电话" prop="refPhone" min-width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{
+                scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME' ? scope.row.refPhone : ''
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="收货地址" prop="refInstallAddress" min-width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{
+                scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'
+                  ? scope.row.refInstallAddress
+                  : ''
+              }}
+            </template>
+          </el-table-column>
           <el-table-column
             align="left"
             label="发货申请单"