From bd8dd3bfedc43c8587e1b36ee1ecf192cd1f9fb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 14:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 29 +++++++++++++------
 .../components/certificationList/index.vue    |  5 +++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
index 71e0eb61c..25f1f896c 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
@@ -46,7 +46,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="wvtaId">
                   <a-input class="box-input"
-                           v-model="formInline.wvtaId"
+                           v-model.trim="formInline.wvtaId"
                            :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
               </div>
@@ -75,7 +75,7 @@
                             }]"
                     >
                       <a-input class="box-input"
-                               v-model="item.category"
+                               v-model.trim="item.category"
                                :placeholder="$t('PleaseEnter')+$t('category')"/>
                     </a-form-model-item>
                   </div>
@@ -92,7 +92,7 @@
                              {max: 300,message: $t('inspectionItems') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
                             }]">
                       <a-input class="box-input"
-                               v-model="item.inspectionItem"
+                               v-model.trim="item.inspectionItem"
                                :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
                     </a-form-model-item>
                   </div>
@@ -113,7 +113,7 @@
                             }]"
                     >
                       <a-input class="box-input"
-                               v-model="item.configItem"
+                               v-model.trim="item.configItem"
                                :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
                       <!--                      <j-dict-select-tag class="box-input" v-model="item.configItem"-->
                       <!--                                         @input="handleInput('dataList.'+index+'.configItem')"-->
@@ -204,7 +204,7 @@
                       <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                                 optionFilterProp="label"
                                 showSearch
-                                @change="handleInput('dataList.'+index+'.sdt')"
+                                @change="handleInput('dataList.'+index+'.sdt',item.sdt,index,item.engineeringInterfacePersonList)"
                                 v-model="item.sdt">
                         <a-select-option v-for="(val, key) in item.engineeringInterfacePersonList"
                                          :label="val.name"
@@ -281,7 +281,7 @@
                     prop="category"
                   >
                     <a-input class="box-input"
-                             v-model="formInline.category"
+                             v-model.trim="formInline.category"
                              :placeholder="$t('PleaseEnter')+$t('category')"/>
                   </a-form-model-item>
                 </div>
@@ -295,7 +295,7 @@
                   <a-form-model-item class="itemModel"
                                      :prop="'inspectionItem'">
                     <a-input class="box-input"
-                             v-model="formInline.inspectionItem"
+                             v-model.trim="formInline.inspectionItem"
                              :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
                   </a-form-model-item>
                 </div>
@@ -313,7 +313,7 @@
                     :prop="'configItem'"
                   >
                     <a-input class="box-input"
-                             v-model="formInline.configItem"
+                             v-model.trim="formInline.configItem"
                              :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
                     <!--                    <j-dict-select-tag class="box-input" v-model="formInline.configItem"-->
                     <!--                                       @input="handleInput('configItem')"-->
@@ -398,6 +398,7 @@
                   >
                     <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
                               optionFilterProp="label"
+                              @change="handleInput('sdt',formInline.sdt)"
                               showSearch
                               v-model="formInline.sdt">
                       <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
@@ -695,7 +696,16 @@
           }
         })
       },
-      handleInput(value) {
+      handleInput(value, id, index, array) {
+        if (array) {
+          let content = array.filter(res => {
+            return res.value === id
+          })
+          if (content && content.length > 0) {
+            this.formInline.dataList[index].dutyPersonName = content[0].name
+            this.formInline.dataList[index].dutyPerson = content[0].value
+          }
+        }
         this.$nextTick(() => {
           this.formInline = { ...this.formInline }
           this.$refs.ruleForm.validateField([value])
@@ -796,6 +806,7 @@
                 this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []
                 if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) {
                   this.formInline.dataList[index].sdt = res.result.engineeringInterfacePersonList[0].value
+                  this.handleInput('dataList.' + index + '.sdt', this.formInline.dataList[index].sdt, index, res.result.engineeringInterfacePersonList)
                 }
                 this.formInline = { ...this.formInline }
               })
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 67604767d..ec076d2c6 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -284,7 +284,10 @@
         <span slot="DeliverablesResult" slot-scope="text,record,index">
                   <span v-if="(record.flowStatus == 'Results to be submitted' &&
                   record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
-                  record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21">
+                  (record.flowStatus == 'Review and return' &&
+                  record.dutyPersonName == userInfoQuery.username && roleSwitchingCode == 20) ||
+                  (record.flowStatus == 'Results to be submitted' && roleSwitchingCode == 21) ||
+                  (record.flowStatus == 'Review and return' && roleSwitchingCode == 21)">
                    <a-button type="primary" class="button-text"
                              v-if="record.valueType == 'file'"
                              @click="clickButtonToUpload('deliveryResult',index)">