工程信息单，商用工程订单字段内容调整

src/views/basic_data/material/components/modify_list-apply.vue

@@ -63,7 +63,7 @@
                      </el-form-item>
                    </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码">
+            <el-form-item label="备注">
               <el-input size="mini" v-model="base.remark" placeholder="请输入" />
             </el-form-item>
           </el-col>

src/views/basic_data/material/components/modify_list-approval.vue

@@ -38,7 +38,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="operatorName">
+            <el-form-item label="备注" prop="operatorName">
               <el-input
                 disabled
                 placeholder="请输入"

src/views/basic_data/material/components/modify_list-detail.vue

@@ -34,7 +34,7 @@
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="operatorName">
+            <el-form-item label="备注" prop="operatorName">
               <el-input
                 disabled
                 placeholder="系统生成"

src/views/supply/engin/commerce_list.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目类别" prop="enginName">
-                <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -150,8 +150,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
+<!--            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>-->
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />

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

@@ -77,7 +77,7 @@
               <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">文件编码</div>
+              <div class="label">文件编号</div>
               <div class="value">{{detailData.fileNo}}</div>
             </el-col>
             <el-col :span="8" class="item">

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

@@ -33,7 +33,7 @@
           <div class="value">{{detailData.refEnginRecordNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">项目类别</div>
+          <div class="label">项目名称</div>
           <div class="value">{{detailData.refProjectName}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -48,10 +48,10 @@
           <div class="label">使用单位</div>
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
-        <el-col :span="8" class="item">
-          <div class="label">销售类型</div>
-          <div class="value">{{detailData.saleTypeName}}</div>
-        </el-col>
+<!--        <el-col :span="8" class="item">-->
+<!--          <div class="label">销售类型</div>-->
+<!--          <div class="value">{{detailData.saleTypeName}}</div>-->
+<!--        </el-col>-->
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
@@ -64,6 +64,10 @@
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
+        <el-col :span="8" class="item">
+          <div class="label">权限分类</div>
+          <div class="value">{{detailData.refPowerCategory}}</div>
+        </el-col>
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.refInstallAddress}}</div>
@@ -76,7 +80,7 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">文件编码</div>
+          <div class="label">文件编号</div>
           <div class="value">{{detailData.fileNo}}</div>
         </el-col>
         <el-col :span="8" class="item">
@@ -86,13 +90,13 @@
         <el-col :span="24" class="item">
           <div class="label">格力回复</div>
           <div class="value">
-            <el-input v-model="detailData.note1" placeholder="请输入格力回复"></el-input>
+            <el-input v-model="detailData.geLiNote" placeholder="请输入格力回复"></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">格力内部备注</div>
           <div class="value">
-            <el-input v-model="detailData.note2" placeholder="请输入格力内部备注"></el-input>
+            <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">

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

@@ -27,7 +27,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="业务员" prop="salesMan">
-            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" size="small" filterable clearable style="width: 100%">
+            <el-select v-model="mainForm.salesMan" placeholder="选择业务员" disabled size="small" filterable clearable style="width: 100%">
               <el-option
                 v-for="item in salesmanList"
                 :key="item.adminUserId"
@@ -65,33 +65,33 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="项目类别" prop="enginName">
-            <el-input v-model="mainForm.enginName" placeholder="请输入项目类别" disabled></el-input>
+          <el-form-item label="项目名称" prop="projectName">
+            <el-input v-model="mainForm.projectName" placeholder="请输入项目名称" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="行业类别" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入行业类别" disabled></el-input>
+            <el-input v-model="mainForm.tradeCategory" placeholder="请输入行业类别" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="跨区厂编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号" :disabled="isDealer"></el-input>
+          <el-form-item label="跨区厂编号" prop="factoryNo">
+            <el-input v-model="mainForm.factoryNo" placeholder="请输入跨区厂编号" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="使用单位" prop="company">
-            <el-input v-model="mainForm.company" placeholder="请输入使用单位" disabled></el-input>
+          <el-form-item label="使用单位" prop="useUnit">
+            <el-input v-model="mainForm.useUnit" placeholder="请输入使用单位" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程编号" prop="enginNum">
-            <el-input v-model="mainForm.enginNum" placeholder="请输入工程编号"></el-input>
+          <el-form-item label="工程编号" prop="projectNo">
+            <el-input v-model="mainForm.projectNo" placeholder="请输入工程编号" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="联系人" prop="contactMan">
-            <el-input v-model="mainForm.contactMan" placeholder="请输入联系人" disabled></el-input>
+          <el-form-item label="联系人" prop="linkman">
+            <el-input v-model="mainForm.linkman" placeholder="请输入联系人" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -105,18 +105,18 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="安装地址" prop="address">
-            <el-input v-model="mainForm.address" placeholder="请输入安装地址" disabled></el-input>
+          <el-form-item label="安装地址" prop="installAddress">
+            <el-input v-model="mainForm.installAddress" placeholder="请输入安装地址" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col v-if="!isDealer" :xs="24" :sm="24" :lg="16">
-          <el-form-item label="格力内部备注" prop="greeRemark">
-            <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
+          <el-form-item label="格力内部备注" prop="geLiInerNote">
+            <el-input v-model="mainForm.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8" v-if="!isDealer">
-          <el-form-item label="权限分类" prop="power">
-            <el-select v-model="mainForm.power" placeholder="选择权限分类" size="small" clearable style="width: 100%">
+          <el-form-item label="权限分类" prop="powerCategory">
+            <el-select v-model="mainForm.powerCategory" placeholder="选择权限分类" size="small" clearable style="width: 100%">
               <el-option
                 v-for="item in powerList"
                 :key="item.dictCode" :label="item.dictValue" :value="item.dictCode">
@@ -125,8 +125,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
-          <el-form-item label="格力回复" prop="greeReply">
-            <el-input v-model="mainForm.greeReply" placeholder="请输入格力回复"></el-input>
+          <el-form-item label="格力回复" prop="geLiNote">
+            <el-input v-model="mainForm.geLiNote" :placeholder="isDealer ? '' : '请输入格力回复'" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
@@ -152,8 +152,8 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="文件编号" prop="fileNum">
-            <el-input v-model="mainForm.fileNum" placeholder="请输入文件编号"></el-input>
+          <el-form-item label="文件编号" prop="fileNo">
+            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24" v-if="mainForm.examineRemark">
@@ -178,7 +178,7 @@
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" width="55"></el-table-column>
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>
+<!--        <el-table-column align="center" label="引用记录" prop="useRefCount" min-width="160" show-overflow-tooltip></el-table-column>-->
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
@@ -190,6 +190,7 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="已订数量" prop="hasOrderQty" min-width="80" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="!isDealer"></el-input>
@@ -273,7 +274,7 @@
 
         <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-select v-model="scope.row.serviceId" placeholder="选择业务员" size="small" clearable>
+            <el-select v-model="scope.row.serviceId" placeholder="选择业务员" disabled size="small" clearable>
               <el-option
                 v-for="item in salesmanList"
                 :key="item.adminUserId"
@@ -312,13 +313,13 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item prop="enginName">
-              <el-input v-model="screenForm.enginName" placeholder="工程项目"></el-input>
+            <el-form-item prop="projectName">
+              <el-input v-model="screenForm.projectName" placeholder="工程项目"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item prop="company">
-              <el-input v-model="screenForm.company" placeholder="使用单位"></el-input>
+            <el-form-item prop="useUnit">
+              <el-input v-model="screenForm.useUnit" placeholder="使用单位"></el-input>
             </el-form-item>
           </el-col>
 
@@ -404,38 +405,43 @@ export default {
         jxsNum: '',
         jxsName: '',
         enginOrderNum: '',
-        enginName: '',
-        loginType: '',
-        factoryNum: '',
-        company: '',
-        enginNum: '',
-        contactMan: '',
-        tel: '',
+        projectName: '',
+        projectType: '',
+        projectNote: '',
+        machineType: '',
+        useUnit: '',
+        installAddress: '',
+        projectNo: '',
+        factoryNo: '',
+        signType: '',
+        tradeCategory: '',
+        linkman: '',
         phone: '',
-        address: '',
-        greeRemark: '',
-        greeReply: '',
+        tel: '',
+        declareNo: '',
+        powerCategory: '',
+        geLiNote: '',
+        geLiInerNote: '',
         remark: '',
         createMan: '',
         createDate: '',
-        fileNum: '',
+        fileNo: '',
         salesMan: '',
         examineRemark: '',
-        power: '',
       },
       mainFormRules: {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
         enginOrderNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
-        // enginName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
-        // loginType: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
-        company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
-        // contactMan: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+        // projectName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
+        // tradeCategory: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
+        useUnit: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],
+        // linkman: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
         // tel: [{ required: true, message: '请输入固定电话', trigger: 'blur' }],
         // phone: [{ required: true, message: '请输入移动电话', trigger: 'blur' }],
-        address: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
-        enginNum: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
+        installAddress: [{ required: true, message: '请输入安装地址', trigger: 'blur' }],
+        projectNo: [{ required: true, message: '请输入工程编号', trigger: 'blur' }],
       },
       // typeList: [],
       stockList: [],
