From 7217fd59ef2ecbfdaa8ebc9d7c35147a77a01507 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 09:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SentList.vue | 4 ++ .../components/dealtWith.vue | 4 ++ .../components/doneList.vue | 4 ++ .../components/batchProcessing.vue | 42 +++++++++---------- .../toDoCenter/taskConfirmation/index.vue | 31 +++++++++----- 5 files changed, 52 insertions(+), 33 deletions(-) diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index f50ab7575..81c855eae 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -156,5 +156,9 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 8e3492434..8d0274192 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -150,5 +150,9 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index f96d39f5d..4cb34592b 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -156,5 +156,9 @@ \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue index 26af9622c..45cdf79eb 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue @@ -115,8 +115,8 @@ issue: false, isTrue: false, taskDefinitionKey: '', - taskIds:[], - projectLawsInventoryIds:[], + taskIds: [], + projectLawsInventoryIds: [] } }, methods: { @@ -126,12 +126,10 @@ this.taskDefinitionKey = this.selectedRowKeys[0].taskDefinitionKey this.taskIds = [] this.projectLawsInventoryIds = [] - this.selectedRowKeys.forEach(res=>{ - if (res.taskIds.indexOf(',') != '-1'){ - res.taskIds = res.taskIds.slice(0,res.taskIds.indexOf(',')) - } - this.taskIds.push(res.taskIds) - this.projectLawsInventoryIds.push(res.projectLawsInventoryId) + this.selectedRowKeys.forEach(res => { + res.taskIds = res.actiProcInstId + this.taskIds.push(res.taskIds) + this.projectLawsInventoryIds.push(res.projectLawsInventoryId) }) this.confirmLoading = false this.visible = true @@ -152,14 +150,14 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - addBatch(){ + addBatch() { let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let query = { - rejectUserId:this.userInfo().id, - rejectTime:rejectTime, - rejectCause:this.formInline.approvalOpinion, - taskIds:this.taskIds.join(','), - rejectType:'1', + rejectUserId: this.userInfo().id, + rejectTime: rejectTime, + rejectCause: this.formInline.approvalOpinion, + taskIds: this.taskIds.join(','), + rejectType: '1' } postAction('/project/projectLawsInventoryRejectCauseEO/addBatch', query).then((res) => { @@ -171,16 +169,16 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let query = { ...this.formInline, - taskIds:this.taskIds.join(','), - userId:this.userInfo().id, - taskDefinitionKey:this.taskDefinitionKey, - handlingTime:handlingTime, - projectLawsInventoryIds:this.projectLawsInventoryIds.join(',') + taskIds: this.taskIds.join(','), + userId: this.userInfo().id, + taskDefinitionKey: this.taskDefinitionKey, + handlingTime: handlingTime, + projectLawsInventoryIds: this.projectLawsInventoryIds.join(',') } - if (this.formInline.flag == '1'){ - this.addBatch() + if (this.formInline.flag == '1') { + this.addBatch() } - if (!this.formInline.flag){ + if (!this.formInline.flag) { query.flag = '0' } this.confirmLoading = true diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index a3ef8719d..e34c5b9d3 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -9,7 +9,7 @@ {{$t('RelatedItems')}} + v-model="queryParam.projectName"> @@ -18,7 +18,7 @@ {{$t('standardInformation')}} + v-model="queryParam.serialNumber"> @@ -86,46 +86,46 @@ dataSource:[], queryParam:{}, loading:false, - columns:[ + columns: [ { title: this.$t('RelatedItems'), align: 'center', - dataIndex: 'RelatedItems', + dataIndex: 'projectName', ellipsis: true, width: 170 }, { title: this.$t('standardInformation'), align: 'center', - dataIndex: 'standardInformation', + dataIndex: 'serialNumber', ellipsis: true, width: 170 }, { title: this.$t('taskType'), align: 'center', - dataIndex: 'taskType', + dataIndex: 'flowTypeShow', ellipsis: true, width: 170 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'Sponsor', + dataIndex: 'createBy', ellipsis: true, width: 170 }, { title: this.$t('TaskCutOffTime'), align: 'center', - dataIndex: 'TaskCutOffTime', + dataIndex: 'endTime', ellipsis: true, width: 170 }, { title: this.$t('taskStatus'), align: 'center', - dataIndex: 'taskStatus', + dataIndex: 'statusShow', ellipsis: true, width: 170 }, @@ -142,10 +142,13 @@ pageNo:1, total:0, url:{ - list:'', + list:'/todoCenter/projectProcess/todoTaskList', }, } }, + mounted() { + this.getList() + }, methods:{ batchProcessingForm() { this.pageNo = 1 @@ -186,7 +189,7 @@ if (value && value.length > 0) { value.forEach(res => { res = JSON.parse(res) - if (res.prcType == '1') { + if (res.flowType == '1') { this.selectedRowKeys.push(JSON.stringify(res)) } else { this.$message.warning(this.$t('onlyDataTaskConfirmationProcessSelected')) @@ -213,6 +216,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + flowType:'1', ...queryParam } this.loading = true @@ -295,4 +299,9 @@ ::v-deep .ant-table-body { background: transparent !important; } + .page { + text-align: right; + margin-top: 20px; + } + \ No newline at end of file