From 2aa7743bb9043221272c5313555c378b793d029b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Sun, 16 Jul 2023 10:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=81=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/editModel.vue | 32 ++++++++++++------- .../certificationList/components/addModel.vue | 1 + .../components/listEditModel.vue | 19 ++++++++--- .../components/editModel.vue | 5 ++- 4 files changed, 41 insertions(+), 16 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index e66a93320..bb1965763 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -303,11 +303,11 @@ - - - - - + + + + + @@ -659,7 +659,8 @@
{{$t('cancel')}} - {{$t('submit')}} + {{$t('submit')}} +
@@ -739,21 +740,21 @@ trigger: 'change' } ], - dutyDepart:[ + dutyDepart: [ { required: true, message: this.$t('statisticalNodes') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, formInline: {}, disabled: false, title: '', CategoryTreeList: [], DeliverableTreeList: [], - firstLevelDutyTerritoryList:[], - dutyTerritoryList:[], + firstLevelDutyTerritoryList: [], + dutyTerritoryList: [] } }, mounted() { @@ -764,7 +765,7 @@ methods: { DutyDepartChange(event) { this.formInline.dutyTerritory = [] - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.getDutyTerritory(event.join(',')) }, getDutyTerritory(row) { @@ -810,6 +811,7 @@ this.visible = true this.disabled = false this.title = this.$t('edit') + this.dutyTerritoryList = [] this.$nextTick(() => { this.formInline = item || {} this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] @@ -817,6 +819,9 @@ this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : [] this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : [] this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : [] + if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) { + this.getDutyTerritory(this.formInline.dutyDepart.join(',')) + } this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : [] this.$refs.ruleForm.clearValidate() }) @@ -825,6 +830,7 @@ this.visible = true this.disabled = true this.title = this.$t('view') + this.dutyTerritoryList = [] this.$nextTick(() => { this.formInline = item || {} this.formInline.technologyTerritory = this.formInline.technologyTerritory ? this.formInline.technologyTerritory.split(',') : [] @@ -832,6 +838,9 @@ this.formInline.prehomoDeliverableType = this.formInline.prehomoDeliverableType ? this.formInline.prehomoDeliverableType.split(',') : [] this.formInline.verifyDeliverableType = this.formInline.verifyDeliverableType ? this.formInline.verifyDeliverableType.split(',') : [] this.formInline.dutyDepart = this.formInline.dutyDepart ? this.formInline.dutyDepart.split(',') : [] + if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) { + this.getDutyTerritory(this.formInline.dutyDepart.join(',')) + } this.formInline.dutyTerritory = this.formInline.dutyTerritory ? this.formInline.dutyTerritory.split(',') : [] this.$refs.ruleForm.clearValidate() }) @@ -1084,6 +1093,7 @@ background: #fff; border-radius: 0 0 2px 2px; } + ::v-deep .ant-form-item-with-help { margin-bottom: 25px; } 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 8ea23ad84..b47e38a8d 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -853,6 +853,7 @@ }, editModel(value) { this.formInline = {} + this.dutyTerritoryList = [] this.visible = true this.personnelVisible = true value.dutyDepart = value.dutyDepart ? value.dutyDepart.split(',') : [] diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index c8faf16b8..99c6e377f 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -757,16 +757,26 @@ }) }, isEdit(val) { - if (val.designFlowStatus == 'Task to be confirmed' || val.designFlowStatus == 'Results to be submitted' || - val.designFlowStatus == 'Results to be reviewed') { + // 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' || val.roleCodeIndex == '1') { return true } else { return false } }, isEditVerifi(val) { - if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' || - val.verifyFlowStatus == 'Results to be reviewed') { + // if (val.verifyFlowStatus == 'Task to be confirmed' || val.verifyFlowStatus == 'Results to be submitted' || + // val.verifyFlowStatus == 'Results to be reviewed') { + // return true + // } else { + // return false + // } + if (val.roleCodeIndex == '0' || val.roleCodeIndex == '1') { return true } else { return false @@ -896,6 +906,7 @@ }, editModel(item) { this.visible = true + this.dutyTerritoryList = [] this.regulatoryEngineerList = [] this.engineeringInterfacePersonList = [] this.certificationEngineerList = [] diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 7e55582a8..741455b05 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -369,6 +369,7 @@ editModel(item, data) { this.visible = true this.title = this.$t('edit') + this.dutyTerritoryList = [] this.$nextTick(() => { this.formInline = item || {} if (this.formInline.deliverableType) { @@ -381,6 +382,9 @@ } else { this.formInline.dutyDepart = [] } + if (this.formInline.dutyDepart && this.formInline.dutyDepart.length > 0) { + this.getDutyTerritory(this.formInline.dutyDepart.join(',')) + } if (this.formInline.dutyTerritory) { this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') } else { @@ -388,7 +392,6 @@ } this.$refs.ruleForm.clearValidate() }) - console.log(this.formInline) if (data == 1) { this.title = this.$t('view') this.disabled = true