From 1e4a8c77205b1c8b8c92d70fcc44f17dbe88b087 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 11:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=9B=9E=E6=98=BE=20=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue | 72 ++++++++++---------
 .../components/batSetting.vue                 | 36 ++++++----
 .../components/modifyHistoryList.vue          |  2 +-
 .../components/certificationList/index.vue    | 12 ++--
 .../components/listEditModel.vue              | 20 +++---
 5 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
index c2236b6ad..1bd0ae6b5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/addModel.vue
@@ -234,21 +234,12 @@
                                        :prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.sdt'"
                                        :rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'},]"
                     >
-                      <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                                optionFilterProp="label"
-                                showSearch
-                                @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"
-                                         :key="key"
-                                         :value="val.value">
-                     <span style="display: inline-block;width: 100%"
-                           :title=" val.name ">
-                           {{ val.name}}
-                     </span>
-                        </a-select-option>
-                      </a-select>
+                      <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                          :isSingleChoice="true"
+                                          :personneQuery="formInline"
+                                          v-if="visible"
+                                          @change="PersonnelSelectionChange"
+                                          v-model="item.sdt"/>
                     </a-form-model-item>
                   </div>
                 </a-col>
@@ -500,21 +491,27 @@
                                      :rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
                                  message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
                   >
-                    <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"
-                                       :label="item.name"
-                                       :key="key"
-                                       :value="item.value">
-                     <span style="display: inline-block;width: 100%"
-                           :title=" item.name ">
-                           {{ item.name}}
-                     </span>
-                      </a-select-option>
-                    </a-select>
+<!--                    <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"-->
+<!--                                       :label="item.name"-->
+<!--                                       :key="key"-->
+<!--                                       :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%"-->
+<!--                           :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                      </a-select-option>-->
+<!--                    </a-select>-->
+                    <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                        :isSingleChoice="true"
+                                        :personneQuery="formInline"
+                                        v-if="visible"
+                                        @change="PersonnelSelectionChange"
+                                        v-model="formInline.sdt"/>
                   </a-form-model-item>
                 </div>
               </a-col>
@@ -974,12 +971,17 @@
         })
       },
       PersonnelSelectionChange(value, id, index) {
+        console.log(value, id, index)
         if (this.formInline.id) {
           this.formInline[value] = id
         } else {
           this.formInline.dataList[index][value] = id
         }
-        this.formInline = { ...this.formInline }
+        // console.log(this.formInline.sdt)
+        this.$nextTick(() => {
+          this.formInline = { ...this.formInline }
+          this.$refs.ruleForm.validateField([value])
+        })
       },
       clickButtonToUpload(item, index, isTrue) {
         this.numIndex = index
@@ -1048,15 +1050,15 @@
         }
       },
       handleChange(value) {
-        this.formInline.sdt = undefined
-        this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
+        // this.formInline.sdt = undefined
+        // this.queryPersonByProject(this.formInline.dutyTerritory.join(','))
       },
       dutyHandleChange(index) {
         this.formInline.dataList[index].sdt = undefined
         this.formInline = { ...this.formInline }
         this.handleInput('dataList.' + index + '.dutyTerritory')
-        console.log(11)
-        this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
+        // console.log(11)
+        // this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory.join(','), index)
       },
       queryPersonByProject(row, index) {
         let query = {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
index 02b908714..e50c44aad 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/batSetting.vue
@@ -35,21 +35,27 @@
               <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
             </div>
             <a-form-model-item class="itemModel">
-              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"
-                        class="box-input"
-                        allowClear
-                        optionFilterProp="label"
-                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                        v-model="formInline.sdt">
-                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
-                                 :key="item.key"
-                                 :label="item.name"
-                                 :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name }}
-                     </span>
-                </a-select-option>
-              </a-select>
+<!--              <a-select :placeholder="$t('cannotSetResponsibilityAreas')"-->
+<!--                        class="box-input"-->
+<!--                        allowClear-->
+<!--                        optionFilterProp="label"-->
+<!--                        :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                        v-model="formInline.sdt">-->
+<!--                <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+<!--                                 :key="item.key"-->
+<!--                                 :label="item.name"-->
+<!--                                 :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name }}-->
+<!--                     </span>-->
+<!--                </a-select-option>-->
+<!--              </a-select>-->
+              <PersonnelSelection :query="{db_field_name:'sdt',db_field_txt:$t('engineeringInterfacePerson')}"
+                                  :isSingleChoice="true"
+                                  :personneQuery="formInline"
+                                  v-if="visible"
+                                  @change="PersonnelSelectionChange"
+                                  v-model="formInline.sdt"/>
             </a-form-model-item>
           </div>
         </a-col>
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
index 42654f963..32eb8dcaf 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/components/modifyHistoryList.vue
@@ -54,7 +54,7 @@
         total: 0,
         projectCertificationInventoryId: '',
         url: {
-          list: '/platform/projectCertificationInventoryLogEO/page'
+          list: '/project/projectCertificationInventoryLogEO/page'
         },
         columns: [
           {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index 2bede49f3..4f1464d6b 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -228,27 +228,27 @@
 
         <!--        发起任务-->
         <div @click="initiatingProcessClick('rzgcsjsrw',$t('confirmLaunchTask'))"
-             v-if="roleSwitchingCode == 2" class="operator-text">
+             v-if="roleSwitchingCode == 1" class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('initiateTask') }}
         </div>
 
         <!--        退回至Studio-->
         <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"
