fix: 工装、家装、跨区调整

src/views/commercialEngineering/components/base.vue

@@ -52,7 +52,7 @@
           </el-col>
         </template>
         <el-col :xs="24" :sm="12" :lg="12" class="item">
-          <div class="label">{{ ['cross'].includes(pageType) ? '业务员所在区域' : '项目所在区域' }}*：</div>
+          <div class="label">{{ ['cross'].includes(pageType) ? '业务所在区域' : '项目所在区域' }}*：</div>
           <div class="value">
             <el-select v-model="formData.projectArea" placeholder="请选择" clearable filterable>
               <el-option
@@ -109,19 +109,19 @@
           </div>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8" class="item">
-          <div class="label">经销商联系人：</div>
+          <div class="label">经销商联系人*：</div>
           <div class="value">
             <el-input v-model="formData.customerLinkName" placeholder="请填写" size="mini" clearable />
           </div>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8" class="item">
-          <div class="label">经销商联系电话：</div>
+          <div class="label">经销商联系电话*：</div>
           <div class="value">
             <el-input v-model="formData.customerLinkMobile" maxlength="11" placeholder="请填写" size="mini" clearable />
           </div>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8" class="item">
-          <div class="label">经销商办公地址：</div>
+          <div class="label">经销商办公地址*：</div>
           <div class="value">
             <el-input v-model="formData.customerAddress" placeholder="请填写" size="mini" clearable />
           </div>
@@ -519,13 +519,14 @@ export default {
         if (this.module === 'examine' && !this.formData.loginStatus) {
           this.formData.loginStatus = 'OK'
         }
-        if (this.module === 'examine') {
+        if (this.module === 'examine' && this.formData.files.length) {
           const item = this.formData.files
           this.formData.files = item.map(k => {
             return {
               ...k,
               name: k.fileName,
-              url: k.fileUrl
+              url: k.fileUrl,
+              hover: true
             }
           })
         }

src/views/commercialEngineering/components/examine.vue

@@ -18,8 +18,14 @@
           <div class="label" style="height: auto">选择登录成功项目</div>
           <div class="value" style="height: 100%; display: block">
             <el-col :span="7" class="flex-box">
-              <div class="flex-box-title">项目编号{{ formData.loginStatus === 'REJECT'?'*': '' }}</div>
-              <el-input v-model="formData.successLoginProject" class="my-input" placeholder="请填写" size="mini" clearable>
+              <div class="flex-box-title">项目编号{{ formData.loginStatus === 'REJECT' ? '*' : '' }}</div>
+              <el-input
+                v-model="formData.successLoginProject"
+                class="my-input"
+                placeholder="请填写"
+                size="mini"
+                clearable
+              >
                 <el-button slot="append" @click="handleFocus">引入</el-button>
               </el-input>
             </el-col>
@@ -42,12 +48,23 @@
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
-          <div class="label">审核备注{{ formData.loginStatus === 'REJECT'?'*': '' }}</div>
+          <div class="label">审核备注{{ formData.loginStatus === 'REJECT' ? '*' : '' }}</div>
           <div class="value">
-            <el-select v-model="formData.examineNote " placeholder="请选择" size="mini" clearable style="width: 100%">
-              <el-option v-for="item in commonData.dict['TRADE_EXAMINE_NOTE']" :key="item.value" :label="item.label" :value="item.value" />
+            <el-select v-model="formData.examineNote" placeholder="请选择" size="mini" clearable style="width: 100%">
+              <el-option
+                v-for="item in commonData.dict['TRADE_EXAMINE_NOTE']"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
             </el-select>
-            <el-input v-if="['frock'].includes(pageType)" v-model="formData.note" placeholder="请填写" size="mini" clearable />
+            <el-input
+              v-if="['frock'].includes(pageType)"
+              v-model="formData.note"
+              placeholder="请填写"
+              size="mini"
+              clearable
+            />
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="12" class="item">
@@ -59,15 +76,12 @@
         <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label" style="height: auto">审核上传</div>
           <div class="value" style="height: auto">
-            <ImageUpload v-if="module !=='detail'" class="mg-b" :file-list="formData.files" />
+            <ImageUpload v-if="module !== 'detail'" class="mg-b" :file-list="formData.files" />
             <template v-else>
               <div
                 v-for="item in formData.files"
                 :key="item.fileUrl"
-                style="display: flex;
-              width: 120px;
-              height: 120px;align-items: center;
-    justify-content: center;"
+                style="display: flex; width: 120px; height: 120px; align-items: center; justify-content: center"
               >
                 <el-image
                   v-if="checkFileType(item.fileUrl) == 'image'"
@@ -78,10 +92,7 @@
                   class="elImageClose"
                 />
                 <div
-                  style="display: flex;
-              width: 120px;
-              height: 120px;align-items: center;
-    justify-content: center;"
+                  style="display: flex; width: 120px; height: 120px; align-items: center; justify-content: center"
                   @click="openPdf(item)"
                 >
                   <img v-if="checkFileType(item.fileUrl) == 'word'" class="file" src="@/assets/common/word.png">
@@ -105,7 +116,13 @@
     </div>
 
     <!--  -->
-    <LoginSuccess :page-type="pageType" :form-data="formData" :show-dialog="showDialog" @success="handleSuccess" @cancel="handleCancel" />
+    <LoginSuccess
+      :page-type="pageType"
+      :form-data="formData"
+      :show-dialog="showDialog"
+      @success="handleSuccess"
+      @cancel="handleCancel"
+    />
   </div>
 </template>
 
@@ -228,11 +245,11 @@ export default {
 .mg-b {
   margin: 10px 0;
 }
-::v-deep .el-image-viewer__close{
+::v-deep .el-image-viewer__close {
   top: 106px;
-    right: 40px;
-    width: 40px;
-    height: 40px;
-    font-size: 40px;
+  right: 40px;
+  width: 40px;
+  height: 40px;
+  font-size: 40px;
 }
 </style>

src/views/commercialEngineering/crossDistrict/crossDistrictkList.vue

@@ -169,6 +169,16 @@ export default {
     exportList: exportLoginCrossDistrict,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'project_no') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (<el-link type='primary' underline={false} onClick={() => {
+            this.content = '详情'
+            this.module = 'detail'
+            this.detailId = row.id
+            this.visible = true
+          }}>{row.projectNo}</el-link>)
+        }
+      }
       return defaultData
     },
     // 监听勾选变化

src/views/commercialEngineering/frock/frockList.vue

@@ -166,6 +166,16 @@ export default {
     exportList: exportLoginFrock,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'project_no') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (<el-link type='primary' underline={false} onClick={() => {
+            this.content = '详情'
+            this.module = 'detail'
+            this.detailId = row.id
+            this.visible = true
+          }}>{row.projectNo}</el-link>)
+        }
+      }
       return defaultData
     },
     // 监听勾选变化

src/views/commercialEngineering/homeDecoration/homeDecorationList.vue

@@ -175,6 +175,16 @@ export default {
     exportList: exportLoginHomeDecoration,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'project_no') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (<el-link type='primary' underline={false} onClick={() => {
+            this.content = '详情'
+            this.module = 'detail'
+            this.detailId = row.id
+            this.visible = true
+          }}>{row.projectNo}</el-link>)
+        }
+      }
       return defaultData
     },
     // 监听勾选变化