Finish Hotfix-mo-108

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

@@ -21,7 +21,7 @@
           <div class="value">{{detailData.srcStockId}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录单号</div>
+          <div class="label">工程登录编号</div>
           <div class="value">{{detailData.destStockId}}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/direct/direct_list.vue

@@ -85,10 +85,10 @@
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</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="examineStatus" min-width="100" show-overflow-tooltip>

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

@@ -146,6 +146,11 @@
             <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" v-if="mainForm.examineRemark">
+          <el-form-item label="审批说明" prop="examineRemark">
+            <el-input v-model="mainForm.examineRemark" placeholder="请输入审批说明" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -405,6 +410,7 @@ export default {
         createDate: '',
         fileNum: '',
         salesMan: '',
+        examineRemark: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -592,6 +598,7 @@ export default {
         this.mainForm.createDate = data.createTime;
         this.mainForm.fileNum = data.fileNo;
         this.mainForm.salesMan = data.serviceId;
+        this.mainForm.examineRemark = data.examineNote;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -663,6 +670,7 @@ export default {
         this.mainForm.enginNum = data.enginInfoNo;
         this.mainForm.enginName = data.projectName;
         this.mainForm.loginType = data.tradeCategory;
+        this.mainForm.factoryNum = data.factoryNo;
         this.mainForm.company = data.useUnit;
         this.mainForm.enginNum = data.projectNo;
         this.mainForm.contactMan = data.linkman;

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

@@ -120,6 +120,8 @@
             {{ scope.row.totalAmount | numToFixed }}
           </template>
         </el-table-column>
+        <el-table-column align="right" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="已发货数" prop="hasDeliverQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="税率" prop="taxRate" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
@@ -207,7 +209,7 @@ export default {
       getEnginDetail({id: this.listItem.enginInfoId}).then(res => {
         if(res.data.items) {
           res.data.items.forEach(item => {
-            item.sums1 = ['qty'];
+            item.sums1 = ['qty', 'hasOrderQty', 'hasDeliverQty'];
             item.sums2 = ['totalAmount', 'price'];
           })
         }

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

@@ -162,6 +162,11 @@
             <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" v-if="mainForm.examineRemark">
+          <el-form-item label="审批说明" prop="examineRemark">
+            <el-input v-model="mainForm.examineRemark" placeholder="请输入审批说明" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -507,6 +512,7 @@ export default {
         salesMan: '',
         projectRemark: '',
         projectType: '',
+        examineRemark: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -883,6 +889,7 @@ export default {
         this.mainForm.salesMan = data.serviceId;
         this.mainForm.projectRemark = data.refProjectNote;
         this.mainForm.projectType = data.refProjectType;
+        this.mainForm.examineRemark = data.examineNote;
 
         data.items.forEach(item => {
           item.status1 = '';

src/views/supply/engin/engin_list.vue

@@ -23,8 +23,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录单号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录单号"></el-input>
+              <el-form-item label="工程登录编号" prop="loginNum">
+                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">

src/views/supply/engin/home_list.vue

@@ -23,8 +23,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录单号" prop="loginNum">
-                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录单号"></el-input>
+              <el-form-item label="工程登录编号" prop="loginNum">
+                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -125,7 +125,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录单号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>