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' } } ],