From d6f624b3526eb843021aad7707d60163f025a9f3 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 14 Dec 2023 13:58:13 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RevisionPlanActivelyReportFlow.vue             |  2 +-
 .../modules/ContactEnterSendTaskModal.vue          |  3 +++
 .../modules/OnlyTableForm.vue                      | 14 +++++++-------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
index 8d29a945..ac30a0a6 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -75,7 +75,7 @@
       <!--  节点5、各部所联络人汇总   只有表格，可操作  -->
       <only-table-form v-else-if="currentNode === 5" ref="baseInfoFormRef" :currentNode="5"></only-table-form>
       <!--  节点6、联络人主管级上一级领导审批  表格不可操作，可以查看详情  -->
-      <only-table-form v-else-if="currentNode === 6" onlyCanLook ref="baseInfoFormRef"></only-table-form>
+      <only-table-form v-else-if="currentNode === 6" :onlyCanLook="true" ref="baseInfoFormRef"></only-table-form>
       <!--  节点7、标准化工程师归档  表格不可新增，可以编辑和查看详情  -->
       <only-table-form v-else-if="currentNode === 7" disabled ref="baseInfoFormRef"></only-table-form>
 
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index 64b4a1d6..4004de53 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -934,6 +934,9 @@ export default {
           } else {
             formInline.enStandardSystem = ''
           }
+          // 设置创建人
+          const currentUser = Vue.ls.get(USER_INFO)
+          formInline.contactUser_dictText = currentUser.realname + '(' + currentUser.username + ')'
           // 主起草单位的回显需要在登录信息中有当前登录人部门的翻译 ？？
           console.log(formInline)
           this.$emit('ok', formInline)
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
index 048a2dbf..f81ed275 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--  操作区域  -->
-    <div v-if="!disabled" class="table-operator">
+    <div v-if="!disabled && !onlyCanLook" class="table-operator">
       <!--  新增  -->
       <a-button icon="plus" type="primary" @click="handleAdd" :disabled="disabled">
         {{ $t('newlyAdded') }}
@@ -53,21 +53,21 @@
         <!--   创建人  -->
         <template v-slot:createUser="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.workUser_dictText || record.contactUser_dictText || global.emptyLine }}</template>
-            <div class="table-text">{{ record.workUser_dictText || record.contactUser_dictText || global.emptyLine }}</div>
+            <template slot="title">{{ record.workGroupUser_dictText || record.contactUser_dictText || global.emptyLine }}</template>
+            <div class="table-text">{{ record.workGroupUser_dictText || record.contactUser_dictText || global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
         <!--    操作栏   -->
         <div slot="action" slot-scope="{record, index}" class="action-span-cell">
-          <template v-if="!disabled">
+          <template v-if="onlyCanLook">
+            <a @click="handleLook(record, index)" class="table-ope-btn">{{ $t('lookDetail') }}</a>
+          </template>
+          <template v-else-if="!disabled">
             <a @click="handleEdit(record, index)" class="table-ope-btn">{{ $t('edit') }}</a>
             <a-divider type="vertical" />
             <a @click="handleDelete(record.id, index)" class="table-ope-btn">{{ $t('delete') }}</a>
           </template>
-          <template v-else-if="onlyCanLook">
-            <a @click="handleLook(record, index)" class="table-ope-btn">{{ $t('lookDetail') }}</a>
-          </template>
           <template v-else-if="editAndLook">
             <a @click="handleEdit(record, index)" class="table-ope-btn">{{ $t('edit') }}</a>
             <a-divider type="vertical" />