diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index b2974fbfc..ba87350bd 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -33,7 +33,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "To be collected" || record.state == "Rejected by eng. interface" || record.state == "Modify"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} @@ -49,7 +49,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index aaef47f42..1eae46f47 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -739,6 +739,11 @@ this.$nextTick(()=>{ this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole this.$refs.ruleFormRoleSwitching.clearValidate() + setTimeout(() => { + if (this.currentPersonRole == 'dre') { + this.handlePreservation() + } + }, 10000) }) }, GetgetLoginUserType() { @@ -769,7 +774,7 @@ } else { this.selectedRowKeysValue.forEach((item, index) => { // 状态不符合,不能下发收集 - if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { + if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -796,7 +801,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== 'Submit') { + if (item.state !== '已提交' && item.state !== 'Submitted') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoTH' flag = 0 @@ -814,7 +819,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtTH' flag = 0 @@ -832,7 +837,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreTH' flag = 0 @@ -894,7 +899,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { + if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -913,7 +918,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submit' && item.state !== 'Change') { + if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submitted' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -932,7 +937,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待发起收集' && item.state !== 'Wait Collect') { + if (item.state !== '待发起收集' && item.state !== 'To be collected') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -953,7 +958,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoQZTH' flag = 0 @@ -972,7 +977,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== 'Wait Fill') { + if (item.state !== '待填写' && item.state !== 'To be filled') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtQZTH' flag = 0 @@ -990,7 +995,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== 'Submit') { + if (item.state !== '已提交' && item.state !== 'Submitted') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreQZTH' flag = 0 @@ -1011,7 +1016,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1030,7 +1035,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1048,7 +1053,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1295,8 +1300,8 @@ let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource)) let selectedRowKeysValue = [] data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Cert Back') { + if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || + res.state == 'Rejected by homo engineer') { selectedRowKeysValue.push(res) } })