【修改】bug

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

@@ -28,12 +28,16 @@
               <div class="label">经销商编码</div>
               <div class="value">{{detailData.customerNumber}}</div>
             </el-col>
-            <el-col :span="16" class="item">
+            <el-col :span="8" class="item">
               <div class="label">经销商名称</div>
               <div class="value">{{detailData.customerName}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程信息单号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
+              <div class="label">工程订单号</div>
               <div class="value">{{detailData.refEnginRecordNo}}</div>
             </el-col>
             <el-col :span="8" class="item">

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

@@ -24,12 +24,16 @@
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="8" class="item">
           <div class="label">经销商名称</div>
           <div class="value">{{detailData.customerName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程信息编号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -9,7 +9,7 @@
     <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="110px" size="small" label-position="right">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程订单" prop="orderNum">
+          <el-form-item label="工程订单号" prop="orderNum">
             <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" disabled></el-input>
           </el-form-item>
         </el-col>

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

@@ -24,12 +24,16 @@
           <div class="label">经销商编码</div>
           <div class="value">{{detailData.customerNumber}}</div>
         </el-col>
-        <el-col :span="16" class="item">
+        <el-col :span="8" class="item">
           <div class="label">经销商名称</div>
           <div class="value">{{detailData.customerName}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程信息编号</div>
+              <div class="label">机型类别</div>
+              <div class="value">{{detailData.refMachineType}}</div>
+            </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">工程订单号</div>
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/engin/engin_list.vue

@@ -130,7 +130,7 @@
                 {{scope.row.examineStatus | statusFilter}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程信息单号" sortable prop="enginInfoNo" min-width="150" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <span>{{scope.row.enginInfoNo}}</span>

src/views/supply/implement/nsales_list.vue

@@ -146,7 +146,17 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="推送状态" prop="syncStatus">
+                <el-select v-model="screenForm.syncStatus" clearable filterable>
+                  <el-option label="未推送" :value="0"> </el-option>
+                  <el-option label="推送成功" :value="1"> </el-option>
+                  <el-option label="失败推送" :value="-1"> </el-option>
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"
@@ -184,6 +194,18 @@
             <!-- <el-table-column align="center" type="selection" width="55"></el-table-column>-->
             <el-table-column
               align="left"
+              label="推送状态"
+              prop="syncStatus"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
+            >
+              <template slot-scope="scope">
+                {{ scope.row.syncStatus ==0 ?"未推送": scope.row.syncStatus ==1 ?"推送成功": "失败推送" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="100"
@@ -551,6 +573,7 @@ export default {
         printTime: "",
         mainOrderId: "",
         printDesc: null,
+        syncStatus:'',
         id: "",
       },
       statusList: [
@@ -616,6 +639,7 @@ export default {
         correspondName: this.screenForm.warehouse,
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        syncStatus:this.screenForm.syncStatus,
         approvalStartTime: this.screenForm.approval
           ? this.screenForm.approval[0]
           : "",
@@ -659,6 +683,8 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondName: this.screenForm.warehouse,
+        syncStatus:this.screenForm.syncStatus,
+
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         approvalStartTime: this.screenForm.approval

src/views/supply/sales/sales_list.vue

@@ -158,6 +158,16 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="推送状态" prop="syncStatus">
+                <el-select v-model="screenForm.syncStatus" clearable filterable>
+                  <el-option label="未推送" :value="0"> </el-option>
+                  <el-option label="推送成功" :value="1"> </el-option>
+                  <el-option label="失败推送" :value="-1"> </el-option>
+
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -218,6 +228,18 @@
             ></el-table-column>
             <el-table-column
               align="left"
+              label="推送状态"
+              prop="syncStatus"
+              min-width="100"
+              show-overflow-tooltip
+              sortable
+            >
+              <template slot-scope="scope">
+                {{ scope.row.syncStatus ==0 ?"未推送": scope.row.syncStatus ==1 ?"推送成功": "失败推送" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="left"
               label="状态"
               prop="examineStatus"
               min-width="100"
@@ -594,6 +616,7 @@ export default {
         approval: "",
         printTime: "",
         printDesc: null,
+        syncStatus:'',
         id: "",
       },
       statusList: [
@@ -664,6 +687,8 @@ export default {
         correspondId: this.screenForm.warehouse.join(","),
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        syncStatus:this.screenForm.syncStatus,
+
         approvalStartTime: this.screenForm.approval
           ? this.screenForm.approval[0]
           : "",
@@ -719,6 +744,8 @@ export default {
         materialNumber: this.screenForm.chNum,
         specification: this.screenForm.model,
         correspondId: this.screenForm.warehouse.join(","),
+        syncStatus:this.screenForm.syncStatus,
+
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         approvalStartTime: this.screenForm.approval