Merge remote-tracking branch 'origin/develop' into develop

src/views/supply/apply/components/engin_examine.vue

@@ -133,9 +133,9 @@
             <el-input v-model="scope.row.approvalNumber" size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small"></el-input>
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -160,7 +160,7 @@
         </el-col>
       </el-row>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer">
         <el-button type="primary" @click="clickSubmitForm('OK')">审批通过</el-button>
@@ -333,4 +333,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/apply/components/engin_return_form.vue

@@ -160,9 +160,9 @@
             </el-select>
           </template>
         </el-table-column> -->
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small"></el-input>
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
@@ -172,7 +172,7 @@
         </el-table-column>
       </el-table>
     </div>
-    
+
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
@@ -260,7 +260,11 @@
           <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="140" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="销售出库单号" prop="id" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip>
+             <template slot-scope="scope">
+           {{scope.row.orderType === 'TRADE' || scope.row.orderType === 'HMOE' ? scope.row.enginOrderNo : scope.row.mainOrderId}}
+           </template>
+          </el-table-column>
           <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
@@ -300,7 +304,7 @@
           </div>
         </div>
       </div>
-      
+
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
         <el-button type="primary" @click="submitAddGoods">确 定</el-button>
@@ -389,7 +393,7 @@ export default {
       typeList: [],
       stockList: [],
       categoryList: [],
-      
+
       tableGoodsList: [],
       tableSelection: [],
       isFirst: false,
@@ -827,4 +831,4 @@ export default {
       padding-left: 10px;
     }
   }
-</style>
+</style>

src/views/supply/deliver/components/sum_print.vue

@@ -126,6 +126,8 @@ export default {
   .detail-container {
     width: 100%;
     margin-bottom: 50px;
+    font-family: "Microsoft YaHei",system-ui ,"Avenir", Helvetica, Arial, sans-serif;
+    color: #000;
   }
   .top-container {
     margin-bottom: 20px;