From a84efecf9f0086b97b0193c5642af9915d9fddc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 22 Mar 2023 10:19:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=88=97=E8=A1=A8=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 96 +------------------ .../components/SentList.vue | 12 +-- .../components/circulationHistory.vue | 2 +- .../components/confirmationDrawer.vue | 4 +- .../components/designCompliance.vue | 1 + .../components/doneList.vue | 6 +- .../reviewedByThePersonInCharge.vue | 2 +- 7 files changed, 11 insertions(+), 112 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 587a44a6b..1d30390c7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -863,7 +863,7 @@ headFieldEn: 'Process Status', field: 'designFlowStatusName', affirmFlag: '1', - key: 24 , + key: 24, moduleFlag: '法规清单' }, { @@ -1496,6 +1496,7 @@ this.visibleRoleSwitching = false this.confirmLoadingRoleSwitching = false this.$emit('getRoleSwitch', this.formInlineRoleSwitching.roleSwitchingCode) + this.selectedRowKeys = [] this.getList() } else { this.confirmLoadingRoleSwitching = false @@ -1868,97 +1869,6 @@ } }, - initiateTaskConfirmationClick(name) { - this.timeName = name - this.listTitle = this.$t('taskConfirmationDeadline') - if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - let isTrue = true - this.TaskSuccessList = [] - this.TaskWarningList = [] - let dataList = [] - for (let i = 0; i < this.dataSource.length; i++) { - for (let j = 0; j < selectedRowKeys.length; j++) { - if (this.dataSource[i].id == selectedRowKeys[j]) { - dataList.push(this.dataSource[i]) - } - } - } - for (let i = 0; i < dataList.length; i++) { - if ((dataList[i].taskAffirmStatus == 'Not started' || dataList[i].taskAffirmStatus == 'Rejected') && - dataList[i].inventoryAffirmStatus == 'Accepted') { - if (dataList[i].engineeringInterfacePerson) { - if (dataList[i].verifyDeliverableType) { - if (dataList[i].verifyDueDate && dataList[i].verifyDutyId - && dataList[i].verifyInitiatorId) { - } else { - this.TaskWarningList.push( - < div > { dataList[i].serialNumber + this.$t('pleaseConformityVerification') } < /div>) - continue - // isTrue = false - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConformityVerification')) - // return - } - } - - if (dataList[i].prehomoDeliverableType) { - if (dataList[i].prehomoDueDate && dataList[i].prehomoDutyId - && dataList[i].prehomoInitiatorId) { - } else { - this.TaskWarningList.push( - < div > { dataList[i].serialNumber + this.$t('pleaseConfirmedByPrehomo') } < /div>) - continue - // isTrue = false - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseConfirmedByPrehomo')) - // return - } - } - - if (dataList[i].designDeliverableType) { - if (dataList[i].designDueDate && dataList[i].designDutyId - && dataList[i].designInitiatorId) { - } else { - this.TaskWarningList.push( - < div > { dataList[i].serialNumber + this.$t('pleaseDesignConformityConfirmation') } < /div>) - continue - // isTrue = false - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('pleaseDesignConformityConfirmation')) - // return - } - } - this.TaskSuccessList.push(dataList[i]) - } else { - this.TaskWarningList.push( < div > { dataList[i].serialNumber + this.$t('theProjectContactEmpty') } < /div>) - // isTrue = false - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('theProjectContactEmpty')) - // return - } - } else { - this.TaskWarningList.push( - < div > { dataList[i].serialNumber + this.$t('PleaseTaskConfirmationRejected') } < /div>) - // isTrue = false - // this.$message.warning(this.dataSource[i].serialNumber + ',' + this.$t('PleaseTaskConfirmationRejected')) - // return - } - } - if (this.TaskSuccessList && this.TaskSuccessList.length > 0) { - this.visible = true - this.formInline = {} - } else { - let that = this - this.$warning({ - content: ( - < div > - { that.TaskWarningList } - < /div> - ) - }) - } - } else { - this.$message.warning(this.$t('selectLeastOne')) - } - }, - handleOk() { this.$refs.ruleForm.validate(valid => { if (valid) { @@ -2198,7 +2108,7 @@ if (dataList[i].verifyFlowStatus == 'List to be checked') { if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) { this.requestsNum++ - _this.startProcess(dataList[i], 2, this.requestsNum) + _this.startProcess(dataList[i], 4, this.requestsNum) } } else { _this.detailedWarningList.push( diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 60efd4260..11bef884b 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -272,11 +272,7 @@ primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } - let newUrl = this.$router.resolve({ - path: '/taskListProcess', - query: query - }) - window.open(newUrl.href, '_blank') + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview')) } else if (row.flowType == '4') { row.taskId = row.taskId + '' if (row.taskId.length > 30) { @@ -306,11 +302,7 @@ primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } - let newUrl = this.$router.resolve({ - path: '/taskListProcess', - query: query - }) - window.open(newUrl.href, '_blank') + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview')) } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index f8dc8a8e5..6440c1f4d 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -109,7 +109,7 @@ }, { title: this.$t('Tasknode'), - dataIndex: 'taskDefinitionKeyName', + dataIndex: 'name', align: 'left', width: 180, ellipsis: true diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue index bf3c6a7d6..9b060963e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue @@ -160,7 +160,7 @@ { title: this.$t('areaOfResponsibility'), align: 'left', - dataIndex: '', + dataIndex: 'dutyTerritoryName', ellipsis: true, width: 120 }, @@ -204,7 +204,7 @@ { title: this.$t('areaOfResponsibility'), align: 'left', - dataIndex: '', + dataIndex: 'dutyTerritoryName', ellipsis: true, width: 120 }, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index cf6340b07..5c50f1ab1 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -178,6 +178,7 @@ }) }, getList(row, title) { + console.log(row) this.queryData = row this.queryData.isDisplay = JSON.parse(this.queryData.isDisplay) this.loading = true diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index eb4af51f0..2e44fdfd3 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -296,11 +296,7 @@ primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } - let newUrl = this.$router.resolve({ - path: '/taskListProcess', - query: query - }) - window.open(newUrl.href, '_blank') + this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview')) } }, searchQuery(value) { diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index f6f2f86e0..c5972a464 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -4,7 +4,7 @@
{{query.TaskKey == 'zrrqr' || query.TaskKey == 'dezrrqr' || query.TaskKey == 'zrrtjjfw' || $route.query.TaskKey == 'dezrrtjjfw' - ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}} + ? $t('personLiableConfirm'):$t('sponsorReview')}}
From 019d3e8e98349241d6f9a9e402dce92ba7f2855f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 22 Mar 2023 14:30:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E3=80=81=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batSetting.vue | 109 ++++--- .../components/listEditModel.vue | 90 +++--- .../components/listOfRegulations.vue | 270 ++++++++++++------ 3 files changed, 297 insertions(+), 172 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/batSetting.vue b/jero-web/src/views/projectManagement/components/batSetting.vue index 4904dd5ef..e4371c4e2 100644 --- a/jero-web/src/views/projectManagement/components/batSetting.vue +++ b/jero-web/src/views/projectManagement/components/batSetting.vue @@ -15,7 +15,7 @@
{{$t('certificationType')}}
- + {{$t('certificationLevel')}} - + - +
@@ -55,25 +55,33 @@
- +
{{$t('engineeringInterfacePerson')}} + :title="$t('regulatoryEngineer')">{{$t('regulatoryEngineer')}}
- - + + + + + {{ item.name }} + + + @@ -85,19 +93,20 @@ - +
{{$t('regulatoryEngineer')}} + :title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}
- + @@ -118,13 +127,13 @@ {{$t('personLiable')}}
- - + + v-model="formInline.designDutyIdName"/> @@ -140,13 +149,13 @@ {{$t('cutoffTime')}}
- + @@ -189,7 +198,7 @@ {{$t('typeOfDeliverables')}} - + {{$t('personLiable')}} - - + + v-model="formInline.verifyDutyIdName"/> @@ -291,7 +300,7 @@ {{$t('typeOfDeliverables')}} - + { + if (res.success) { + this.regulatoryEngineerList = res.result.lawEngineerList //法规工程师 + } + }) + }, PersonnelSelectionChange(value, id) { this.formInline[value] = id this.formInline = { ...this.formInline } }, - edit(data,code) { + edit(data, code) { this.visible = true this.getDeliverableTree() this.code = code - console.log(this.code) this.$nextTick(() => { this.ids = data || [] this.formInline = {} @@ -375,9 +400,15 @@ }, handleOkOne() { let ids = JSON.parse(JSON.stringify(this.ids)) + let formInline = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(formInline).forEach(res => { + if (formInline[res] && formInline[res] instanceof Array) { + formInline[res] = formInline[res].join(',') + } + }) let query = { ids: ids.join(','), - ...this.formInline + ...formInline } this.confirmLoading = true postAction(this.url.setBatch, query).then((res) => { @@ -398,9 +429,15 @@ content: _this.$t('batchmodify'), onOk() { let ids = JSON.parse(JSON.stringify(_this.ids)) + let formInline = JSON.parse(JSON.stringify(_this.formInline)) + Object.keys(formInline).forEach(res => { + if (formInline[res] && formInline[res] instanceof Array) { + formInline[res] = formInline[res].join(',') + } + }) let query = { ids: ids.join(','), - ..._this.formInline + ...formInline } _this.confirmLoading = true postAction(_this.url.setBatch, query).then((res) => { diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 29b533712..7e428bf1b 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -252,19 +252,26 @@ {{$t('engineeringInterfacePerson')}} - - - - {{ item.name }} - - - + + + + + + + + + + + + + + @@ -315,19 +322,25 @@ :title="$t('personLiable')">{{$t('personLiable')}} - - - - {{ item.name }} - - - + + + + + + + + + + + + + + @@ -644,25 +657,12 @@ :title="$t('personLiable')">{{$t('personLiable')}} - - - - {{ item.name }} - - - - - - - - - + diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1d30390c7..1fb67f214 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -214,7 +214,7 @@
{{ $t('export') }} @@ -320,6 +320,22 @@ -- + + + {{text}} + + {{text}} + + + + {{text}} + + {{text}} +
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }} @@ -446,11 +462,13 @@ +