From 267dbd3e4df4569b93981456561192ea6c108bb3 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 11 May 2022 11:46:20 +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

---
 .../components/listOfRelevantPersonnel.vue    | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index db388477e..a39d6a6f8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -119,12 +119,18 @@
                   <span class="Required">*</span>
                   <span class="title-text-text" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" :prop="'certificationEngineerName'">
-                  <PersonnelSelection
-                    :query="{db_field_name:'certificationEngineer',db_field_txt:$t('certifiedEngineer')}"
-                    :personneQuery="formInline"
-                    @change="PersonnelSelectionChange"
-                    v-model="formInline.certificationEngineerName"/>
+                <a-form-model-item class="itemModel" :prop="'certificationEngineer'">
+                  <a-select allowClear
+                            v-model="formInline.certificationEngineer"
+                            :placeholder="$t('certifiedEngineer')+$t('areaOfResponsibility')">
+                    <a-select-option v-for="(item, key) in dictOptionsValue"
+                                     :key="item.id"
+                                     :value="item.id">
+                      <span class="itemOption" :title=" item.username ">
+                             {{ item.username }}
+                      </span>
+                    </a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -211,7 +217,7 @@
         confirmLoading: false,
         formInline: {},
         rules: {
-          certificationEngineerName: [
+          certificationEngineer: [
             {
               required: true,
               message: this.$t('certifiedEngineer') + this.$t('cannotEmpty'),
@@ -274,9 +280,11 @@
           page: '/project/projectRelatedPersonnel/page',
           edit: '/project/projectRelatedPersonnel/edit',
           exportData: '/project/projectRelatedPersonnel/exportXls',
-          importZipUrl: '/project/projectRelatedPersonnel/importExcel'
+          importZipUrl: '/project/projectRelatedPersonnel/importExcel',
+          queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer'
         },
-        selectedRowKeys: []
+        selectedRowKeys: [],
+        dictOptionsValue: []
       }
     },
     computed: {
@@ -295,9 +303,19 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      queryCertificationEngineer() {
+        getAction(this.url.queryCertificationEngineer, { projectId: this.$route.query.id }).then((res) => {
+          if (res.success) {
+            this.dictOptionsValue = res.result
+          } else {
+            this.dictOptionsValue = []
+          }
+        })
+      },
       getData() {
         this.visible = true
         this.getList()
+        this.queryCertificationEngineer()
       },
       getPersonnelList() {
         this.getList()
@@ -429,4 +447,13 @@
     text-align: right;
     margin-bottom: 20px;
   }
+
+  .itemOption {
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
 </style>
\ No newline at end of file