Finish Hotfix-mo-144

src/views/supply/engin/components/commerce_examine.vue

@@ -115,10 +115,6 @@
           <div class="label">关闭日期</div>
           <div class="value">{{detailData.closeTime}}</div>
         </el-col>
-        <el-col :span="24" class="item">
-          <div class="label">审批说明</div>
-          <div class="value">{{detailData.examineNote}}</div>
-        </el-col>
       </el-row>
     </div>
 

src/views/supply/engin/components/home_form.vue

@@ -519,6 +519,7 @@ export default {
         examineRemark: '',
         refCount: '',
         regionWork: '',
+        customerId: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -906,6 +907,7 @@ export default {
         this.mainForm.examineRemark = data.examineNote;
         this.mainForm.loginUserId = data.loginUserId;
         this.mainForm.regionWork = data.refRegionWork;
+        this.mainForm.customerId = data.customerId;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -934,6 +936,7 @@ export default {
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
         price2: this.goodsScreenForm.price2,
+        customerId: this.listItem ? this.mainForm.customerId : '',
       }).then(res => {
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;

src/views/supply/sales/sales_list.vue

@@ -124,8 +124,8 @@
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" 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="correspondName" min-width="100" show-overflow-tooltip></el-table-column>