From 7e585c823f0aeb1663814fcba9ad685396895e7a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 22 Aug 2022 17:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/batchSettingPersonnel.vue    | 4 ++--
 .../views/projectManagement/components/listOfRegulations.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue b/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue
index 365b07c73..4f35950e6 100644
--- a/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/batchSettingPersonnel.vue
@@ -254,7 +254,7 @@
         verifyDutyList: [],
         formInline: {},
         rules: {},
-        ids: [],
+        ids: []
       }
     },
     mounted() {
@@ -299,7 +299,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.visible = false
             this.confirmLoading = false
-            this.$emit('batSettingList')
+            this.$emit('batchSettingPersonnelForm')
           } else {
             this.$message.warning(this.$t('operationFailed'))
             this.confirmLoading = false
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 87b5e6a24..7ad82c138 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1165,12 +1165,12 @@
             }
           }
           for (let i = 0; i < content.length; i++) {
-            if (!content[i].dutyTerritory) {
+            if (!content[i].dutyTerritory_dictText) {
               this.$message.warning(this.$t('theSelectedDataResponsibilityFieldCannotEmpty'))
               return
             }
             for (let j = 1; j < content.length; j++) {
-              if (content[i].dutyTerritory != content[j].dutyTerritory || !content[i].dutyTerritory) {
+              if (content[i].dutyTerritory_dictText != content[j].dutyTerritory_dictText || !content[i].dutyTerritory_dictText) {
                 this.$message.warning(this.$t('theInconsistentSameResponsibility'))
                 return
               }