Browse Source

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

howie 2 years ago
parent
commit
6260ec92d9
1 changed files with 13 additions and 27 deletions
  1. 13 27
      src/views/supply/pickup/components/pickup_form.vue

+ 13 - 27
src/views/supply/pickup/components/pickup_form.vue

@@ -147,58 +147,44 @@
           @select-all="handleSelectAll"
         >
           <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="250" show-overflow-tooltip>
+          <template v-if="logisticsNumber === '001' && mainForm.pickupWay == 2">
+            <el-table-column align="left" label="收货客户" prop="orderTime" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
+                  v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
                   v-model="scope.row.receivingName"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 1)"
                 ></el-input>
+                <template v-else> {{ scope.row.refLinkman }}</template>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="电话" prop="orderTime" min-width="250" show-overflow-tooltip>
+            <el-table-column align="left" label="电话" prop="orderTime" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
+                  v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
                   v-model="scope.row.phone"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 2)"
                 ></el-input>
+                <template v-else>{{ scope.row.refPhone }}</template>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="收货地址" prop="orderTime" min-width="250" show-overflow-tooltip>
+            <el-table-column align="left" label="收货地址" prop="orderTime" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input
+                  v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
                   v-model="scope.row.address"
                   size="mini"
                   @input="handleInput($event, scope.row.invoiceId, 3)"
                 ></el-input>
+                <template v-else>
+                  {{ scope.row.refInstallAddress }}
+                </template>
               </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="发货申请单"