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'},]"
>
-
-
-
- {{ val.name}}
-
-
-
+
@@ -500,21 +491,27 @@
:rules="[{ required: formInline.deliverableType=='1635545748968783874'?false:true,
message: $t('engineeringInterfacePerson') + $t('cannotEmpty'), trigger: 'change'}]"
>
-
-
-
- {{ item.name}}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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 @@
{{$t('engineeringInterfacePerson')}}
-
-
-
- {{ item.name }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+ v-if="roleSwitchingCode == 1" class="operator-text">
{{ $t('initiateTask') }}
+ v-if="roleSwitchingCode == 1" class="operator-text">
{{ $t('returnToStudio') }}
-
{{ $t('reviewAndPass') }}
-
{{ $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 @@
*
{{$t('regulatoryEngineer')}}
-
+
@@ -187,7 +187,7 @@
v-if="visible"
:disabled="isEdit(this.formInline)"
@change="PersonnelSelectionChange"
- v-model="formInline.regulationOwnerId"/>
+ v-model="formInline.regulationOwnerIdName"/>
@@ -197,7 +197,7 @@
*
{{$t('engineeringInterfacePerson')}}
-
+
@@ -217,7 +217,7 @@
v-if="visible"
:disabled="isEdit(this.formInline)"
@change="PersonnelSelectionChange"
- v-model="formInline.engineeringInterfacePerson"/>
+ v-model="formInline.engineeringInterfacePersonName"/>
@@ -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()
})