From 3a0a48ec668f8a0df9aa5dd49902ecc2c2b1afa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 26 Oct 2023 12:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=90=8E=EF=BC=8C=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=9C=AA=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 191 +++++++++--------- .../components/listOfRegulations.vue | 102 +++++----- .../components/responsibilityList.vue | 129 +++++++++++- .../components/certificationList/index.vue | 92 ++++----- .../components/listOfRegulations.vue | 2 + .../components/responsibilityList.vue | 117 ++++++++++- .../components/responsibilityList.vue | 128 +++++++++++- 7 files changed, 554 insertions(+), 207 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 7ef8546d6..d40476924 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -21,6 +21,7 @@ class="box-input" mode="multiple" allowClear + @change="ProcessStatusChange" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam.flowStatus"> - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -130,9 +133,9 @@ - - -
+ + +
{{ $t('CertificationDirectory') }}
@@ -603,7 +606,7 @@ export default { name: 'index', - props: ['isDisplayNum','areaOfResponsibility'], + props: ['isDisplayNum', 'areaOfResponsibility'], mixins: [ResizeColumnProvide, ResizeHeader], components: { globalAdvancedQuery, @@ -633,7 +636,7 @@ total: 0, JTextLoading: false, visibleoperationFailed: false, - visibleoperation:'', + visibleoperation: '', CertificationColor: { 'Test passed': 'accordColor', 'Test failed': 'nonConformityColor', @@ -896,7 +899,7 @@ align: 'left', dataIndex: 'remark', width: 210, - ellipsis: true, + ellipsis: true }, { title: this.$t('operation'), @@ -913,7 +916,7 @@ toDoNotConditions: [], userInfoQuery: {}, DeliverableTreeList: [], - firstLevelDutyTerritoryList:[], + firstLevelDutyTerritoryList: [] } }, mounted() { @@ -922,9 +925,9 @@ this.long = localStorage.getItem('language') || 'zh-cn' this.loading = true this.userInfoQuery = this.userInfo() - console.log(this.areaOfResponsibility) if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) { this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName + this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : [] this.queryParam = { ...this.queryParam } } this.getProcessStatus() @@ -1206,6 +1209,9 @@ } downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect) }, + ProcessStatusChange(value) { + console.log(value) + }, handleDel() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { @@ -1215,9 +1221,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'List to be released' || this.selectedRowKeysList[i].flowStatus == 'Review and pass') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1284,7 +1290,7 @@ ids: idList.join(','), projectLibraryId: _this.$route.query.id, operatorType: 'certificationInventoryStudioReset', - currRole:_this.roleSwitchingCode + currRole: _this.roleSwitchingCode }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -1310,9 +1316,9 @@ } }, // 关联平台件 - associatedplatformClick(type){ + associatedplatformClick(type) { let flag = '' - if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.detailedWarningList = [] let dataSource = [] let status = '' @@ -1331,31 +1337,31 @@ status = '2' } } - if(status == '1'){ - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) - }else{ + if (status == '1') { + this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(',')) + } else { this.$message.warning(this.$t('unpublishedregulationsselected')) } - }else{ + } else { flag = '2' this.$message.warning(this.$t('selectLeastOne')) } }, - associatedplatForm(id,flag,type,ids){ - console.log(id,flag,type,ids) - let query ={ - ids:ids, - projectLibraryIds:id + associatedplatForm(id, flag, type, ids) { + console.log(id, flag, type, ids) + let query = { + ids: ids, + projectLibraryIds: id } - if(type == '认证'){ + if (type == '认证') { postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => { if (res.success) { - if(res.result == ''){ + if (res.result == '') { this.$refs.associatedplatRef.visible = false this.$message.success(this.$t('OperationSuccessful')) this.selectedRowKeys = [] this.getList() - }else{ + } else { this.visibleoperation = res.result this.visibleoperationFailed = true } @@ -1368,16 +1374,16 @@ // this.$refs.associatedplattwoRef.transferModel(id,type,ids) // } }, - cancleoperationFailed(){ + cancleoperationFailed() { this.visibleoperationFailed = false this.$refs.associatedplatRef.handleCancel() this.selectedRowKeys = [] this.getList() }, - associatedplattwoForm(id,type,ids){ + associatedplattwoForm(id, type, ids) { // this.$refs.associatedplatthreeRef.transferModel(id,type,ids) }, - associatedplatthreeForm(id){ + associatedplatthreeForm(id) { console.log(id) }, //添加 @@ -1425,7 +1431,7 @@ dutyDueDate: 'inventoryVerifyEndTime', title: this.$t('release') } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('inventoryVerifyEndTime')) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('inventoryVerifyEndTime')) } else { this.failedMessage(data) } @@ -1542,9 +1548,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1606,9 +1612,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1629,9 +1635,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1652,9 +1658,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1721,13 +1727,16 @@ let _this = this if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') { console.log(val) - if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){ + if (val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)) { this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated')) - }else{ + } else { this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => { + deleteAction(_this.url.deleteOne, { + id: val.id, + projectLibraryId: _this.$route.query.id + }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) _this.getList() @@ -1857,9 +1866,9 @@ if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1873,9 +1882,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -1914,9 +1923,9 @@ this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { this.toDoIds.push(this.selectedRowKeysList[i].id) } } else { @@ -2036,17 +2045,17 @@ this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { NAId.push(this.selectedRowKeysList[i].id) } } else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType && this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2071,7 +2080,7 @@ title: this.$t('initiateTask'), NAId: NAId } - this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)),this.$t('taskConfirmEndTime')) + this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('taskConfirmEndTime')) // this.submitTask(value, prompt, ids, notConditions, data, NAId) } else { this.failedMessage(data) @@ -2089,9 +2098,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' || this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2124,9 +2133,9 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2158,9 +2167,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2205,9 +2214,9 @@ if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' || this.selectedRowKeysList[i].flowStatus == 'Review and return') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2237,9 +2246,9 @@ this.selectedRowKeysList[i].flowStatus == 'Review and return') && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2268,16 +2277,16 @@ for (let i = 0; i < this.selectedRowKeysList.length; i++) { if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) isTrue = true } @@ -2445,16 +2454,16 @@ if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') { if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else if (this.roleSwitchingCode == 21) { if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) { - this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') ) + this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated')) return - }else{ + } else { ids.push(this.selectedRowKeysList[i].id) } } else { @@ -2502,31 +2511,31 @@ this.$message.warning(this.$t('selectLeastOne')) } }, - bringInRelevantPersonnelClick(){ + bringInRelevantPersonnelClick() { let _this = this // if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - this.$confirm({ - content: _this.$t('confirmBringInRelevantPersonnel'), - onOk() { - // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', { - // ids: selectedRowKeys.join(','), - projectLibraryId: _this.$route.query.id - }).then((res) => { - if (res.success) { - _this.$message.success(_this.$t('OperationSuccessful')) - _this.selectedRowKeys = [] - _this.getList() - } else { - _this.$message.warning(_this.$t('operationFailed')) - } - }) - } - }) + this.$confirm({ + content: _this.$t('confirmBringInRelevantPersonnel'), + onOk() { + // let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', { + // ids: selectedRowKeys.join(','), + projectLibraryId: _this.$route.query.id + }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.selectedRowKeys = [] + _this.getList() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) // } else { // this.$message.warning(this.$t('selectLeastOne')) // } - }, + } } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 44cdf94e3..4995c32d8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -58,6 +58,7 @@ style="width: calc(100% - 80px);" mode="multiple" optionFilterProp="label" + @change="listOptionsChange" :getPopupContainer="triggerNode=> triggerNode.parentNode" v-model="queryParam[selectModel]"> - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -166,11 +169,11 @@ {{ $t('processReset') }}
- - - - - + + + + + - + @@ -795,8 +799,8 @@ pageNo: 1, pageSize: 50, total: 0, - long:'', - visibleoperation:'', + long: '', + visibleoperation: '', roleSwitchingList: [], formInlineQuestion: {}, formInlineReset: {}, @@ -1585,6 +1589,8 @@ this.getFirstLevelDutyTerritory() if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) { this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName + this.selectModel = this.areaOfResponsibilityList.selectModel + this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : [] this.queryParam = { ...this.queryParam } } this.long = localStorage.getItem('language') || 'zh-cn' @@ -1855,15 +1861,15 @@ primaryKeyId: row.primaryKeyId } } - if(row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1){ + if (row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1) { this.$refs.flowstatusdetialRef.addModel(row, name) - }else{ + } else { this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name) } }, - a(){ + a() { this.$refs.flowstatusdetialRef.addModel() }, @@ -1942,7 +1948,9 @@ downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) } }, - + listOptionsChange(row) { + console.log(row) + }, //导出 handleExport() { let roleCodeIndex = this.roleSwitchingCode @@ -1985,9 +1993,9 @@ this.$refs.transferListRef.transferModel() }, // 关联平台件visibleoperation - associatedplatformClick(type){ + associatedplatformClick(type) { let flag = '' - if(this.selectedRowKeys && this.selectedRowKeys.length > 0){ + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.detailedWarningList = [] let dataSource = [] let status = '' @@ -2006,42 +2014,42 @@ } } console.log(status) - if(status == '1'){ + if (status == '1') { this.$message.warning(this.$t('unpublishedregulationsselected')) - }else{ - this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(',')) + } else { + this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(',')) } - }else{ + } else { let ids = [] this.dataSource.forEach(item => { ids.push(item.id) }) flag = '2' - this.$refs.associatedplatRef.transferModel(flag,type,ids.join(',')) + this.$refs.associatedplatRef.transferModel(flag, type, ids.join(',')) } }, - associatedplatForm(id,flag,type,ids){ - if(flag == '1'){ - this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) - }else{ - this.$refs.associatedplattwoRef.transferModel(id,flag,type,ids) + associatedplatForm(id, flag, type, ids) { + if (flag == '1') { + this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids) + } else { + this.$refs.associatedplattwoRef.transferModel(id, flag, type, ids) } }, - associatedplattwoForm(id,flag,type,ids){ - this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids) + associatedplattwoForm(id, flag, type, ids) { + this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids) }, - associatedplatthreeForm(id){ + associatedplatthreeForm(id) { this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() this.selectedRowKeys = [] this.getList() }, - associatedplatthreeFormHomo(msg){ - if(msg){ + associatedplatthreeFormHomo(msg) { + if (msg) { this.visibleoperation = msg this.visibleoperationFailed = true - }else{ + } else { this.$message.success(this.$t('OperationSuccessful')) this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() @@ -2049,7 +2057,7 @@ this.getList() } }, - cancleoperationFailed(){ + cancleoperationFailed() { this.visibleoperationFailed = false this.$refs.associatedplatRef.handleCancel() this.$refs.associatedplattwoRef.handleCancel() @@ -2156,8 +2164,8 @@ contentList[i].designFlowStatus == 'Duty Person Rejected') { if (contentList[i].projectLawsInventoryEOS && (contentList[i].projectLawsInventoryEOS.length > 0 || contentList[i].projectLawsInventoryEOS !== null)) { detailedWarningList.push( - < div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { idList.push(contentList[i].id) } } else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') { @@ -2280,8 +2288,8 @@ content[i].designFlowStatus == 'Results to be reviewed') { if (content[i].projectLawsInventoryEOS && (content[i].projectLawsInventoryEOS.length > 0 || content[i].projectLawsInventoryEOS !== null)) { this.questionWarning.push( - < div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { this.questionIdList.push(content[i].id) } } else { @@ -2407,7 +2415,7 @@ ids: idList.join(','), projectLibraryId: _this.$route.query.id, operateType: _this.formInlineReset.operateType, - currRole:this.roleSwitchingCode + currRole: this.roleSwitchingCode }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -2934,12 +2942,12 @@ dataSource[i].designFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'Regulatory engineer returns') { // if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){ - if (dataSource[i].regulationOwnerId) { - this.detailedSuccessList.push(dataSource[i]) - } else { - this.detailedWarningList.push( - < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) - } + if (dataSource[i].regulationOwnerId) { + this.detailedSuccessList.push(dataSource[i]) + } else { + this.detailedWarningList.push( + < div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>) + } // }else{ // this.detailedWarningList.push( // < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) @@ -3103,8 +3111,8 @@ dataSource[i].designFlowStatus == 'Duty Person Rejected') { if (dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)) { this.detailedWarningList.push( - < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) - }else{ + < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>) + } else { idList.push(dataSource[i].id) this.rowKeysSuccessList.push(dataSource[i]) } @@ -3477,7 +3485,7 @@ if (isDesign || isVerify) { if (dataSource[0].projectLawsInventoryEOS && (dataSource[0].projectLawsInventoryEOS.length > 0 || dataSource[0].projectLawsInventoryEOS !== null)) { this.$message.warning(dataSource[0].serialNumber + this.$t('platformitemhasbeenassociated')) - }else{ + } else { this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify) } } else { diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index a5470d4f5..f3bec6261 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -30,7 +30,7 @@ > - {{text}} + {{text}} @@ -82,7 +82,101 @@ width: 240, sorter: true } - ] + ], + //法规清单 + taskProcessState: {//设计、验证任务确认 + 'Duty Person Accepted': [//设计、验证任务确认-责任人接受 + 'Results to be submitted', + 'Results to be reviewed', + 'Compliance', + 'Non-Compliance', + 'To be tracked' + ], + 'List to be released': [//设计、验证任务确认-清单待发布 + 'List to be released', + 'Regulatory engineer returns' + ], + 'Task to be confirmed': [//设计、验证任务确认-任务待确认 + 'Task to be confirmed' + ], + 'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝 + 'Duty Person Rejected' + ], + 'List to be checked': [//设计、验证任务确认-任务待发起 + 'List to be checked' + ] + }, + complianceProcessState: {//设计、验证符合性 + 'Task to be confirmed': [//任务待确认 + 'List to be released', + 'Regulatory engineer returns', + 'List to be checked', + 'Task to be confirmed', + 'Duty Person Rejected' + ], + 'Results to be submitted': [//结果待提交 + 'Results to be submitted' + ], + 'Results to be reviewed': [//结果待审查 + 'Results to be reviewed' + ], + 'To be tracked': [//待追踪 + 'To be tracked' + ], + 'Compliance': [//符合 + 'Compliance' + ], + 'Non-Compliance': [//不符合 + 'Non-Compliance' + ] + }, + + //认证清单-认证任务确认 + authenticationProcessState: { + 'List to be released': [//清单待发布 + 'List to be released', + 'Certification returned' + ], + 'List to be checked': [//任务待发起 + 'List to be checked' + ], + 'Task to be confirmed': [//任务待确认 + 'Task to be confirmed' + ], + 'Accepted of responsible person': [//责任人接受 + 'Results to be submitted', + 'Results to be reviewed', + 'Review and pass', + 'Review and return' + ], + 'Refusal of responsible person': [//责任人拒绝 + 'Refusal of responsible person' + ] + }, + //认证清单-Pro-homo流程 + proHomoProcessState: { + 'Task to be confirmed': [//任务待确认 + 'List to be released', + 'Certification returned', + 'List to be checked', + 'Task to be confirmed', + 'Refusal of responsible person' + ], + 'Results to be submitted': [//结果待提交 + 'Results to be submitted' + ], + 'Results to be reviewed': [//结果待审查 + 'Results to be reviewed' + ], + 'Review and pass': [//审查通过 + 'Review and pass' + ], + 'Review and return': [//审查退回 + 'Review and return' + ] + }, + //认证清单-认证进度 + progressProcessState: {} } }, mounted() { @@ -108,9 +202,9 @@ this.orderByField = 'designDutyId' } else if (sorter.columnKey == 'verifyDutyIdName') { this.orderByField = 'verifyDutyId' - } else if (sorter.columnKey == 'verifyFlowStatusName') { + } else if (sorter.columnKey == 'verifyFlowStatusName') { this.orderByField = 'verifyFlowStatus' - } else if (sorter.columnKey == 'designFlowStatusName') { + } else if (sorter.columnKey == 'designFlowStatusName') { this.orderByField = 'designFlowStatus' } else { this.orderByField = sorter.columnKey @@ -120,9 +214,9 @@ getList() { this.loading = true let query = { - ...this.queryParam, + ...this.queryParam, orderBy: this.orderBy, - orderByField: this.orderByField, + orderByField: this.orderByField } getAction(this.url.GroupByTerritory, query).then((res) => { if (res.success) { @@ -141,11 +235,26 @@ this.visible = false }, areaOfResponsibilityClick(item) { - if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' || - this.queryParam.operatorType == 'queryVerificationTaskConfirmation' || - this.queryParam.operatorType == 'queryDesignStatistics' || - this.queryParam.operatorType == 'queryVerifyStatistics') { + if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') { item.isListing = '1' + item.processState = this.taskProcessState[this.queryParam.status].join(',') + item.selectModel = 'designFlowStatus' + } else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') { + item.isListing = '1' + item.processState = this.taskProcessState[this.queryParam.status].join(',') + item.selectModel = 'verifyFlowStatus' + } else if (this.queryParam.operatorType == 'queryDesignStatistics') { + item.processState = this.complianceProcessState[this.queryParam.status].join(',') + item.isListing = '1' + item.selectModel = 'designFlowStatus' + } else if (this.queryParam.operatorType == 'queryVerifyStatistics') { + item.processState = this.complianceProcessState[this.queryParam.status].join(',') + item.isListing = '1' + item.selectModel = 'verifyFlowStatus' + } else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') { + item.processState = this.authenticationProcessState[this.queryParam.status].join(',') + } else if (this.queryParam.operatorType == 'queryPrehomoStatistics') { + item.processState = this.proHomoProcessState[this.queryParam.status].join(',') } this.$emit('responsibility', item) } 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 cd2d47208..5221d7161 100644 --- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue @@ -85,8 +85,10 @@ {{ !toggleSearchStatus ? $t('open') : $t('away') }} - {{$t('reset')}} - {{$t('query')}} + {{$t('reset')}} + {{$t('query')}} @@ -130,18 +132,18 @@ - - -
+ + +
{{ $t('CertificationDirectory') }}
- - - - - + + + + +
- - - - - - + + + + + +