From 7f60f36dba1a2c06ececcfff609c0b5ac7836cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 9 May 2023 09:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/PersonnelSelection/index.vue   |  2 ++
 .../views/projectManagement/projectLibrary/index.vue   |  9 +++++++--
 .../projectManagement/projectNonConformance/index.vue  | 10 ++++++++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 0a1609d71..7cf7c0574 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -147,6 +147,8 @@
           let username = []
           if (this.selectValue.length > 0) {
             this.selectValue.forEach(res => {
+              let reg = /[\t\r\f\n\s]*/g
+              res.label = res.label.replace(reg, '')
               id.push(res.key)
               username.push(res.label)
             })
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index 59736a985..92eb2ea83 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -35,7 +35,7 @@
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="8" v-if="isPersonnelSelection">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('StudioEngineer')">
                   <span>{{$t('StudioEngineer')}}</span>
@@ -48,7 +48,7 @@
                                     v-model="queryParam.studioEngineerName"/>
               </div>
             </a-col>
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="8" v-if="isPersonnelSelection">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('certifiedEngineer')">
                   <span>{{$t('certifiedEngineer')}}</span>
@@ -199,6 +199,7 @@
         formInline: {},
         rules: {},
         visible: false,
+        isPersonnelSelection:true,
         dataSource: [],
         confirmLoading: false,
         url: {
@@ -404,6 +405,10 @@
         this.getList()
       },
       searchReset() {
+        this.isPersonnelSelection = false
+        this.$nextTick(()=>{
+          this.isPersonnelSelection = true
+        })
         this.pageNo = 1
         this.queryParam = {}
         this.getList()
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 138bf8377..6ffd07a67 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -101,7 +101,7 @@
                 </a-select>
               </div>
             </a-col>
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="8" v-if="isPersonnelSelection">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('Sponsor')">
                   <span>{{$t('Sponsor')}}</span>
@@ -114,7 +114,7 @@
                                     v-model="queryParam.initiatorName"/>
               </div>
             </a-col>
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="8" v-if="isPersonnelSelection">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('personLiable')">
                   <span>{{$t('personLiable')}}</span>
@@ -274,6 +274,7 @@
         pageNo: 1,
         orderBy: '1',
         orderByField: '',
+        isPersonnelSelection:true,
         url: {
           page: '/project/ncrTrackController/queryPage',
           exportData: '/project/ncrTrackController/exportData'
@@ -336,6 +337,10 @@
         }
       },
       searchReset() {
+        this.isPersonnelSelection = false
+        this.$nextTick(()=>{
+          this.isPersonnelSelection = true
+        })
         this.pageNo = 1
         this.queryParam = {}
         this.getList()
@@ -392,6 +397,7 @@
       PersonnelSelectionChange(value, id) {
         this.queryParam[value] = id
         this.queryParam = { ...this.queryParam }
+        console.log(this.queryParam)
       },
 
       //流程状态点击事件