From 2c88bfdc570451b4072fa845016338752f8b8103 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 2 Nov 2023 11:24:27 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug77937,77958,780?=
 =?UTF-8?q?28,78031?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/businessSupport/en.js         |  4 +-
 src/common/lang/businessSupport/zh.js         |  6 +-
 src/components/customField/Search.vue         | 74 +++++++++++++++----
 src/components/dict/JMultiSelectTag.vue       |  1 +
 .../questionAnswerLibrary/page/AnswerPage.vue | 16 +++-
 .../publicize/EnterpriseStandardPublicize.vue |  2 +-
 .../standard/EnterpriseStandardList.vue       | 12 +--
 7 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/src/common/lang/businessSupport/en.js b/src/common/lang/businessSupport/en.js
index 678d6a7e..74bea20f 100644
--- a/src/common/lang/businessSupport/en.js
+++ b/src/common/lang/businessSupport/en.js
@@ -19,6 +19,8 @@ module.exports = {
     setTop: 'Set To Top',
     answerQuestion: 'reply to a question',
     word: 'word',
-    pleaseEnterAnswerDesc: '请输入回答描述'
+    pleaseEnterAnswerDesc: '请输入回答描述',
+    answerQuestionTitle: '回答问题',
+    questionDetail: '问题详情'
   }
 }
