From 2cd3640aa7fb61fb02d773e330563414ccfe01b2 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 16 Jul 2024 13:52:54 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B]=20=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dict/JDictSelectTag.vue        |  2 +-
 src/components/dict/JMultiSelectTag.vue       |  2 +-
 .../StandardInterpretationProcess.vue         |  2 +-
 .../modules/InterpretationClauseTable.vue     | 30 +++++++++++++------
 .../InterpretationClauseTableModal.vue        |  8 +++++
 .../InterpretationInterpreterFillInfo.vue     | 18 +++++++++--
 .../InterpretationLiaisonDistribute.vue       | 14 ++++++++-
 ...nterpretationMainInterpreterDistribute.vue | 17 +++++++++--
 8 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/src/components/dict/JDictSelectTag.vue b/src/components/dict/JDictSelectTag.vue
index bf9b4df..c6143ef 100644
--- a/src/components/dict/JDictSelectTag.vue
+++ b/src/components/dict/JDictSelectTag.vue
@@ -132,7 +132,7 @@ export default {
     },
     // 通过val获取字典项
     getDictLabelByValue (val) {
-      const dictItem = this.dictOptions.find(item => item.value === val)
+      const dictItem = this.dictOptions.find(item => item.value === val) || {}
       return dictItem.text || dictItem.label
     },
     setCurrentDictOptions (dictOptions) {
diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue
index ee624d1..1c713b7 100644
--- a/src/components/dict/JMultiSelectTag.vue
+++ b/src/components/dict/JMultiSelectTag.vue
@@ -157,7 +157,7 @@ export default {
     },
     // 通过val获取字典项
     getDictLabelByValue (val) {
-      const dictItem = this.dictOptions.find(item => item.value === val)
+      const dictItem = this.dictOptions.find(item => item.value === val) || {}
       return dictItem.text || dictItem.label
     },
     // 选中的回调
diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
index 2e7b451..7c4ee44 100644
--- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
+++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
@@ -111,7 +111,7 @@
     <!--  操作按钮  -->
     <div class="detail-page-bottom-operate-box">
       <!--  加签  -->
-      <a-button v-if="btn.includes('countersign')" type="primary" ghost :loading="loading" @click="handleCountersign" icon="arrow-up">{{ $t('countersign') }}</a-button>
+      <a-button v-if="btn.includes('countersign')" type="primary" ghost :loading="loading" @click="handleCountersign" icon="plus">{{ $t('countersign') }}</a-button>
       <!--  转办  -->
       <a-button v-if="btn.includes('transfer')" type="primary" ghost :loading="loading" @click="handleTurnTo" icon="arrow-up">{{ $t('turnTo') }}</a-button>
       <!--  保存  -->
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
index 22d747f..d0d9eaf 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
@@ -73,7 +73,7 @@
 import SplitClauseDetail from '@views/documentTool/documentSplit/modules/SplitClauseDetail'
 import InterpretationClauseTableModal
   from '@views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal'
-import { filterObj, randomUUID } from '@/utils/util'
+import { randomUUID } from '@/utils/util'
 import UserSelectModal from '@comp/selection/UserSelectModal'
 import { downFile } from '@api/manage'
 import { StandardInterpretationNodes } from '@/enums/commonEnums'
@@ -128,6 +128,12 @@ export default {
       type: Boolean,
       default: false,
       required: false
+    },
+    // 标准信息
+    standardInfo: {
+      type: Object,
+      default: () => ({}),
+      required: false
     }
   },
   data () {
@@ -631,8 +637,13 @@ export default {
     },
     // 导出
     handleExport (fileName, fileSuffix = '.xlsx') {
-      if (!fileName || typeof fileName !== 'string') {
-        fileName = '导出文件'
+      const { standardNumber, standardName } = this.standardInfo || {}
+      if (this.isDistribute) {
+        // 分发：编号 + 名称 + 解读分发
+        fileName = `${standardNumber} ${standardName}-解读分发`
+      } else {
+        // 不分发和汇总：编号 + 名称 + 解读表
+        fileName = `${standardNumber} ${standardName}-解读表`
       }
       const param = {
         projectId: this.$route.query.projectId,
@@ -642,18 +653,19 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         param.selections = this.selectedRowKeys.join(',')
       }
-      console.log('导出参数', param)
+      console.log('导出参数', param, fileName)
       // 加一个大的提示
       const modalLoading = this.$info({
-        title: '提示',
-        content: <span>正在导出，请稍候 <a-spin size="small" /></span>,
+        title: this.$t('tips'),
+        content: <span>{this.$t('exportTip')} <a-spin size="small" /></span>,
         keyboard: false,
         // 不显示 知道了 按钮
         okButtonProps: {
           style: 'display: none'
         }
       })
-      let url = ''
+      // 汇总节点也用不分发的导出
+      let url = this.url.exportUnDistribute
       // 解读人分发节点
       if (this.isMainInterpreterDistribute) {
         // 根据是否分发选择对应的接口
@@ -661,7 +673,7 @@ export default {
       }
       downFile(url, param).then((data) => {
         if (!data) {
-          this.$message.warning('文件下载失败')
+          this.$message.warning(this.$t('fileDownloadFail'))
           return
         }
         if (typeof window.navigator.msSaveBlob !== 'undefined') {
@@ -725,7 +737,7 @@ export default {
      */
     editCallback (formData) {
       // 过滤没有值的字段
-      const form = filterObj(formData)
+      const form = formData
       // 有id就是编辑，没有就是批量编辑
       if (formData[this.rowKey]) {
         const row = this.dataSource.find(item => item[this.rowKey] === formData[this.rowKey])
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
index a2ce7f8..5250d09 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue
@@ -303,8 +303,15 @@ export default {
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
+        // 是否与上一版相同(多个值就不回显)
+        if (!this.model.isSameAsPrevVersion || this.model.isSameAsPrevVersion.split(',').length > 1) {
+          delete this.model.isSameAsPrevVersion
+        }
+        // 专业领域
         if (typeof this.model.domainArea === 'string' && this.model.domainArea.length) {
           this.model.domainArea = this.model.domainArea.split(',').map(item => ({ value: item }))
+        } else {
+          this.model.domainArea = []
         }
         this.form.setFieldsValue(this.model)
       })
@@ -319,6 +326,7 @@ export default {
           if (Array.isArray(formData.domainArea)) {
             formData.domainArea = formData.domainArea.map(item => item.value).join(',')
           }
+          console.log(formData)
           this.$emit('ok', formData)
           this.close()
         }
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
index 6cd110e..1b14f72 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
@@ -3,8 +3,11 @@
     <a-spin :spinning="loading">
       <div class="process-part-title">{{ $t('dispatchInformation') }}</div>
       <!-- 条款表格 -->
-      <interpretation-clause-table ref="interpretationClauseTable" :disabled="disabled" :current-node-id="currentNodeId"/>
-      <a-form :form="form" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="isStandardInterpreterSummary">
+      <interpretation-clause-table ref="interpretationClauseTable"
+                                   :disabled="disabled"
+                                   :standard-info="formInline"
+                                   :current-node-id="currentNodeId"/>
+      <a-form :form="form" class="prc-form" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="isStandardInterpreterSummary">
         <a-row>
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.countersigningPerson')" :colon="false">
@@ -164,4 +167,15 @@ export default {
 .mb-20 {
   margin-bottom: 20px;
 }
+.prc-form {
+  /deep/ .ant-form-item-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-right: 16px;
+  }
+  /deep/ .user-organ-wrap {
+    height: 40px;
+  }
+}
 </style>
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
index 3f85ca3..12d5a22 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationLiaisonDistribute.vue
@@ -4,7 +4,7 @@
       <div class="process-part-title">{{ $t('dispatchInformation') }}</div>
       <!-- 条款的表格 -->
       <interpretation-clause-table v-if="showClauseTable" ref="interpretationClauseTable" :disabled="disabled" :current-node-id="currentNodeId"/>
-      <a-form :form="form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-form :form="form" class="prc-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
         <a-row>
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.mainInterpreter')" :colon="false">
@@ -119,4 +119,16 @@ export default {
 .mb-20 {
   margin-bottom: 20px;
 }
+
+.prc-form {
+  /deep/ .ant-form-item-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-right: 16px;
+  }
+  /deep/ .user-organ-wrap {
+    height: 40px;
+  }
+}
 </style>
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
index 924bffd..bbc3d72 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
@@ -20,7 +20,7 @@
           </template>
         </j-table>
       </div>
-      <a-form :form="form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-form :form="form" class="prc-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
         <a-row>
           <a-col :span="8">
             <a-form-item :label="$t('workCenter.standardInterpretationProcess.interpretingTasksIsDistribute')" :colon="false">
@@ -45,10 +45,11 @@
                                      :current-node-id="currentNodeId"
                                      :import-params="importParams"
                                      :disabled-import="disabledImport"
+                                     :standard-info="formInline"
                                      :is-distribute="isDistribute"/>
         <!-- 不分发的表单 -->
         <template v-if="!isDistribute">
-          <a-form :form="userForm" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-form :form="userForm" class="prc-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-row>
               <a-col :span="8">
                 <a-form-item :label="$t('workCenter.standardInterpretationProcess.countersigningPerson')" :colon="false">
@@ -359,4 +360,16 @@ export default {
 .mb-20 {
   margin-bottom: 20px;
 }
+
+.prc-form {
+  /deep/ .ant-form-item-label {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-right: 16px;
+  }
+  /deep/ .user-organ-wrap {
+    height: 40px;
+  }
+}
 </style>