[update] 修改bug77937,77958,78028,78031

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">

src/components/dict/JMultiSelectTag.vue

@@ -14,6 +14,7 @@
     optionFilterProp="children"
     :filterOption="filterOption"
     allowClear
+    v-bind="$attrs"
     :options="dictOptions">
   </a-select>