diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 38f185c66..ea5608dd6 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -31,7 +31,7 @@ @@ -994,7 +994,7 @@ // } else if (row.designInitiator == 0) { // this.designInitiatorList = res.result.studioPersonList || [] // } else if (!row.designInitiator || row.designInitiator == '') { - this.designInitiatorList = res.result.allPersonList || [] + this.designInitiatorList = res.result.allPersonList || [] // } //设计符合性确认-责任人 // if (row.designDuty == 1) { @@ -1006,7 +1006,7 @@ // } else if (row.designInitiator == 0) { // this.designDutyList = res.result.studioPersonList || [] // } else if (!row.designDuty || row.designDuty == '') { - this.designDutyList = res.result.allPersonList || [] + this.designDutyList = res.result.allPersonList || [] // } //prehomo确认-发起人 // if (row.prehomoInitiator == 1) { @@ -1018,7 +1018,7 @@ // } else if (row.designInitiator == 0) { // this.prehomoInitiatorList = res.result.studioPersonList || [] // } else if (!row.prehomoInitiator || row.prehomoInitiator == '') { - this.prehomoInitiatorList = res.result.allPersonList || [] + this.prehomoInitiatorList = res.result.allPersonList || [] // } //prehomo确认-责任人 // if (row.prehomoDuty == 1) { @@ -1030,7 +1030,7 @@ // } else if (row.designInitiator == 0) { // this.prehomoDutyList = res.result.studioPersonList || [] // } else if (!row.prehomoDuty || row.prehomoDuty == '') { - this.prehomoDutyList = res.result.allPersonList || [] + this.prehomoDutyList = res.result.allPersonList || [] // } //验证符合性确认-发起人 // if (row.verifyInitiator == 1) { @@ -1042,7 +1042,7 @@ // } else if (row.designInitiator == 0) { // this.verifyInitiatorList = res.result.studioPersonList || [] // } else if (!row.verifyInitiator || row.verifyInitiator == '') { - this.verifyInitiatorList = res.result.allPersonList || [] + this.verifyInitiatorList = res.result.allPersonList || [] // } //验证符合性确认-责任人 // if (row.verifyDuty == 1) { @@ -1054,7 +1054,7 @@ // } else if (row.designInitiator == 0) { // this.verifyDutyList = res.result.studioPersonList || [] // } else if (!row.verifyDuty || row.verifyDuty == '') { - this.verifyDutyList = res.result.allPersonList || [] + this.verifyDutyList = res.result.allPersonList || [] // } callback() }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index d23200165..6a69c579a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -169,6 +169,11 @@
+
+ + {{ $t('export') }} +
{{ $t('submit') }} @@ -1061,11 +1066,21 @@ } }, handleExport() { + let roleCodeIndex + if (this.isDisplay) { + roleCodeIndex = 0 + } else { + roleCodeIndex = 4 + } + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + roleCodeIndex = 0 + } let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { ...this.queryParam, ids: selectedRowKeys.join(','), ...this.queryParamQuery, + roleCode:roleCodeIndex, projectLibraryId: this.$route.query.id } downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect) @@ -1733,7 +1748,7 @@ } else if (!dataSource[i].designDueDate) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>) continue - }else if (!dataSource[i].designDeliverableType) { + } else if (!dataSource[i].designDeliverableType) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } @@ -1751,7 +1766,7 @@ } else if (!dataSource[i].prehomoDueDate) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>) continue - }else if (!dataSource[i].prehomoDeliverableType) { + } else if (!dataSource[i].prehomoDeliverableType) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } @@ -1769,7 +1784,7 @@ } else if (!dataSource[i].verifyDueDate) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>) continue - }else if (!dataSource[i].verifyDeliverableType) { + } else if (!dataSource[i].verifyDeliverableType) { this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>) continue } @@ -1864,7 +1879,7 @@ _this.getRowKeys(selectedRowKeys, 2, function() { _this.visibleComment = true _this.formInlineComment = {} - _this.$nextTick(()=>{ + _this.$nextTick(() => { _this.$refs.ruleFormComment.clearValidate() }) }) @@ -1886,7 +1901,7 @@ }) } let query = { - commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+':' + this.formInlineComment.commentContent, + commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + ':' + this.formInlineComment.commentContent, projectLibraryId: this.$route.query.id } this.confirmLoadingComment = true