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 573f45019..633656b76 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -57,6 +57,7 @@ @@ -359,6 +360,7 @@ prop="category" > @@ -373,6 +375,7 @@ @@ -392,6 +395,7 @@ > @@ -415,6 +419,7 @@ @@ -434,6 +439,7 @@ @@ -876,7 +883,7 @@ this.queryPersonByProject(value.dutyTerritory.join(',')) } console.log(value) - if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS == null)){ + if(value.projectCertificationInventoryEOS && (value.projectCertificationInventoryEOS.length > 0 || value.projectCertificationInventoryEOS != null)){ this.flowdisabled = true this.$refs.uploadFile.disabled = true } diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 4542416a6..cedc088b7 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -18,7 +18,7 @@ @@ -31,6 +31,7 @@ @@ -45,6 +46,7 @@ @@ -58,6 +60,7 @@ @@ -75,6 +78,7 @@ @@ -90,6 +94,7 @@ @@ -109,7 +114,7 @@ optionFilterProp="label" @change="DutyDepartChange" mode="multiple" - :disabled="formInline.roleCodeIndex == 0 ? false : true" + :disabled="isdata(this.formInline)" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="formInline.dutyDepart"> @@ -194,6 +199,7 @@ @@ -887,6 +893,23 @@ return true } }, + isdata(val) { + // if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' || + // val.designFlowStatus == 'Results to be reviewed') { + // return true + // } else { + // return false + // } + if (val.roleCodeIndex == '0') { + if(this.dataList && this.dataList.length > 0) { + return true + }else{ + return false + } + } else { + return false + } + }, isEditVerifi(val) { // if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' || // val.verifyFlowStatus == 'Results to be reviewed') {