Merge tag 'Hotfix-zh-164' into develop

Finish Hotfix-zh-164

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

@@ -37,7 +37,7 @@
             <div class="label">项目类别</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
-        <el-col :span="8" class="item">
+        <el-col :span="8" class="item" v-if="!isCustomer">
             <div class="label">文件编号</div>
             <div class="value">{{detailData.fileNo}}</div>
           </el-col>
@@ -251,6 +251,7 @@ export default {
       printType: 1,
       printId: '',
       isShowPrint: false,
+        isCustomer: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
     }
   },
 

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

@@ -57,15 +57,20 @@
           <div class="label">联系人</div>
           <div class="value">{{detailData.refLinkman}}</div>
         </el-col>
+
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
           <div class="value">{{detailData.refTel}}</div>
         </el-col>
+
         <el-col :span="8" class="item">
           <div class="label">移动电话</div>
           <div class="value">{{detailData.refPhone}}</div>
         </el-col>
-
+        <el-col :span="24" class="item" v-if="!isCustomer">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col>
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">{{detailData.refInstallAddress}}</div>
@@ -228,6 +233,7 @@ export default {
       examineForm: {
         remark: '',
       },
+        isCustomer: JSON.parse(localStorage.getItem("supply_user")).isCustomer,
     }
   },
 

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

@@ -324,7 +324,7 @@
           </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-input v-model="screenForm.enginName" placeholder="工程类别"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">

src/views/supply/engin/home_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="refTradeCategory">
+                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入项目名称"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -164,7 +164,7 @@
               </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="refTradeCategory" 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">
@@ -354,7 +354,7 @@ export default {
         orderNum: '',
         enginNum: '',
         loginNum: '',
-        enginName: '',
+        refTradeCategory: '',
         date: '',
         saleType: '',
         createMan: '',
@@ -402,7 +402,7 @@ export default {
         enginOrderNo: (ids && ids.length) ? ids.join(',') : this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
-        refProjectCategory: this.screenForm.enginName,
+        refTradeCategory: this.screenForm.refTradeCategory,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
         saleTypeId: this.screenForm.saleType,
@@ -462,7 +462,7 @@ export default {
         enginOrderNo: this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
-        refProjectCategory: this.screenForm.enginName,
+        refTradeCategory: this.screenForm.refTradeCategory,
         startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
         saleTypeId: this.screenForm.saleType,