From 546bc81c86453e238134e9acd089cb9f43d78e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 10:57:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E6=9C=AC-=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/circulationHistory.vue | 5 +++++ .../components/taskCirculationHistory.vue | 8 ++++++-- .../components/referenceDeliverablesList.vue | 18 +++++++++++++----- .../components/dealtWith.vue | 6 +++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 285a5462e..8244fd372 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -47,18 +47,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width:200, }, { title: this.$t('result'), dataIndex: 'approvalResult', align: 'left', + ellipsis: true, width:200, scopedSlots: { customRender: 'approvalResult' } }, @@ -66,6 +69,7 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width:200, }, { @@ -73,6 +77,7 @@ dataIndex: 'createTime', align: 'left', width:200, + ellipsis: true, customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index c0018a077..e0518337c 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -15,7 +15,7 @@ :data-source="dataSource" :columns="columns" > - + {{text}} @@ -49,18 +49,21 @@ title: this.$t('OperationNode'), dataIndex: 'name', align: 'left', + ellipsis: true, width: 470 }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('result'), dataIndex: 'reviewResult', align: 'left', + ellipsis: true, scopedSlots: { customRender: 'reviewResult' }, width: 270 }, @@ -68,14 +71,15 @@ title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', + ellipsis: true, width: 270 }, { title: this.$t('operationTime'), dataIndex: 'createTime', align: 'left', + ellipsis: true, width: 200, - fixed: 'right' } ], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download' diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue index 642b23e65..4098e6e3b 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue @@ -88,7 +88,7 @@ align: 'left', ellipsis: true, width: 223 - }, + } ], dataList: [], content: [], @@ -96,7 +96,7 @@ pageNo: 1, pageSize: 10, total: 0, - ids:'', + ids: '' } }, mounted() { @@ -165,19 +165,27 @@ }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.success(this.$t('OperationSuccessful')) + } this.visible = false this.selectedRowKeys = [] this.$emit('referenceDeliverablesListForm') } else { - this.$message.warning(this.$t('operationFailed')) + if (res.result) { + this.$message.warning(res.result) + } else { + this.$message.warning(this.$t('operationFailed')) + } this.confirmLoading = false } }) } else { this.$message.warning(this.$t('selectLeastOne')) } - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index a8fbd1fcf..f358d744f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -78,7 +78,7 @@ dataIndex: 'projectName', ellipsis: true, scopedSlots: { customRender: 'RelatedItems' }, - width: 110 + width: 150 }, { title: this.$t('standardInformation'), @@ -121,7 +121,7 @@ align: 'left', dataIndex: 'endTime', ellipsis: true, - width: 110, + width: 160, scopedSlots: { customRender: 'endTime' } }, // { @@ -136,7 +136,7 @@ title: this.$t('operation'), align: 'left', fixed: 'right', - width: 80, + width: 120, scopedSlots: { customRender: 'operation' } } ], From d57248b15b6eafbc66497b4f7647d8ea5006a3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 11:03:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E6=97=B6-=E5=8F=AA=E8=83=BD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=80=E4=B8=AA=E4=BA=BA=EF=BC=9B=20=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 18 ++++++++++++++---- .../components/SentList.vue | 4 ++-- .../components/dealtWith.vue | 4 ++-- .../components/doneList.vue | 4 ++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index ce68da751..da433c8e8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1279,7 +1279,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -1309,7 +1309,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', @@ -1685,13 +1685,23 @@ let _this = this let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) let isTrue + let content = [] for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - isTrue = true + content.push(this.dataSource[i]) } } } + for (let i = 0; i < content.length; i++) { + if (content[i].designFlowStatus == 'List to be released' && + content[i].verifyFlowStatus == 'List to be released') { + isTrue = false + + } else { + isTrue = true + } + } if (isTrue) { this.changeInterface(selectedRowKeys) } @@ -2559,7 +2569,7 @@ }, download(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 9c6ba1c7d..c547327ad 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -242,7 +242,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -310,7 +310,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index f358d744f..cf7ab0361 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -297,7 +297,7 @@ isDisplay: true, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -367,7 +367,7 @@ flowType: 4, isDisplay: true, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index a6a52ff80..615696db6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -237,7 +237,7 @@ isDisplay: false, flowType: 2, Sponsor: 'regulationOwnerName', - personLiable: 'designDutyName', + personLiable: 'designDutyIdName', typeOfDeliverables: 'designDeliverableTypeName', deliverableTemplate: 'designDeliverableTemplate', DueDate: 'designDueDate', @@ -304,7 +304,7 @@ flowType: 4, isDisplay: false, Sponsor: 'regulationOwnerName', - personLiable: 'verifyDutyName', + personLiable: 'verifyDutyIdName', typeOfDeliverables: 'verifyDeliverableTypeName', deliverableTemplate: 'verifyDeliverableTemplate', DueDate: 'verifyDueDate', From e7612a478c9cf1f7fb537f561766e9c2a3568804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 27 Mar 2023 11:13:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E6=84=8F=E8=A7=81-=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E6=B2=A1=E6=9C=89=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/processCenter/components/circulationHistory.vue | 2 +- .../processCenter/components/taskCirculationHistory.vue | 2 +- .../components/circulationHistory.vue | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue index 8244fd372..c852df760 100644 --- a/jero-web/src/views/processCenter/components/circulationHistory.vue +++ b/jero-web/src/views/processCenter/components/circulationHistory.vue @@ -11,7 +11,7 @@ ref="table" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index e0518337c..9496a5adc 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -11,7 +11,7 @@ :components="drag(columns,'columns')" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :data-source="dataSource" :columns="columns" > diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 6440c1f4d..a4fdce5b5 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -30,9 +30,10 @@
@@ -104,7 +105,7 @@ title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', - width: 200, + width: 120, ellipsis: true }, { @@ -128,7 +129,7 @@ title: this.$t('resultofhandling'), dataIndex: 'operatorResultName', align: 'left', - width: 200, + width: 160, ellipsis: true, }, { @@ -246,6 +247,7 @@