From f359d26fc6760f66bdbbf2ff34e60b261197f772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 17 Apr 2023 17:11:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=B4=A3=E4=BB=BB=E9=A2=86?=
 =?UTF-8?q?=E5=9F=9F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/api/api.js                       |  1 +
 .../src/components/dict/JDictSelectTag.vue    | 24 +++++---
 .../src/components/dict/JMultiSelectTag.vue   | 22 +++++--
 .../projectRegulationTasks/index.vue          | 58 +++++++++----------
 4 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/jero-web/src/api/api.js b/jero-web/src/api/api.js
index 6e56e73d2..b6336bbfc 100644
--- a/jero-web/src/api/api.js
+++ b/jero-web/src/api/api.js
@@ -66,6 +66,7 @@ const editDictItem = (params)=>putAction("/sys/dictItem/edit",params);
 
 //字典标签专用（通过code获取字典数组）
 export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params);
+export const getDutyTerritoryDictItems = (code, params)=>getAction(`/sys/dict/getDutyTerritoryDictItems/${code}`,params);
 //从缓存中获取字典配置
 function getDictItemsFromCache(dictCode) {
   if (Vue.ls.get(UI_CACHE_DB_DICT_DATA) && Vue.ls.get(UI_CACHE_DB_DICT_DATA)[dictCode]) {
diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue
index b73e30232..4386292d3 100644
--- a/jero-web/src/components/dict/JDictSelectTag.vue
+++ b/jero-web/src/components/dict/JDictSelectTag.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-  import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
+  import { ajaxGetDictItems, getDictItemsFromCache, getDutyTerritoryDictItems } from '@/api/api'
 
   export default {
     name: 'JDictSelectTag',
@@ -88,12 +88,22 @@
         }
 
         //根据字典Code, 初始化字典数组
-        ajaxGetDictItems(this.dictCode, null).then((res) => {
-          if (res.success) {
+        if (this.dictCode == 'duty_territory'){
+          getDutyTerritoryDictItems(this.dictCode, null).then((res) => {
+            if (res.success) {
 //                console.log(res.result);
-            this.dictOptions = res.result
-          }
-        })
+              this.dictOptions = res.result
+            }
+          })
+        }else{
+          ajaxGetDictItems(this.dictCode, null).then((res) => {
+            if (res.success) {
+//                console.log(res.result);
+              this.dictOptions = res.result
+            }
+          })
+        }
+
       },
       handleInput(e) {
         let val
@@ -109,7 +119,7 @@
           }
         })
         if (this.triggerChange) {
-          this.$emit('change', val,content)
+          this.$emit('change', val, content)
         } else {
           this.$emit('input', val)
           this.$emit('changeQuery', content, this.db_field_name)
diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue
index c02fcf545..bdffce010 100644
--- a/jero-web/src/components/dict/JMultiSelectTag.vue
+++ b/jero-web/src/components/dict/JMultiSelectTag.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-  import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
+  import { ajaxGetDictItems, getDictItemsFromCache,getDutyTerritoryDictItems } from '@/api/api'
 
   export default {
     name: 'JMultiSelectTag',
@@ -117,11 +117,21 @@
             return
           }
           //根据字典Code, 初始化字典数组
-          ajaxGetDictItems(this.dictCode, null).then((res) => {
-            if (res.success) {
-              this.dictOptions = res.result
-            }
-          })
+          if (this.dictCode == 'duty_territory'){
+            getDutyTerritoryDictItems(this.dictCode, null).then((res) => {
+              if (res.success) {
+//                console.log(res.result);
+                this.dictOptions = res.result
+              }
+            })
+          }else{
+            ajaxGetDictItems(this.dictCode, null).then((res) => {
+              if (res.success) {
+//                console.log(res.result);
+                this.dictOptions = res.result
+              }
+            })
+          }
         }
 
       },
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index 39239535b..24c667093 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -44,37 +44,37 @@
               </a-select>
             </div>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <div class="box-title-text">
-                <div class="title-text" :title="$t('Tasknode')">
-                  <span>{{$t('Tasknode')}}</span>
-                </div>
-                <a-select :placeholder="$t('PleaseSelect')+$t('Tasknode')"
-                          class="box-input"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          showSearch
-                          optionFilterProp="label"
-                          v-model="queryParam.status">
-                  <a-select-option v-for="(item, key) in taskStatusList"
-                                   :key="key"
-                                   :label="item.name"
-                                   :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name">
-                           {{ item.name }}
-                     </span>
-                  </a-select-option>
-                </a-select>
-              </div>
-            </a-col>
-          </template>
+<!--          <template v-if="toggleSearchStatus">-->
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <div class="box-title-text">-->
+<!--                <div class="title-text" :title="$t('Tasknode')">-->
+<!--                  <span>{{$t('Tasknode')}}</span>-->
+<!--                </div>-->
+<!--                <a-select :placeholder="$t('PleaseSelect')+$t('Tasknode')"-->
+<!--                          class="box-input"-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          allowClear-->
+<!--                          showSearch-->
+<!--                          optionFilterProp="label"-->
+<!--                          v-model="queryParam.status">-->
+<!--                  <a-select-option v-for="(item, key) in taskStatusList"-->
+<!--                                   :key="key"-->
+<!--                                   :label="item.name"-->
+<!--                                   :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name">-->
+<!--                           {{ item.name }}-->
+<!--                     </span>-->
+<!--                  </a-select-option>-->
+<!--                </a-select>-->
+<!--              </div>-->
+<!--            </a-col>-->
+<!--          </template>-->
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a @click="handleToggleSearch">
-                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                  </a>
+<!--                  <a @click="handleToggleSearch">-->
+<!--                        {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+<!--                         <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--                  </a>-->
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                </a-col>