Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue

@@ -29,13 +29,13 @@
       <a-tab-pane disabled :key="$t('auxiliaryupgradehavechanged')"  :tab="$t('auxiliaryupgradehavechanged')">
         <auxiliaryupgradehavechanged v-if="tabActive == $t('auxiliaryupgradehavechanged')" @beupgradedonlineup='beupgradedonlineup' @beupgradedonlinedown='beupgradedonlinedown' ref="beupgradedonlineRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('usernotification')" :tab="$t('usernotification')">
+      <a-tab-pane disabled :key="$t('usernotification')" :tab="$t('usernotification')">
         <usernotification v-if="tabActive == $t('usernotification')" @recordparametersup='recordparametersup' @recordparametersdown='recordparametersdown' ref="recordparametersRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('informationaboutotherupgradetasks')" :tab="$t('informationaboutotherupgradetasks')">
+      <a-tab-pane disabled :key="$t('informationaboutotherupgradetasks')" :tab="$t('informationaboutotherupgradetasks')">
         <informationaboutotherupgradetasks v-if="tabActive == $t('informationaboutotherupgradetasks')" @otherup='otherup' ref="otherRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
+      <a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
         <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
       </a-tab-pane>
     </a-tabs>

jero-web/src/views/otamanagement/vehicleinformation/index.vue

@@ -35,7 +35,7 @@
       <a-tab-pane disabled :key="$t('other')" :tab="$t('other')">
         <other v-if="tabActive == $t('other')" @otherup='otherup' ref="otherRef"/>
       </a-tab-pane>
-      <a-tab-pane :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
+      <a-tab-pane disabled :key="$t('historicalrecord')" :tab="$t('historicalrecord')">
         <historicalrecord v-if="tabActive == $t('historicalrecord')" ref="historicalrecordRef" @historicalrecordup='historicalrecordup'/>
       </a-tab-pane>
     </a-tabs>

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -632,7 +632,7 @@
         })
       },
       editModel(value) {
-        // this.formInline = {}
+        this.formInline = {}
         this.visible = true
         this.formInline = JSON.parse(JSON.stringify(value))
         // if (this.formInline.deliverableType) {
@@ -644,7 +644,7 @@
         this.getRegulationNo()
         this.title = this.$t('edit')
         this.$nextTick(() => {
-          this.formInline = {...this.formInline}
+          this.formInline = { ...this.formInline }
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -773,7 +773,7 @@
       },
       dutyHandleChange(index) {
         this.formInline.dataList[index].sdt = undefined
-        this.formInline = {... this.formInline}
+        this.formInline = { ...this.formInline }
         this.queryPersonByProject(this.formInline.dataList[index].dutyTerritory, index)
       },
       queryPersonByProject(row, index) {
@@ -785,10 +785,18 @@
           if (res.success) {
             if (this.formInline.id) {
               this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
+              if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1){
+                this.formInline.sdt = res.result.engineeringInterfacePersonList[0].value
+              }else if(this.engineeringInterfacePersonList.length == 0){
+                this.formInline.sdt = undefined
+              }
             } else {
-              this.$nextTick(()=>{
+              this.$nextTick(() => {
                 this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []
-                this.formInline = {...this.formInline}
+                if (res.result.engineeringInterfacePersonList && res.result.engineeringInterfacePersonList.length == 1) {
+                  this.formInline.dataList[index].sdt = res.result.engineeringInterfacePersonList[0].value
+                }
+                this.formInline = { ...this.formInline }
               })
             }
           }

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -1022,11 +1022,11 @@
         this.formInline.engineeringInterfacePerson = undefined
         this.formInline.homologationEngineerId = undefined
         this.formInline.designInitiatorId = undefined
-        this.formInline.designDutyId = undefined
+        // this.formInline.designDutyId = undefined
         this.formInline.prehomoInitiatorId = undefined
         this.formInline.prehomoDutyId = undefined
         this.formInline.verifyInitiatorId = undefined
-        this.formInline.verifyDutyId = undefined
+        // this.formInline.verifyDutyId = undefined
         this.queryPersonByProject(event)
       },
 
@@ -1158,9 +1158,9 @@
         if (!(this.designInitiatorList.some(val => val.value == row.designInitiatorId))) {
           row.designInitiatorId = undefined
         }
-        if (!(this.designDutyList.some(val => val.value == row.designDutyId))) {
+        // if (!(this.designDutyList.some(val => val.value == row.designDutyId))) {
-          row.designDutyId = undefined
+        //   row.designDutyId = undefined
-        }
+        // }
         if (!(this.prehomoInitiatorList.some(val => val.value == row.prehomoInitiatorId))) {
           row.prehomoInitiatorId = undefined
         }
@@ -1170,9 +1170,9 @@
         if (!(this.verifyInitiatorList.some(val => val.value == row.verifyInitiatorId))) {
           row.verifyInitiatorId = undefined
         }
-        if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) {
+        // if (!(this.verifyDutyList.some(val => val.value == row.verifyDutyId))) {
-          row.verifyDutyId = undefined
+        //   row.verifyDutyId = undefined
-        }
+        // }
         if (!(this.regulatoryEngineerList.some(val => val.value == row.regulationOwnerId))) {
           row.regulationOwnerId = undefined
         }