From 7ceffc9c9515e5f0749f8ee37242052b120fe604 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Tue, 26 Sep 2023 14:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 60 +++++++++++--------
 .../components/listEditModel.vue              | 52 ++++++++--------
 2 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index 9b887b4c3..562412cfa 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -475,28 +475,28 @@
                   <a-form-model-item class="itemModel-multi"
                                      :prop="'dutyTerritory'"
                   >
-<!--                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                              class="box-input"-->
-<!--                              optionFilterProp="label"-->
-<!--                              mode="multiple"-->
-<!--                              @change="handleChange"-->
-<!--                              :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                              v-model="formInline.dutyTerritory">-->
-<!--                      <a-select-option v-for="(item, key) in dutyTerritoryList"-->
-<!--                                       :key="key"-->
-<!--                                       :label="item.itemText"-->
-<!--                                       :value="item.itemValue">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
-<!--                                     {{ item.itemText }}-->
-<!--                               </span>-->
-<!--                      </a-select-option>-->
-<!--                    </a-select>-->
-                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                       @input="handleInput('dutyTerritory')"
-                                       @changeQuery="handleChange"
-                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="'duty_territory'"/>
+                    <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                              class="box-input"
+                              optionFilterProp="label"
+                              mode="multiple"
+                              @change="handleChange"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                              v-model="formInline.dutyTerritory">
+                      <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                       :key="key"
+                                       :label="item.itemText"
+                                       :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                      </a-select-option>
+                    </a-select>
+<!--                    <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                       @input="handleInput('dutyTerritory')"-->
+<!--                                       @changeQuery="handleChange"-->
+<!--                                       :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                       :type="'select'"-->
+<!--                                       :triggerChange="false" :dictCode="'duty_territory'"/>-->
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -774,9 +774,21 @@
         })
       },
       DutyDepartChangeOne(event) {
-        // this.formInline.dutyTerritory = []
+        this.formInline.dutyTerritory = []
         this.formInline = {...this.formInline}
-        // this.getDutyTerritoryOne(event.join(','))
+        this.getDutyTerritoryOne(event.join(','))
+      },
+      getDutyTerritoryOne(row) {
+        let query = {
+          dutyDepart: row
+        }
+        getAction('/sys/dict/getDutyTeryByDD', query).then((res) => {
+          if (res.success) {
+            this.dutyTerritoryList = res.result || []
+          } else {
+            this.dutyTerritoryList = []
+          }
+        })
       },
       addModel() {
         this.visible = true
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index 103c66b22..697327a95 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -132,29 +132,29 @@
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
               <a-form-model-item class="itemModel-multi" prop="dutyTerritory">
-<!--                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                          class="box-input"-->
-<!--                          optionFilterProp="label"-->
-<!--                          mode="multiple"-->
-<!--                          @change="dutyTerritoryChange"-->
-<!--                          :disabled="formInline.roleCodeIndex == 0 ? false : true"-->
-<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-<!--                          v-model="formInline.dutyTerritory">-->
-<!--                  <a-select-option v-for="(item, key) in dutyTerritoryList"-->
-<!--                                   :key="key"-->
-<!--                                   :label="item.itemText"-->
-<!--                                   :value="item.itemValue">-->
-<!--                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">-->
-<!--                                     {{ item.itemText }}-->
-<!--                               </span>-->
-<!--                  </a-select-option>-->
-<!--                </a-select>-->
-                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                    @change="dutyTerritoryChange"
-                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"
-                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                    :type="'select'"
-                                    :triggerChange="false" :dictCode="'duty_territory'"/>
+                <a-select :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                          class="box-input"
+                          optionFilterProp="label"
+                          mode="multiple"
+                          @change="dutyTerritoryChange"
+                          :disabled="formInline.roleCodeIndex == 1 ? false : true"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          v-model="formInline.dutyTerritory">
+                  <a-select-option v-for="(item, key) in dutyTerritoryList"
+                                   :key="key"
+                                   :label="item.itemText"
+                                   :value="item.itemValue">
+                               <span style="display: inline-block;width: 100%" :title=" item.itemText ">
+                                     {{ item.itemText }}
+                               </span>
+                  </a-select-option>
+                </a-select>
+<!--                <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+<!--                                    @change="dutyTerritoryChange"-->
+<!--                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
+<!--                                    :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+<!--                                    :type="'select'"-->
+<!--                                    :triggerChange="false" :dictCode="'duty_territory'"/>-->
               </a-form-model-item>
             </div>
           </a-col>
@@ -830,9 +830,9 @@
         })
       },
       DutyDepartChange(event) {
-        // this.formInline.dutyTerritory = []
+        this.formInline.dutyTerritory = []
         this.formInline = { ...this.formInline }
-        // this.getDutyTerritory(event.join(','))
+        this.getDutyTerritory(event.join(','))
       },
       getDutyTerritory(row) {
         let query = {
@@ -932,7 +932,7 @@
         item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
         item.dutyDepart = item.dutyDepart ? item.dutyDepart.split(',') : []
-        // item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
+        item.dutyTerritory = item.dutyTerritory ? item.dutyTerritory.split(',') : []
         this.getRejectCause(item.id)
         if (item.dutyDepart && item.dutyDepart.length > 0) {
           this.getDutyTerritory(item.dutyDepart.join(','))