From 68d04a9954e28567d953df0c38e562f1541910ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 26 Jan 2024 10:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=98=E6=9B=B4=E3=80=91=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/system/zh.js                  |  3 +-
 src/components/dict/JMultiSelectTag.vue       |  4 ++-
 .../documentSplit/modules/SplitAddForm.vue    | 12 +++++++
 .../modules/SplitDetailBatchEditDrawer.vue    | 13 ++++++-
 .../tags/modules/ClauseSplittingDrawer.vue    | 35 +++++++++++++++----
 5 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/src/common/lang/system/zh.js b/src/common/lang/system/zh.js
index 74b713d8..b8cf69d0 100644
--- a/src/common/lang/system/zh.js
+++ b/src/common/lang/system/zh.js
@@ -52,7 +52,8 @@ module.exports = {
     parentName: '父级名称',
     select: '下拉选择',
     tree: '树形结构',
-    pleaseEnterYourEnglishName: '请输入英文字段名称'
+    pleaseEnterYourEnglishName: '请输入英文字段名称',
+    usableRange: '使用范围'
   },
   // 内部工作组
   internalWorkGroup: {
diff --git a/src/components/dict/JMultiSelectTag.vue b/src/components/dict/JMultiSelectTag.vue
index 662b57cc..9738897b 100644
--- a/src/components/dict/JMultiSelectTag.vue
+++ b/src/components/dict/JMultiSelectTag.vue
@@ -85,7 +85,9 @@ export default {
     dictCode: {
       immediate: true,
       handler () {
-        this.initDictData()
+        if (this.dictCode) {
+          this.initDictData()
+        }
       }
     },
     value: {
diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 3dfcbeea..4a9ab314 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -151,6 +151,16 @@
                                  :label-in-value="false"
                                  @change="updateDom"
                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
+                  <!--16、树形弹框选择-->
+                  <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                  v-model="formInline[item.dbFieldName]"
+                                  :filedName="item.dbFieldName"
+                                  type="checkbox"
+                                  :options-href="item.fieldHref"
+                                  :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                  :dict-id="item.dictId"
+                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
                 </a-form-model-item>
               </div>
             </template>
@@ -225,10 +235,12 @@ import { FieldType, TypeOfClauseItem, YesOrNoEnum } from '../../../../enums/comm
 import { getAction } from '../../../../api/manage'
 import { getFormDictTreeList } from '../../../../api/api'
 import STreeSelect from '../../../../components/STreeSelect'
+import TreeSelection from '../../../../components/selection/TreeSelection'
 
 export default {
   name: 'SplitAddForm',
   components: {
+    TreeSelection,
     JMultipleDatePicker, UserSelection,
     SplitDetailAddTable,
     UploadFile,
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
index 1611c0ba..41e83123 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchEditDrawer.vue
@@ -146,6 +146,16 @@
                                  :tree-data="optionsData[item.dbFieldName]"
                                  :label-in-value="false"
                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
+                  <!--16、树形弹框选择-->
+                  <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                  v-model="formInline[item.dbFieldName]"
+                                  :filedName="item.dbFieldName"
+                                  type="checkbox"
+                                  :options-href="item.fieldHref"
+                                  :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                  :dict-id="item.dictId"
+                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
                 </a-form-model-item>
               </div>
             </template>
@@ -174,10 +184,11 @@ import { FieldType, YesOrNoEnum } from '../../../../enums/commonEnums'
 import { getFormDictTreeList } from '../../../../api/api'
 import { getAction } from '../../../../api/manage'
 import STreeSelect from '../../../../components/STreeSelect'
+import TreeSelection from '../../../../components/selection/TreeSelection'
 
 export default {
   name: 'SplitDetailBatchEditDrawer',
-  components: { UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect },
+  components: { TreeSelection, UserSelection, StandardSelection, UploadFile, JMultipleDatePicker, STreeSelect },
   data () {
     return {
       FieldType,
diff --git a/src/views/system/tags/modules/ClauseSplittingDrawer.vue b/src/views/system/tags/modules/ClauseSplittingDrawer.vue
index f1ed9a90..ab38d586 100644
--- a/src/views/system/tags/modules/ClauseSplittingDrawer.vue
+++ b/src/views/system/tags/modules/ClauseSplittingDrawer.vue
@@ -24,7 +24,11 @@
           <a-divider dashed />
           <!--所属模块-->
           <a-form-model-item :label="$t('system.tag.module')" prop="isModel">
-            <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.module')" disabled v-model="form.isModel"  show-search :filter-option="filterOption">
+            <a-select :placeholder="$t('pleaseSelect') + $t('system.tag.module')"
+                      disabled
+                      v-model="form.isModel"
+                      show-search
+                      :filter-option="filterOption">
               <a-select-option v-for="item in moduleArr" :key="item.value" :value="item.value">
                 {{ translate(item.langKey) }}
               </a-select-option>
@@ -49,7 +53,7 @@
             ></a-input>
           </a-form-model-item>
           <!-- 字段名称 正式环境 需要注释掉，开发环境可以先留着，方便使用-->
-          <a-col :span="24"  v-if="canOpeFlag">
+          <a-col :span="24" v-if="canOpeFlag">
             <a-form-model-item :label="$t('system.tag.fieldName')" prop="dbFieldName">
               <a-input
                 v-model.trim="form.dbFieldName"
@@ -103,6 +107,12 @@
             <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn"
                                :placeholder="$t('pleaseSelect') + $t('system.tag.required')" />
           </a-form-model-item>
+          <!--使用范围-->
+          <a-form-model-item :label="$t('system.tag.usableRange')" prop="usableRange">
+            <j-multi-select-tag v-model="form.usableRange"
+                                :options="usableRangeOptions"
+                                :placeholder="$t('pleaseSelect') + $t('system.tag.usableRange')" />
+          </a-form-model-item>
           <!-- 文档拆分列表展示-->
           <template>
             <p class="tag-info">{{ $t('system.tag.documentSplitDisplay') }}</p>
@@ -156,8 +166,8 @@
 
 <script>
 import JDictSelectTag from '../../../../components/dict/JDictSelectTag'
-import { FieldType, TagsAttributeTypeEnums, TagsTypeEnums } from '../../../../enums/commonEnums'
-import { addTag, editTag, queryDictName } from '../../../../api/api'
+import { FieldType, StandardSource, TagsAttributeTypeEnums, TagsTypeEnums } from '../../../../enums/commonEnums'
+import { addTag, ajaxGetDictItems, editTag, queryDictName } from '../../../../api/api'
 
 export default {
   name: 'ClauseSplittingDrawer',
@@ -235,6 +245,10 @@ export default {
         fieldMustInput: [
           { required: true, message: this.$t('pleaseSelect') + this.$t('system.tag.required'), trigger: 'change' }
         ],
+        // 使用范围
+        usableRange: [
+          { required: true, message: this.$t('pleaseSelect') + this.$t('system.tag.usableRange'), trigger: 'change' }
+        ],
         // 文档拆分列表展示
         isShowList: [
           { required: true, message: this.$t('system.tag.selectSplitListDisplay'), trigger: 'change' }
@@ -255,7 +269,8 @@ export default {
       contentOption: [],
       contentOptionSelect: [],
       contentOptionTree: [],
-      moduleArr: TagsTypeEnums.getItemList()
+      moduleArr: TagsTypeEnums.getItemList(),
+      usableRangeOptions: []
     }
   },
   watch: {
@@ -286,6 +301,14 @@ export default {
     // 初始化一些数据
     initData () {
       this.loadContent()
+      this.getUsableRangeOptions()
+    },
+    getUsableRangeOptions () {
+      ajaxGetDictItems('standard_source').then(res => {
+        if (res.success) {
+          this.usableRangeOptions = (res.result || []).filter(tt => tt.value !== StandardSource.OVERSEAS.value)
+        }
+      })
     },
     showDrawer () {
       this.visible = true
@@ -379,7 +402,7 @@ export default {
         this.isSearch = true
       }
       // 输入框(字符串) 文本框
-      if (val === FieldType.TEXT_BOX.value|| val === 'sel_user') {
+      if (val === FieldType.TEXT_BOX.value || val === 'sel_user') {
         this.isLength = true
       } else {
         this.isLength = false