From 34b33b608f66c881c84e40a943668b35d6b43a55 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 15 Sep 2023 09:56:42 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certificationList/components/addModel.vue |  1 +
 .../components/listEditModel.vue              | 88 +++++++++++--------
 2 files changed, 52 insertions(+), 37 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 d3e4a156e..c2236b6ad 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
@@ -1055,6 +1055,7 @@
         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)
       },
       queryPersonByProject(row, index) {
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
index f2e5cfa7d..2bd9fb111 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listEditModel.vue
@@ -99,7 +99,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text"
                       :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
               </div>
@@ -109,7 +109,7 @@
                           optionFilterProp="label"
                           @change="DutyDepartChange"
                           mode="multiple"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                          :disabled="formInline.roleCodeIndex == 1 ? false : true"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           v-model="formInline.dutyDepart">
                   <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
@@ -127,7 +127,7 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <span class="Required" v-if="formInline.roleCodeIndex == 1">*</span>
                 <span class="title-text-text"
                       :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
               </div>
@@ -151,7 +151,7 @@
 <!--                </a-select>-->
                 <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
                                     @change="dutyTerritoryChange"
-                                    :disabled="formInline.roleCodeIndex == 0 ? false : true"
+                                    :disabled="formInline.roleCodeIndex == 1 ? false : true"
                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                     :type="'select'"
                                     :triggerChange="false" :dictCode="'duty_territory'"/>
@@ -163,24 +163,31 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="Required" v-if="formInline.roleCodeIndex == 0">*</span>
+                <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-select :placeholder="$t('PleaseSelect')+$t('regulatoryEngineer')"
-                          class="box-input"
-                          :disabled="formInline.roleCodeIndex == 0 ? false : true"
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          allowClear
-                          v-model="formInline.regulationOwnerId">
-                  <a-select-option v-for="(item, key) in regulatoryEngineerList"
-                                   :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('regulatoryEngineer')"-->
+<!--                          class="box-input"-->
+<!--                          :disabled="formInline.roleCodeIndex == 1 ? false : true"-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          allowClear-->
+<!--                          v-model="formInline.regulationOwnerId">-->
+<!--                  <a-select-option v-for="(item, key) in regulatoryEngineerList"-->
+<!--                                   :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:'regulationOwnerId',db_field_txt:$t('regulatoryEngineer')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEdit(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.regulationOwnerId"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -191,19 +198,26 @@
                 <span class="title-text-text" :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="'engineeringInterfacePerson'">
-                <a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
-                          class="box-input"
-                          allowClear
-                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          v-model="formInline.engineeringInterfacePerson">
-                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"
-                                   :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')"-->
+<!--                          class="box-input"-->
+<!--                          allowClear-->
+<!--                          :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                          v-model="formInline.engineeringInterfacePerson">-->
+<!--                  <a-select-option v-for="(item, key) in engineeringInterfacePersonList"-->
+<!--                                   :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:'engineeringInterfacePerson',db_field_txt:$t('engineeringInterfacePerson')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    v-if="visible"
+                                    :disabled="isEdit(this.formInline)"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.engineeringInterfacePerson"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -485,11 +499,11 @@
             </div>
           </a-col>
         </a-row>
-        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0">
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 1 && formInline.roleCodeIndex == 1">
           {{$t('reasonForReturnOfDesignCompliance')}}
         </div>
 
-        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 0"
+        <div v-if="rejectCauseList && rejectCauseList.length > 0 && formInline.roleCodeIndex == 1"
              v-for="(item,index) in rejectCauseList">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -531,11 +545,11 @@
         </div>
 
         <div class="header-text"
-             v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0">
+             v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 1">
           {{$t('verifyComplianceConfirmReturnReason')}}
         </div>
 
-        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 0"
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0 && formInline.roleCodeIndex == 1"
              v-for="(item,index) in rejectCauseListOne">
           <a-row :gutter="24">
             <a-col :span="12">
@@ -579,7 +593,7 @@
     </a-spin>
     <div class="drawer-bootom-button">
       <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
-      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 0" type="primary" :loading="confirmLoading">
+      <a-button @click="handleSubmit" v-if="formInline.roleCodeIndex == 1" type="primary" :loading="confirmLoading">
         {{$t('submit')}}
       </a-button>
       <a-button @click="handleSubmit" v-else type="primary" :loading="confirmLoading">{{$t('confirm')}}</a-button>