fix: 订单号显示

src/views/supply/implement/components/sales_detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
+    <el-page-header content="详情" @back="goBack" />
 
     <div id="printMe">
       <div class="main-title">
@@ -54,9 +54,9 @@
           show-summary
           :summary-method="$getSummaries"
         >
-          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
-            <template slot-scope="scope">
+          <el-table-column align="center" label="序号" type="index" width="50" />
+          <el-table-column align="center" label="销售订单号" min-width="180" show-overflow-tooltip>
+            <template v-if=" scope.row" slot-scope="scope">
               {{
                 scope.row.orderType == 'TRADE' || scope.row.orderType == 'HOME'
                   ? scope.row.enginOrderNo
@@ -70,42 +70,42 @@
             prop="materialCode"
             min-width="120"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="产品编码"
             prop="materialOldNumber"
             min-width="120"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="产品名称"
             prop="materialName"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="规格型号"
             prop="specification"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="单位"
             prop="unit"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="right"
             label="数量"
             prop="refundableQty"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
@@ -122,7 +122,7 @@
             prop="headerRemark"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column
             align="left"
@@ -130,14 +130,14 @@
             prop="invoiceRemark"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="left"
             label="业务员"
             prop="serviceName"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
         </el-table>
       </div>
 
@@ -175,7 +175,6 @@ import { getDetail } from '@/api/supply/sales'
 export default {
   name: 'SalesDetail',
   componentName: 'SalesDetail',
-  props: ['listItem'],
   directives: {
     print
   },
@@ -187,10 +186,11 @@ export default {
         { label: '审核通过', value: 'OK' }
         // { label: '审核驳回', value: 'FAIL' },,
       ]
-      let obj = statusList.find(o => o.value == val)
+      const obj = statusList.find(o => o.value == val)
       return obj ? obj.label : ''
     }
   },
+  props: ['listItem'],
   data() {
     return {
       printObj: {

src/views/supply/implement/components/sales_return_form.vue

@@ -279,9 +279,9 @@
             min-width="120"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip
+          <el-table-column align="left" label="订单号"  min-width="120" show-overflow-tooltip
             >、
-            <template slot-scope="scope">
+            <template v-if=" scope.row" slot-scope="scope">
               {{
                 scope.row.orderType == 'TRADE' || scope.row.orderType == 'HOME'
                   ? scope.row.enginOrderNo

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

@@ -294,8 +294,8 @@
               {{ scope.row.orderTime | dateToDayFilter }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
+          <el-table-column align="left" label="销售订单号" min-width="160" show-overflow-tooltip>
+            <template v-if="scope.row" slot-scope="scope">
               <CopyButton
                 :copy-text="
                   scope.row.orderType === 'TRADE' ||
@@ -307,10 +307,10 @@
                 "
               />
               <span>{{
-                scope.row.orderType === 'TRADE' ||
+                (scope.row.orderType === 'TRADE' ||
                   scope.row.orderType === 'HOME' ||
                   scope.row.orderType === 'REQUISITION_TRADE' ||
-                  scope.row.orderType === 'REQUISITION_HOME'
+                  scope.row.orderType === 'REQUISITION_HOME')
                   ? scope.row.enginOrderNo
                   : scope.row.mainOrderId
               }}</span>
@@ -533,8 +533,8 @@ export default {
         }
       },
       visible: false,
-      logisticsVisible:false,
-      outboundVisible:false,
+      logisticsVisible: false,
+      outboundVisible: false,
       orderId: '',
       logisticsDetail: [],
       frontPickType: null,
@@ -1184,7 +1184,7 @@ export default {
           {
             param: 'order_code',
             compare: '=',
-            value: row.invoiceId 
+            value: row.invoiceId
           }
         ]
       }).then(res => {
@@ -1204,7 +1204,7 @@ export default {
           {
             param: 'order_number',
             compare: '=',
-            value: row.invoiceId 
+            value: row.invoiceId
           }
         ]
       }).then(res => {

src/views/supply/sales/components/sales_return_form.vue

@@ -292,9 +292,9 @@
             min-width="120"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip
+          <el-table-column align="left" label="订单号"  min-width="120" show-overflow-tooltip
             >、
-            <template slot-scope="scope">
+            <template v-if=" scope.row" slot-scope="scope">
               {{
                 scope.row.orderType == 'TRADE' || scope.row.orderType == 'HOME'
                   ? scope.row.enginOrderNo