From b38dc8df329d75fc885d4972d02fe1bf5f6751e2 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 25 Sep 2024 16:15:27 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B1=9E=E6=80=A7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/StandardResolutionSheet.vue               | 3 ++-
 src/components/customField/AddForm.vue                   | 9 +++++++++
 src/components/customField/Search.vue                    | 4 ++--
 src/enums/commonEnums.js                                 | 3 ++-
 src/mixins/ConfigurableTableMixin.js                     | 3 ++-
 src/views/dashboard/search/AdvancedSearch.vue            | 2 +-
 .../documentTool/documentSplit/modules/SplitAddForm.vue  | 9 +++++++++
 .../documentSplit/modules/SplitDetailBatchEditDrawer.vue | 9 +++++++++
 .../standard/detail/EnterpriseStandardDetail.vue         | 2 +-
 .../foreignStandard/detail/ForeignStandardDetailPage.vue | 2 +-
 10 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/components/StandardResolutionSheet.vue b/src/components/StandardResolutionSheet.vue
index c073fed..b19e649 100644
--- a/src/components/StandardResolutionSheet.vue
+++ b/src/components/StandardResolutionSheet.vue
@@ -307,7 +307,8 @@ export default {
         FieldType.TREE_SINGLE.value,
         FieldType.TREE_MODAL_SELECT.value,
         FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
-        FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value
+        FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value,
+        FieldType.USER_MORE.value
       ],
       queryParams: {},
       isDragging: false, // 是否拖拽中
diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 42feae6..aab51f8 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -155,6 +155,15 @@
                                      :optionsHref="item.treeFirstHref"
                                      :parentChildRelateDefault="item.dbFieldName !== 'part_name'"
                                      :dict-id="item.dictId"/>
+                <!--   19, 多选用户  -->
+                <user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
+                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                v-model="formInline[item.dbFieldName]"
+                                :filedName="item.dbFieldName"
+                                @nameChange="userSelectNameChange"
+                                :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                type="checkbox"
+                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
               </a-form-model-item>
             </div>
           </template>
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index a554c35..4770536 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -43,7 +43,7 @@
         </template>
         <!--  输入框 -->
         <template
-          v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
+          v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
               FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
               .includes(item.fieldShowType)">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -214,7 +214,7 @@
             </a-form-item>
           </template>
           <!--   输入框  -->
-          <template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
+          <template v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
                 FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
                 .includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 0d09ec9..9ca7f28 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -30,7 +30,8 @@ export const FieldType = {
   TREE_SINGLE: { text: '树形结构（单选）', value: '15' },
   TREE_MODAL_SELECT: { text: '树形弹框', value: '16' },
   TREE_MODAL_SELECT_SEARCH_DIFF: { text: '树形弹框（查询带出子集和单线父级）', value: '17' },
-  TREE_MODAL_SELECT_SEARCH_CHILD: { text: '树形弹框（查询带出所有子级）', value: '18' }
+  TREE_MODAL_SELECT_SEARCH_CHILD: { text: '树形弹框（查询带出所有子级）', value: '18' },
+  USER_MORE: { text: '多选用户弹框', value: '19' }
 }
 
 export const TagsTypeEnums = new EsEnums({
diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js
index 67f1ae0..34fb66e 100644
--- a/src/mixins/ConfigurableTableMixin.js
+++ b/src/mixins/ConfigurableTableMixin.js
@@ -24,7 +24,8 @@ const NEED_DICT_FIELD_TYPE = [
   FieldType.TREE_SINGLE.value,
   FieldType.TREE_MODAL_SELECT.value,
   FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value,
-  FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value
+  FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value,
+  FieldType.USER_MORE.value
 ]
 
 const ZH = 'zh-cn'
diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue
index 2a3c403..70119a0 100644
--- a/src/views/dashboard/search/AdvancedSearch.vue
+++ b/src/views/dashboard/search/AdvancedSearch.vue
@@ -56,7 +56,7 @@
               </template>
               <!--  输入框 -->
               <template
-                v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
+                v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,FieldType.USER_MORE.value,
                 FieldType.STANDARD_MORE.value,FieldType.TREE_MODAL_SELECT.value]
                 .includes(item.fieldShowType)">
                 <a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 8b102f9..63619c6 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -176,6 +176,15 @@
                                        :optionsHref="item.treeFirstHref"
                                        :parentChildRelateDefault="item.dbFieldName !== 'part_name'"
                                        :dict-id="item.dictId"/>
+                  <!--   19, 多选用户  -->
+                  <user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)"
+                                  v-model="formInline[item.dbFieldName]"
+                                  :filedName="item.dbFieldName"
+                                  @nameChange="userSelectNameChange"
+                                  :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                  type="checkbox"
+                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
                 </a-form-model-item>
               </div>
             </template>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
index 4025772..321ffd9 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
@@ -167,6 +167,15 @@
                                        @nameChange="treeDataSelectNameChange"
                                        :optionsHref="item.treeFirstHref"
                                        :dict-id="item.dictId"/>
+                  <!--   19, 多选用户  -->
+                  <user-selection v-else-if="item.fieldShowType === FieldType.USER_MORE.value"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt + getPlaceholderSuffix(item)"
+                                  v-model="formInline[item.dbFieldName]"
+                                  :filedName="item.dbFieldName"
+                                  @nameChange="userSelectNameChange"
+                                  :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                  type="checkbox"
+                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
                 </a-form-model-item>
               </div>
             </template>
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
index a8afac8..089b021 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
@@ -237,7 +237,7 @@ export default {
         associated_file: 'enterpriseStandard:associatedFile:look' // 关联文件
       },
       // 需要数据字段翻译的属性类型
-      needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
+      needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.USER_MORE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
       // 需要双语切换翻译的属性类型
       needEnNameFieldType: [FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
       // 是双语切换翻译的属性，但是不翻译的字段
diff --git a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
index 96810a1..94fea10 100644
--- a/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
+++ b/src/views/standardRegulationLibrary/foreignStandard/detail/ForeignStandardDetailPage.vue
@@ -216,7 +216,7 @@ export default {
       fileField: [],
       // 参与只允许查看
       // 需要数据字段翻译的属性类型
-      needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
+      needDictFieldList: [FieldType.USER_SINGLE.value, FieldType.USER_MORE.value, FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value, FieldType.OPTION_SINGLE.value, FieldType.OPTION_MORE.value, FieldType.TREE.value, FieldType.TREE_SINGLE.value],
       image: false,
       imageUrl: null,
       // 标准字段，需要跳转标准详情