Explorar o código

Merge tag 'Hotfix-mo-146' into develop

Finish Hotfix-mo-146
莫绍宝 %!s(int64=3) %!d(string=hai) anos
pai
achega
c4797b0f5c

+ 2 - 2
src/views/supply/pickup/check.vue

@@ -104,8 +104,8 @@
             </el-table-column>
             <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.orderType == 'HOME' ? scope.row.enginOrderNo: scope.row.mainOrderId" />
-                <span>{{ scope.row.orderType == 'HOME' ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
+                <CopyButton :copyText="scope.row.orderType == 'TRADE' ? scope.row.enginOrderNo: scope.row.mainOrderId" />
+                <span>{{ scope.row.orderType == 'TRADE' ? scope.row.enginOrderNo: scope.row.mainOrderId }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="130" show-overflow-tooltip>

+ 2 - 2
src/views/supply/pickup/pickup_list.vue

@@ -96,8 +96,8 @@
             </el-table-column>
             <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.mainOrderId" />
-                <span>{{scope.row.mainOrderId}}</span>
+                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
+                <span>{{scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>