-             v-if="roleSwitchingCode == 2" class="operator-text">
+             v-if="roleSwitchingCode == 1" class="operator-text">
           <a-icon type="close-circle"/>
           {{ $t('returnToStudio') }}
         </div>
 
         <!--        审批通过-->
-        <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 2"
+        <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 1"
              class="operator-text">
           <a-icon type="check-circle"/>
           {{ $t('reviewAndPass') }}
         </div>
 
         <!--        审批退回-->
-        <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 2"
+        <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 1"
              class="operator-text">
           <a-icon type="close-circle"/>
           {{ $t('reviewAndReturn') }}
@@ -1125,10 +1125,10 @@
           ...this.queryParam,
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
-          excelName: this.$route.query.projectName,
+          excelName: this.$route.query.projectNameId,
           projectLibraryId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.projectNameId + '.zip', query, this.Deselect)
       },
       handleDel() {
         let _this = this
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index 2bd9fb111..53fac2abb 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -166,7 +166,7 @@
                 <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text" :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'regulationOwnerId'">
+              <a-form-model-item class="itemModel" :prop="'regulationOwnerIdName'">
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"-->
 <!--                          class="box-input"-->
 <!--                          :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
@@ -187,7 +187,7 @@
                                     v-if="visible"
                                     :disabled="isEdit(this.formInline)"
                                     @change="PersonnelSelectionChange"
-                                    v-model="formInline.regulationOwnerId"/>
+                                    v-model="formInline.regulationOwnerIdName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -197,7 +197,7 @@
                 <span class="Required">*</span>
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
+              <a-form-model-item class="itemModel" :prop="'engineeringInterfacePersonName'">
 <!--                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"-->
 <!--                          class="box-input"-->
 <!--                          allowClear-->
@@ -217,7 +217,7 @@
                                     v-if="visible"
                                     :disabled="isEdit(this.formInline)"
                                     @change="PersonnelSelectionChange"
-                                    v-model="formInline.engineeringInterfacePerson"/>
+                                    v-model="formInline.engineeringInterfacePersonName"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -847,8 +847,6 @@
         })
       },
       dutyTerritoryChange(event) {
-        this.formInline.regulationOwnerId = undefined
-        this.formInline.engineeringInterfacePerson = undefined
         this.formInline.homologationEngineerId = undefined
         this.formInline.designInitiatorId = undefined
         this.formInline.prehomoInitiatorId = undefined
@@ -940,12 +938,14 @@
           this.getDutyTerritory(item.dutyDepart.join(','))
         }
         console.log(item.dutyTerritory)
-        if (item.dutyTerritory && item.dutyTerritory.length > 0) {
-          this.queryPersonByProject(item)
-        } else {
+        // if (item.dutyTerritory && item.dutyTerritory.length > 0) {
+        //   this.queryPersonByProject(item)
+        // } else {
           this.formInline = item
           this.formInline = { ...this.formInline }
-        }
+        // }
+        console.log(this.formInline)
+        console.log(this.formInline.regulationOwnerIdName)
         this.$nextTick(() => {
           this.$refs.ruleForm.clearValidate()
         })