From 37e3e658145a6414b4eb1a7974aacef4120f73be Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 12 Dec 2023 15:46:10 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InspectionPlanTable.vue           |  7 +++----
 .../modules/WriteOpinionModal.vue             |  7 +++----
 .../modules/InspectionProcessContent.vue      | 19 -------------------
 .../InspectionProcessRectificationPlan.vue    |  5 ++---
 .../modules/InspectionProcessReport.vue       | 19 -------------------
 .../modules/InspectionProcessTable.vue        |  8 ++++----
 .../modules/InspectionProcessTableModal.vue   |  8 ++++----
 .../modules/ExtensionRequestTable.vue         |  7 +++----
 .../modules/ExtensionRequestTableModal.vue    |  7 +++----
 .../modules/BaseInfoTable.vue                 | 19 ++++++++++++++-----
 .../modules/BaseInfoForm.vue                  | 15 +++++++++++----
 11 files changed, 47 insertions(+), 74 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index 699a0fe6..b0f14a97 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -27,9 +27,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -288,7 +287,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     },
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/WriteOpinionModal.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/WriteOpinionModal.vue
index 25ee0b22..67f7cf3c 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/WriteOpinionModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/WriteOpinionModal.vue
@@ -24,9 +24,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
       </j-table>
@@ -168,7 +167,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     }
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
index 50ec300d..f19d5750 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
@@ -25,16 +25,6 @@
         :scroll="{x: '100%'}"
         @change="tableOnChange">
 
-        <!--  企标号、企标名称  -->
-        <template v-slot:standard="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-
         <!--  操作  -->
         <template slot="action" slot-scope="{text, record, index}">
           <a @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
@@ -128,15 +118,6 @@ export default {
       this.$emit('close')
       this.visible = false
     },
-    // 跳转详情
-    detailClick (record) {
-      this.$openPageNewSheet({
-        path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
-        query: {
-          id: record.id
-        }
-      })
-    },
     tableOnChange (pagination, filters, sorter) {
       this.orderBy = sorter.order === 'ascend' ? '1' : '2'
       this.orderByField = sorter.columnKey
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
index 70e9f924..189b52c2 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
@@ -33,9 +33,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
index 682f77fb..9a696e71 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
@@ -29,16 +29,6 @@
         :scroll="{x: '100%'}"
         @change="tableOnChange">
 
-        <!--  企标号、企标名称  -->
-        <template v-slot:standard="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-
         <!--  附件  -->
         <template v-slot:file="{text, record}">
           <a v-if="text" @click="fileLook(record)">{{ $t('view') }}</a>
@@ -173,15 +163,6 @@ export default {
       this.$emit('close')
       this.visible = false
     },
-    // 跳转详情
-    detailClick (record) {
-      this.$openPageNewSheet({
-        path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
-        query: {
-          id: record.id
-        }
-      })
-    },
     tableOnChange (pagination, filters, sorter) {
       this.orderBy = sorter.order === 'ascend' ? '1' : '2'
       this.orderByField = sorter.columnKey
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index cb71cd6a..0a683dd7 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -20,11 +20,11 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
+
         <!--  实际稽查完成日期  -->
         <template v-slot:actualInspectionCompletionDate="{text, record}">
           <div class="table-form" v-if="isInputInspectionReport">
@@ -313,7 +313,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     },
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
index 2c0caf6e..a5578013 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
@@ -45,9 +45,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
       </j-table>
@@ -131,6 +130,7 @@ export default {
   methods: {
     show (record) {
       this.filters.inspectStatus = '1'
+      this.filters.inspectUser = this.$store.getters.userInfo.id
       this.loadData()
       this.model = Object.assign({}, record)
       this.visible = true
@@ -172,7 +172,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     },
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
index 19ca0116..9cdf8ed7 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
@@ -20,9 +20,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -266,7 +265,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     },
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
index e141fbbb..4f31ca4a 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue
@@ -45,9 +45,8 @@
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="(text || text === 0) && record.detailFlag">{{ text }}</a>
-            <div class="table-text" v-else-if="(text || text === 0) && !record.detailFlag">{{ text }}</div>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
           </a-tooltip>
         </template>
       </j-table>
@@ -173,7 +172,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.inspectNo
         }
       })
     },
diff --git a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
index 2fcf297a..30ceac65 100644
--- a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
+++ b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
@@ -16,6 +16,15 @@
         :scroll="{x: '100%'}"
         @change="tableOnChange">
 
+        <!--  企标号、企标名称  -->
+        <template v-slot:standard="{text, record}">
+          <a-tooltip overlay-class-name="tooltip-style">
+            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+            <a v-if="text" class="link-a" @click="detailClick(record)">{{ text }}</a>
+            <div v-else class="table-text">{{ global.emptyLine }}</div>
+          </a-tooltip>
+        </template>
+
         <!--  操作  -->
         <template slot="action" slot-scope="{text, record, index}">
           <a @click="handleDelete(index)" >{{ $t('delete') }}</a>
@@ -55,15 +64,15 @@ export default {
           title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardNumber'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardName',
-          scopedSlots: { customRender: 'text' }
+          dataIndex: 'standardNumber',
+          scopedSlots: { customRender: 'standard' }
         },
         { // 企标名称
           title: this.$t('workCenter.esInspectionPlan.inspectionBasisStandardName'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardNumber',
-          scopedSlots: { customRender: 'text' }
+          dataIndex: 'standardName',
+          scopedSlots: { customRender: 'standard' }
         },
         {
           // 操作
@@ -110,7 +119,7 @@ export default {
       this.$openPageNewSheet({
         path: '/enterpriseStandardLibrary/enterpriseStandardDetail',
         query: {
-          id: record.id
+          standardNumber: record.standardNumber
         }
       })
     },
diff --git a/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue b/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue
index 226b68dd..d95b28f4 100644
--- a/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue
@@ -137,10 +137,9 @@
             </span>
           </div>
           <a-form-model-item class="item-model" prop="initiator">
-            <a-input disabled
-                     v-model="formInline.initiator"
-                     :maxLength="50"
-                     :placeholder="$t('pleaseEnter')+$t('workCenter.standardPromotionProcess.contactPerson')" />
+            <user-selection :placeholder="$t('pleaseEnter')+$t('workCenter.standardPromotionProcess.contactPerson')"
+                            type="checkbox" :nameStr="initiatorName" :disabled="disabledInitiator" :show-btn="!disabledInitiator"
+                            v-model="formInline.initiator" />
           </a-form-model-item>
         </div>
         <!--  内容  -->
@@ -204,6 +203,10 @@ export default {
       model: {},
       // 操作类型
       operationType: null,
+      // 联络人名字
+      initiatorName: '',
+      // 是否禁用联络人
+      disabledInitiator: true,
       rules: {
         // 操作类型
         operationType: [
@@ -248,6 +251,7 @@ export default {
       this.formInline = {
         ...data
       }
+      this.initiatorName = data.initiatorDictText
     },
     // 外层要获取数据
     getData () {
@@ -292,6 +296,9 @@ export default {
       getLiaisonList({ deptIds: val }).then(res => {
         if (res.success) {
           const data = res.result || ''
+          // 如果是清空，设置禁用，否则根据返回内容设置禁用
+          this.disabledInitiator = val ? !!data : true
+          this.initiatorName = data
           this.$set(this.formInline, 'initiator', data)
         }
       })