diff --git a/src/common/lang/businessSupport/zh.js b/src/common/lang/businessSupport/zh.js
index c294a3c8..eb8a13f2 100644
--- a/src/common/lang/businessSupport/zh.js
+++ b/src/common/lang/businessSupport/zh.js
@@ -1,7 +1,7 @@
 module.exports = {
   // 标准化活动
   standardizationActivity: {
-    nodeName: '节点名称', // 节点名称
+    nodeName: '节点名称' // 节点名称
   },
   // 问答库
   questionAnswer: {
@@ -19,7 +19,9 @@ module.exports = {
     setTop: '设置为置顶',
     answerQuestion: '回复问题',
     word: '字',
-    pleaseEnterAnswerDesc: '请输入回答描述'
+    pleaseEnterAnswerDesc: '请输入回答描述',
+    answerQuestionTitle: '回答问题',
+    questionDetail: '问题详情'
   },
 
   // 征求意见
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index 68caae5a..10df2c64 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -50,14 +50,6 @@
         <!--                              v-model="queryParam[item.dbFieldName]" :min="1" :max="99999999"/>-->
         <!--            </a-form-item>-->
         <!--          </template>-->
-        <!--   字典多选框  -->
-        <!--          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">-->
-        <!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--              <j-multi-select-tag v-model="queryParam[item.dbFieldName]"-->
-        <!--                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt" :type="'select'"-->
-        <!--                                  :triggerChange="false" :dictCode="item.dict_field"/>-->
-        <!--            </a-form-item>-->
-        <!--          </template>-->
         <!--   日期区间  -->
         <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -68,7 +60,7 @@
           </a-form-item>
         </template>
         <!--  字典单选框  -->
-        <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
+        <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
@@ -76,8 +68,17 @@
                                :triggerChange="false" :dictCode="item.dictField" />
           </a-form-item>
         </template>
+        <!--  字典多选框  -->
+        <template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">
+          <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-multi-select-tag v-model="queryParam[item.dbFieldName]"
+                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                :type="'select'" :maxTagCount="1"
+                                :triggerChange="false" :dictCode="item.dictField"/>
+          </a-form-item>
+        </template>
         <!--   组织机构选择  -->
-        <template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
+        <template v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-tree-select
               tree-node-filter-prop="title"
@@ -92,6 +93,24 @@
             />
           </a-form-item>
         </template>
+        <!--  组织机构多选  -->
+        <template v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value">
+          <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-tree-select
+              tree-node-filter-prop="title"
+              v-model="queryParam[item.dbFieldName]"
+              :maxTagCount="1"
+              :show-search="true"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              class="box-input"
+              style="width: 100%"
+              :tree-data="categoryTreeList"
+              :placeholder="$t('pleaseSelect') + item.dbFieldTxt"
+              treeCheckable
+              treeCheckStrictly
+            />
+          </a-form-item>
+        </template>
         <!--  年份选择 -->
         <template
           v-if="item.fieldShowType === FieldType.YEAR_PICKER.value">
@@ -147,8 +166,8 @@
                        v-model="queryParam[item.dbFieldName]"></a-input>
             </a-form-item>
           </template>
-          <!--   组织机构选择  -->
-          <template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
+          <!--   组织机构单选  -->
+          <template v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-tree-select
                 tree-node-filter-prop="title"
@@ -163,6 +182,24 @@
               />
             </a-form-item>
           </template>
+          <!--  组织机构多选  -->
+          <template v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam[item.dbFieldName]"
+                :maxTagCount="1"
+                :show-search="true"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="categoryTreeList"
+                :placeholder="$t('pleaseSelect') + item.dbFieldTxt"
+                treeCheckable
+                treeCheckStrictly
+              />
+            </a-form-item>
+          </template>
           <!--   日期区间选择器  -->
           <template v-else-if="[FieldType.DATE_SINGLE.value, FieldType.DATE_MORE.value].includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -171,8 +208,8 @@
                               @change="onChange(item.dbFieldName)"></a-range-picker>
             </a-form-item>
           </template>
-          <!--   字典选择器  -->
-          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value || item.fieldShowType === FieldType.OPTION_MORE.value">
+          <!--   字典单选  -->
+          <template v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
@@ -180,6 +217,15 @@
                                  :triggerChange="false" :dictCode="item.dictField" />
             </a-form-item>
           </template>
+          <!--  字典多选框  -->
+          <template v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-multi-select-tag v-model="queryParam[item.dbFieldName]"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                  :type="'select'" :maxTagCount="1"
+                                  :triggerChange="false" :dictCode="item.dictField"/>
+            </a-form-item>
+          </template>
           <!--  年份选择 -->
           <template
             v-if="item.fieldShowType === FieldType.YEAR_PICKER.value">
diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue
index 220499de..bb0517ae 100644
--- a/src/components/dict/JMultiSelectTag.vue
+++ b/src/components/dict/JMultiSelectTag.vue
@@ -14,6 +14,7 @@
     optionFilterProp="children"
     :filterOption="filterOption"
     allowClear
+    v-bind="$attrs"
     :options="dictOptions">
   </a-select>
 
diff --git a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
index 41c36746..2b772025 100644
--- a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
+++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="detail-page">
+  <internal-detail-page :title="pageTitle" :loading="loading">
     <div class="detail-page-title">{{ model.title }}</div>
     <div class="detail-page-second-title">
       <!--  todo: 发帖人部门没有返回  -->
@@ -105,7 +105,7 @@
         <img v-show="image" :src="imageUrl">
       </div>
     </div>
-  </div>
+  </internal-detail-page>
 </template>
 
 <script>
@@ -115,6 +115,7 @@ import { getFileAccessHttpUrl, downloadFile } from '@/api/manage'
 import { getQuizById, answerQuiz, setOrCancelTop, deleteAnswer } from '@/api/businessSupport'
 import { getFileInfo } from '@/api/api'
 import { previewPdf } from '@/utils/previewPdf'
+import InternalDetailPage from '@/components/InternalDetailPage'
 
 // 支持预览的文件后缀
 const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'mp3', 'mp4', 'flv']
@@ -124,8 +125,11 @@ const Base64 = require('js-base64').Base64
 
 export default {
   name: 'AnswerPage',
+  components: { InternalDetailPage },
   data () {
     return {
+      loading: false,
+      pageTitle: '',
       model: {},
       answerArr: [],
       fileList: [],
@@ -147,10 +151,16 @@ export default {
     this.userInfo = userInfo
     this.currentUser = Object.assign({}, userInfo)
     this.canAnswer = Number(this.$route.query.canAnswer)
+    if (this.canAnswer === 1) {
+      this.pageTitle = this.$t('businessSupport.questionAnswer.answerQuestionTitle')
+    } else {
+      this.pageTitle = this.$t('businessSupport.questionAnswer.questionDetail')
+    }
   },
   methods: {
     // 初始化获取数据信息
     initData (id) {
+      this.loading = true
       getQuizById({ id: id }).then(res => {
         if (res.success) {
           this.model = Object.assign({}, res.result)
@@ -167,6 +177,8 @@ export default {
           }
           this.answerArr = this.model.answerList
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     // 获取头像
diff --git a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
index aeff9fc9..d9404042 100644
--- a/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
+++ b/src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
@@ -27,7 +27,7 @@
               </a-range-picker>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">、
+          <template v-if="toggleSearchStatus">
             <!--  宣贯人  -->
             <a-col :span="6">
               <a-form-item :label="$t('enterpriseStandardLibrary.publicize.publicist')" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
index d331558f..75c0bd83 100644
--- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
+++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
@@ -123,13 +123,15 @@
             </template>
             <!--  没有编辑删除权限  -->
             <template v-else>
-              <a v-for="(operation, index) in operationList.slice(0, operateMaxNum)" :key="index" @click="operationClick(operation,record)">
-                <template v-if="operation.text === $t('enterpriseStandardLibrary.standard.collection')">
+              <template v-if="operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection'))">
+                <a @click="operationClick(operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection')),record)">
                   <i class="iconfont icon-star1" v-show="record.collectionFlag" />
                   <i class="iconfont icon-star" v-show="!record.collectionFlag" />
-                </template>
-              </a>
-              <a-divider v-if="operationList.find(item => item.text === $t('share'))" type="vertical" />
+                </a>
+              </template>
+              <a-divider v-if="operationList.find(item => item.text === $t('share')) &&
+                         operationList.find(item => item.text === $t('enterpriseStandardLibrary.standard.collection'))"
+                         type="vertical" />
               <template v-if="operationList.find(item => item.text === $t('share'))">
                 <template v-for="(operation, index) in operationList.slice(operateMaxNum)">
                   <a :key="index" @click="operationClick(operation,record)" v-if="operation.text === $t('share')">