no message

src/views/supply/engin/commerce_list.vue

@@ -176,9 +176,9 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="业务员" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">

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

@@ -398,6 +398,7 @@ export default {
         createDate: '',
         fileNum: '',
         salesMan: '',
+        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -659,6 +660,7 @@ export default {
         this.mainForm.phone = data.phone;
         this.mainForm.address = data.installAddress;
         this.mainForm.salesMan = data.serviceId;
+        this.mainForm.tradeCategory = data.tradeCategory;
 
         this.goodsList = data.items.map(item => {
           return {
@@ -799,13 +801,14 @@ export default {
             refProjectName: this.mainForm.enginName || '',
             refPromiseStatus: this.mainForm.loginType || '',
             refFactoryNo: this.mainForm.factoryNum || '',
+            refTradeCategory: this.mainForm.tradeCategory || '',
             refUseUnit: this.mainForm.company || '',
             refLinkman: this.mainForm.contactMan || '',
             refTel: this.mainForm.tel || '',
             refPhone: this.mainForm.phone || '',
             refInstallAddress: this.mainForm.address || '',
-            note2: this.mainForm.greeRemark || '',
-            note1: this.mainForm.greeReply || '',
+            geLiInerNote: this.mainForm.greeRemark || '',
+            geLiNote: this.mainForm.greeReply || '',
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,

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

@@ -331,6 +331,7 @@ export default {
         createMan: '',
         createDate: '',
         contractDate: '',
+        tradeCategory: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -432,6 +433,7 @@ export default {
         this.mainForm.createMan = data.createName;
         this.mainForm.createDate = data.createTime;
         this.mainForm.contractDate = data.contractExpireDate;
+        this.mainForm.contractDate = data.contractExpireDate;
 
         this.goodsList = data.items;
       })
@@ -661,6 +663,7 @@ export default {
             tel: this.mainForm.tel,
             remark: this.mainForm.remark,
             contractExpireDate: this.mainForm.contractDate,
+            tradeCategory: this.mainForm.tradeCategory,
             items: goodsList
           }
           if(type === 1) {

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

@@ -506,6 +506,7 @@ export default {
         salesMan: '',
         projectRemark: '',
         projectType: '',
+        tradeCategory: ''
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
@@ -766,6 +767,7 @@ export default {
         this.mainForm.declareNo = data.declareNo;
         this.mainForm.projectRemark = data.buChonShuoMing;
         this.mainForm.projectType = data.govBuyType;
+        this.mainForm.tradeCategory = data.tradeCategory;
 
         let saleTypeItem = this.salesTypeList.find(o => o.id == this.mainForm.saleType);
 
@@ -1119,13 +1121,14 @@ export default {
             saleTypeCode: saleTypeItem.saleCode,
             saleTypeName: saleTypeItem.saleName,
             geLiInerNote: this.mainForm.greeRemark || '',
-            note1: this.mainForm.greeReply || '',
+            geLiNote: this.mainForm.greeReply || '',
             remark: this.mainForm.remark || '',
             fileNo: this.mainForm.fileNum || '',
             serviceId: this.mainForm.salesMan,
             serviceName: saleManItem.nickName,
             refProjectNote: this.mainForm.projectRemark,
             refProjectType: this.mainForm.projectType,
+            refTradeCategory: this.mainForm.tradeCategory,
             items: goodsList,
           }
 

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

@@ -107,7 +107,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createName}}</div>
+          <div class="value">{{detailData.createBy}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">制单日期</div>
@@ -115,7 +115,7 @@
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeName}}</div>
+          <div class="value">{{detailData.closeBy}}</div>
         </el-col>
         <el-col :span="6" class="item">
           <div class="label">关闭日期</div>

src/views/supply/engin/engin_list.vue

@@ -138,9 +138,9 @@
                 {{scope.row.totalAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/engin/home_list.vue

@@ -96,11 +96,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             @selection-change="handleSelectionChange"
             show-summary
@@ -166,60 +166,60 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="confirmName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定申请吗？" 
-                  @onConfirm="handleSubmit(scope.row.parentId)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定申请吗？"
+                  @onConfirm="handleSubmit(scope.row.parentId)"
                   v-if="scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定撤回吗？" 
-                  @onConfirm="handleWithdraw(scope.row.parentId)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定撤回吗？"
+                  @onConfirm="handleWithdraw(scope.row.parentId)"
                   v-if="scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定弃审吗？" 
-                  @onConfirm="handleAbandon(scope.row.parentId)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定弃审吗？"
+                  @onConfirm="handleAbandon(scope.row.parentId)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-button 
-                  type="text" 
-                  @click="toForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL')">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toExamine(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
                   审批
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toReturn(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toReturn(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus !== 'FAIL'">
                   退订
                 </el-button>
-                <el-button 
-                  type="text" 
+                <el-button
+                  type="text"
                   @click="toDetail(scope.row)">
                   详情
                 </el-button>
-                <el-popconfirm 
-                  style="margin-left: 10px;" 
-                  title="确定删除吗？" 
-                  @onConfirm="handleDelete(scope.row.parentId)" 
+                <el-popconfirm
+                  style="margin-left: 10px;"
+                  title="确定删除吗？"
+                  @onConfirm="handleDelete(scope.row.parentId)"
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>