@@ -446,8 +452,8 @@ export default {
       isShowDialog: false, // 工程登录列表 - 弹窗
       screenForm: {
         enginNum: '',
-        enginName: '',
-        company: '',
+        projectName: '',
+        useUnit: '',
       },
       dialogTable_dataList: null, // 工程登录列表 - 列表数据
       dialogTable_listLoading: true, // 工程登录列表 - 列表加载loading
@@ -593,25 +599,28 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.enginOrderNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
-        this.mainForm.loginType = data.refTradeCategory;
-        this.mainForm.factoryNum = data.refFactoryNo;
-        this.mainForm.company = data.refUseUnit;
-        this.mainForm.enginNum = data.refProjectNo;
-        this.mainForm.saleType = data.saleTypeId;
-        this.mainForm.contactMan = data.refLinkman;
-        this.mainForm.tel = data.refTel;
+        this.mainForm.projectName = data.refProjectName;
+        this.mainForm.projectType = data.refProjectType;
+        this.mainForm.projectNote = data.refProjectNote;
+        this.mainForm.machineType = data.refMachineType;
+        this.mainForm.useUnit = data.refUseUnit;
+        this.mainForm.installAddress = data.refInstallAddress;
+        this.mainForm.projectNo = data.refProjectNo;
+        this.mainForm.factoryNo = data.refFactoryNo;
+        this.mainForm.signType = data.refPromiseStatus;
+        this.mainForm.tradeCategory = data.refTradeCategory;
+        this.mainForm.linkman = data.refLinkman;
         this.mainForm.phone = data.refPhone;
-        this.mainForm.address = data.refInstallAddress;
-        this.mainForm.greeRemark = data.geLiInerNote;
-        this.mainForm.greeReply = data.geLiNote;
+        this.mainForm.tel = data.refTel;
+        this.mainForm.geLiInerNote = data.geLiInerNote;
+        this.mainForm.geLiNote = data.geLiNote;
         this.mainForm.remark = data.remark;
         this.mainForm.createMan = data.createBy;
         this.mainForm.createDate = data.createTime;
-        this.mainForm.fileNum = data.fileNo;
+        this.mainForm.fileNo = data.fileNo;
         this.mainForm.salesMan = data.serviceId;
         this.mainForm.examineRemark = data.examineNote;
-        this.mainForm.power = data.refPowerCategory;
+        this.mainForm.powerCategory = data.refPowerCategory;
 
         data.items.forEach(item => {
           item.status1 = '';
@@ -633,8 +642,8 @@ export default {
         pageNum: this.dialogTable_currentPage,
         pageSize: this.dialogTable_pageSize,
         enginInfoNo: this.screenForm.enginNum,
-        projectName: this.screenForm.enginName,
-        useUnit: this.screenForm.company,
+        projectName: this.screenForm.projectName,
+        useUnit: this.screenForm.useUnit,
         examineStatus: 'OK'
       }).then(res => {
         this.dialogTable_dataList = res.data.records;
@@ -680,20 +689,24 @@ export default {
         this.isShowDialog = false;
         let data = res.data;
         this.mainForm.enginOrderNum = 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;
+        this.mainForm.projectName = data.projectName;
+        this.mainForm.projectType = data.projectType;
+        this.mainForm.projectNote = data.projectNote;
+        this.mainForm.projectNo = data.projectNo;
+        this.mainForm.machineType = data.machineType;
+        this.mainForm.useUnit = data.useUnit;
+        this.mainForm.tradeCategory = data.tradeCategory;
+        this.mainForm.signType = data.enginSignType
+        this.mainForm.factoryNo = data.enginFactoryNo;
+        this.mainForm.linkman = data.linkman;
         this.mainForm.tel = data.tel;
         this.mainForm.phone = data.phone;
-        this.mainForm.address = data.installAddress;
+        this.mainForm.installAddress = data.installAddress;
         this.mainForm.salesMan = data.serviceId;
-        this.mainForm.power = data.powerCategory;
+        this.mainForm.powerCategory = data.powerCategory;
         this.mainForm.remark = data.remark;
-        this.mainForm.greeRemark = data.geLiInerNote;
-        this.mainForm.greeReply = data.geLiNote;
+        this.mainForm.geLiInerNote = data.geLiInerNote;
+        this.mainForm.geLiNote = data.geLiNote;
 
         this.goodsList = data.items.map(item => {
           return {
@@ -712,7 +725,7 @@ export default {
             historyHasDeliverQty: item.hasDeliverQty,
             unit: item.unit,
             price: item.price,
-            qty: item.qty,
+            qty: item.qty - item.hasOrderQty,
             customerWalletId2: '',
             rebateRate: '',
             discAmount: '',
@@ -720,6 +733,7 @@ export default {
             isDirectTransfer: false,
             directTransferQty: '',
             hasSendQty: '',
+            hasOrderQty: item.hasOrderQty,
             remark: item.remark,
             tax: item.taxRate,
             status1: '',
@@ -848,22 +862,26 @@ export default {
             // orderDate: this.mainForm.orderDate,
             // mainId: this.mainForm.type || '',
             refEnginRecordNo: this.mainForm.enginOrderNum || '',
-            refProjectName: this.mainForm.enginName || '',
-            refTradeCategory: this.mainForm.loginType || '',
-            refFactoryNo: this.mainForm.factoryNum || '',
-            refUseUnit: this.mainForm.company || '',
-            refProjectNo: this.mainForm.enginNum || '',
-            refLinkman: this.mainForm.contactMan || '',
-            refTel: this.mainForm.tel || '',
+            refProjectName: this.mainForm.projectName || '',
+            refProjectType: this.mainForm.projectType || '',
+            refProjectNote: this.mainForm.projectNote || '',
+            refUseUnit: this.mainForm.useUnit || '',
+            refInstallAddress: this.mainForm.installAddress || '',
+            refProjectNo: this.mainForm.projectNo || '',
+            refFactoryNo: this.mainForm.factoryNo || '',
+            refPromiseStatus: this.mainForm.signType || '',
+            refTradeCategory: this.mainForm.tradeCategory || '',
+            refLinkman: this.mainForm.linkman || '',
             refPhone: this.mainForm.phone || '',
-            refInstallAddress: this.mainForm.address || '',
-            geLiInerNote: this.mainForm.greeRemark || '',
-            geLiNote: this.mainForm.greeReply || '',
+            refTel: this.mainForm.tel || '',
+            refPowerCategory: this.mainForm.powerCategory,
+            refMachineType: this.mainForm.machineType,
+            geLiInerNote: this.mainForm.geLiInerNote || '',
+            geLiNote: this.mainForm.geLiNote || '',
             remark: this.mainForm.remark || '',
-            fileNo: this.mainForm.fileNum || '',
+            fileNo: this.mainForm.fileNo || '',
             serviceId: this.mainForm.salesMan,
             serviceName: saleManItem ? saleManItem.nickName : goodsList[0].serviceName,
-            refPowerCategory: this.mainForm.power,
             items: goodsList,
           }
           if(type === 1) {

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

@@ -69,7 +69,7 @@
           <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">文件编码</div>
+          <div class="label">文件编号</div>
           <div class="value">{{detailData.fileNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -151,7 +151,7 @@
         <el-row :gutter="0">
           <el-col :span="12" class="item">
             <div class="label">审批人</div>
-            <div class="value">{{detailData.confirmName}}</div>
+            <div class="value">{{detailData.confirmBy}}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">审批结果</div>

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

@@ -150,7 +150,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="格力回复" prop="greeReply">
-            <el-input v-model="mainForm.greeReply" placeholder="请输入格力回复"></el-input>
+            <el-input v-model="mainForm.greeReply" :placeholder="isDealer ? '' : '请输入格力回复'" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">

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

@@ -38,7 +38,7 @@
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">项目类别</div>
-              <div class="value">{{detailData.refProjectName}}</div>
+              <div class="value">{{detailData.refProjectCategory}}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">行业类别</div>
@@ -77,7 +77,7 @@
               <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">文件编码</div>
+              <div class="label">文件编号</div>
               <div class="value">{{detailData.fileNo}}</div>
             </el-col>
             <el-col :span="8" class="item">

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

@@ -35,7 +35,7 @@
         <el-col :span="8" class="item">
           <div class="label">项目类别</div>
           <div class="value">
-            <el-input v-model="detailData.refProjectName" placeholder="请输入项目类别"></el-input>
+            <el-input v-model="detailData.refProjectCategory" placeholder="请输入项目类别"></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">

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

@@ -882,7 +882,7 @@ export default {
         this.mainForm.jxsNum = data.customerNumber;
         this.mainForm.jxsName = data.customerName;
         this.mainForm.loginNum = data.refEnginRecordNo;
-        this.mainForm.enginName = data.refProjectName;
+        this.mainForm.enginName = data.refProjectCategory;
         this.mainForm.loginType = data.refTradeCategory;
         this.mainForm.promiseStatus = data.refPromiseStatus;
         this.mainForm.factoryNum = data.refFactoryNo;
@@ -1131,7 +1131,7 @@ export default {
             enginOrderId: this.mainForm.orderNum,
             loginUserId: this.mainForm.loginUserId,
             refEnginRecordNo: this.mainForm.loginNum || '',
-            refProjectName: this.mainForm.enginName || '',
+            refProjectCategory: this.mainForm.enginName || '',
             refTradeCategory: this.mainForm.loginType || '',
             refPromiseStatus: this.mainForm.promiseStatus || '',
             refFactoryNo: this.mainForm.factoryNum || '',

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

@@ -34,7 +34,7 @@
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">项目类别</div>
-          <div class="value">{{detailData.refProjectName}}</div>
+          <div class="value">{{detailData.refProjectCategory}}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">行业类别</div>
@@ -69,7 +69,7 @@
           <div class="value">{{detailData.takeDeposit ? '是':'否'}}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">文件编码</div>
+          <div class="label">文件编号</div>
           <div class="value">{{detailData.fileNo}}</div>
         </el-col>
         <el-col :span="8" class="item">

src/views/supply/engin/engin_list.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="项目类别" prop="enginName">
-                <el-input v-model="screenForm.enginName" placeholder="请输入项目类别"></el-input>
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -144,7 +144,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="使用单位" prop="useUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="安装地址" prop="installAddress" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>

src/views/supply/engin/home_list.vue

@@ -401,7 +401,7 @@ export default {
         enginOrderNo: (ids && ids.length) ? ids.join(',') : this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
-        refProjectName: this.screenForm.enginName,
+        refProjectCategory: this.screenForm.enginName,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
         saleTypeId: this.screenForm.saleType,
@@ -461,7 +461,7 @@ export default {
         enginOrderNo: this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
-        refProjectName: this.screenForm.enginName,
+        refProjectCategory: this.screenForm.enginName,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
         saleTypeId: this.screenForm.saleType,