From dafff274e17016c16b09a263ed671a4dbff918d6 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Mon, 10 Oct 2022 17:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/zh-cn.js             |  2 +-
 .../components/PersonnelSelection/index.vue   | 20 +++++++++----------
 .../projectManagement/components/addModel.vue |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 5dcd838f0..ee36dd5cd 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1420,5 +1420,5 @@ module.exports = {
   endProcess:'结束流程',
   thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
   secondaryDirectory:'二级目录',
-  OnlyPersonsCanBeSelected:'超出最大上限；只能选择100个人员',
+  OnlyPersonsCanBeSelected:'超出最大上限；最多只能选择100个人员',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index b84f99147..1bd0fb00e 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -316,6 +316,10 @@
       },
       handleSubmit() {
         // if (this.userIds && this.userIds.length > 0) {
+        if (this.userIds.length > 100 && this.selectDepartment) {
+          this.$message.warning(this.$t('OnlyPersonsCanBeSelected'))
+          return
+        }
         if (this.isSingleChoice) {
           if (this.userIds.length > 1) {
             this.$message.warning(this.$t('onlyOnePersonCanBeSelected'))
@@ -324,16 +328,12 @@
         }
         let userIds = JSON.parse(JSON.stringify(this.userIds))
         let userName = JSON.parse(JSON.stringify(this.userName))
-        userName = userName.filter(function(item, index) {
-          return userName.indexOf(item) === index  // 因为indexOf 只能查找到第一个
-        })
-        userIds = userIds.filter(function(item, index) {
-          return userIds.indexOf(item) === index  // 因为indexOf 只能查找到第一个
-        })
-        if (userIds.length > 100 && this.selectDepartment) {
-          this.$message.warning(this.$t('OnlyPersonsCanBeSelected'))
-          return
-        }
+        // userName = userName.filter(function(item, index) {
+        //   return userName.indexOf(item) === index  // 因为indexOf 只能查找到第一个
+        // })
+        // userIds = userIds.filter(function(item, index) {
+        //   return userIds.indexOf(item) === index  // 因为indexOf 只能查找到第一个
+        // })
         this.$emit('input', userName.join(','))
         this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
         this.visible = false
diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue
index 65b190bd4..30c6324e2 100644
--- a/jero-web/src/views/projectManagement/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/addModel.vue
@@ -112,6 +112,7 @@
                 <PersonnelSelection
                   :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
                   :personneQuery="formInline"
+                  :selectDepartment="true"
                   @change="PersonnelSelectionChange"
                   :disabled="disabled"
                   v-model="formInline.certificationEngineerName"/>