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 1/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=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 From 2926a314f637381be9c7f18c9ac0b7a0c77a9c28 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 18 Oct 2022 11:19:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/store/modules/user.js | 16 +-- .../processForm/handshakeProcess/index.vue | 9 +- .../ProjectDetails/index.vue | 1 - .../components/SentList.vue | 108 ++++++++++++++---- .../components/dealtWith.vue | 63 +++++++++- .../components/doneList.vue | 108 ++++++++++++++---- .../components/SentList.vue | 15 ++- .../components/dealtWith.vue | 15 ++- .../components/doneList.vue | 15 ++- .../toDoCenter/taskConfirmation/index.vue | 85 ++++++++++---- 10 files changed, 348 insertions(+), 87 deletions(-) diff --git a/jero-web/src/store/modules/user.js b/jero-web/src/store/modules/user.js index c59903a89..2b9b58549 100644 --- a/jero-web/src/store/modules/user.js +++ b/jero-web/src/store/modules/user.js @@ -142,14 +142,14 @@ const user = { //Vue.ls.set(USER_AUTH,authData); sessionStorage.setItem(USER_AUTH, JSON.stringify(authData)) sessionStorage.setItem(SYS_BUTTON_AUTH, JSON.stringify(allAuthData)) - let gData = localStorage.getItem('gData') - if (!gData) { - getAction('sys/user/queryUserTreeList', {}).then((res) => { - if (res.success) { - localStorage.setItem('gData', JSON.stringify(res.result)) - } - }) - } + // let gData = localStorage.getItem('gData') + // if (!gData) { + // getAction('sys/user/queryUserTreeList', {}).then((res) => { + // if (res.success) { + // localStorage.setItem('gData', JSON.stringify(res.result)) + // } + // }) + // } if (menuData && menuData.length > 0) { //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ menuData.forEach((item, index) => { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index c19d1eb3c..a9d2d721e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -28,7 +28,7 @@ "/> {{$t('view')}} - + + + {{text}} + + + {{text}} +
import { getAction, postAction, deleteAction } from '@/api/manage' + export default { name: 'SentList', - data(){ - return{ - dataSource:[], - loading:false, - columns:[ + data() { + return { + dataSource: [], + loading: false, + columns: [ { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', + scopedSlots: { customRender: 'RelatedItems' }, ellipsis: true, width: 170 }, @@ -51,6 +59,7 @@ title: this.$t('standardInformation'), align: 'center', dataIndex: 'serialNumber', + scopedSlots: { customRender: 'standardInformation' }, ellipsis: true, width: 170 }, @@ -75,13 +84,13 @@ ellipsis: true, width: 170 }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'endTime', - ellipsis: true, - width: 170 - }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'endTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', @@ -97,22 +106,71 @@ scopedSlots: { customRender: 'operation' } } ], - selectedRowKeys:[], - pageSize:10, - pageNo:1, - total:0, - url:{ - list:'/todoCenter/projectProcess/issuedProcess', + selectedRowKeys: [], + pageSize: 10, + pageNo: 1, + total: 0, + url: { + list: '/todoCenter/projectProcess/issuedProcess' }, - queryParam:{}, + queryParam: {} } }, mounted() { this.getList() }, - methods:{ - viewClick(val){ - + methods: { + RelatedItemsClick(item) { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName, + projectNameId: item.projectNameId, + targetMarket: item.targetMarket, + studioEngineer: item.studioEngineer, + } + }) + window.open(newUrl.href, '_blank') + }, + standardInformationClick(item) { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.projectLawsInventoryId + } + }) + window.open(newUrl.href, '_blank') + }, + viewClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.actiProcInstId, + prcType:row.flowType, + prcNum:row.prcNum, + isTrue:false, + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '10'){ + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer:row.studioEngineer, + type:'102', + } + }) + window.open(newUrl.href, '_blank') + } }, searchQuery(value) { this.queryParam = value @@ -133,7 +191,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -160,7 +218,7 @@ this.loading = false } }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7edbe9926..e394f8ab1 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -14,7 +14,13 @@ {{$t('Processing')}} - + + + {{text}} + + + {{text}} +
{{$t('view')}} + + {{text}} + + + {{text}} +
import { getAction, postAction, deleteAction } from '@/api/manage' + export default { name: 'doneList', - data(){ - return{ - dataSource:[], - loading:false, - url:{ - list:'/todoCenter/projectProcess/doneProcess', + data() { + return { + dataSource: [], + loading: false, + url: { + list: '/todoCenter/projectProcess/doneProcess' }, - queryParam:{}, - columns:[ + queryParam: {}, + columns: [ { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', ellipsis: true, + scopedSlots: { customRender: 'RelatedItems' }, width: 170 }, { @@ -56,6 +64,7 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, + scopedSlots: { customRender: 'standardInformation' }, width: 170 }, { @@ -68,7 +77,7 @@ { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'assigneeName', + dataIndex: 'createBy', ellipsis: true, width: 170 }, @@ -79,13 +88,13 @@ ellipsis: true, width: 170 }, - { - title: this.$t('TaskCutOffTime'), - align: 'center', - dataIndex: 'endTime', - ellipsis: true, - width: 170 - }, + // { + // title: this.$t('TaskCutOffTime'), + // align: 'center', + // dataIndex: 'endTime', + // ellipsis: true, + // width: 170 + // }, { title: this.$t('taskStatus'), align: 'center', @@ -101,18 +110,67 @@ scopedSlots: { customRender: 'operation' } } ], - selectedRowKeys:[], - pageSize:10, - pageNo:1, - total:0, + selectedRowKeys: [], + pageSize: 10, + pageNo: 1, + total: 0 } }, mounted() { this.getList() }, - methods:{ - viewClick(val){ - + methods: { + RelatedItemsClick(item) { + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: item.projectLibraryId, + projectName: item.projectName, + projectNameId: item.projectNameId, + targetMarket: item.targetMarket, + studioEngineer:item.studioEngineer, + } + }) + window.open(newUrl.href, '_blank') + }, + standardInformationClick(item){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: item.projectLawsInventoryId, + } + }) + window.open(newUrl.href, '_blank') + }, + viewClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey:row.taskDefinitionKey, + taskIds:row.actiProcInstId, + prcType:row.flowType, + prcNum:row.prcNum, + isTrue:false, + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + }else if(row.flowType == '10'){ + let newUrl = this.$router.resolve({ + path: '/ProjectDetails', + query: { + id: row.projectLibraryId, + projectName: row.projectName, + projectNameId: row.projectNameId, + targetMarket: row.targetMarket, + studioEngineer:row.studioEngineer, + type:'102', + } + }) + window.open(newUrl.href, '_blank') + } }, searchQuery(value) { this.queryParam = value @@ -133,7 +191,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -160,7 +218,7 @@ this.loading = false } }) - }, + } } } diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 81c855eae..d267539e6 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -14,7 +14,10 @@ {{$t('view')}} - + + + {{text}} +
{{$t('Processing')}} - + + + {{text}} +
{{$t('view')}} - + + + {{text}} +
{{$t('Processing')}} + + {{text}} + + + {{text}} +
0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let content = [] @@ -181,8 +211,22 @@ this.queryParam = {} this.getList() }, - ProcessingClick(val){ - + ProcessingClick(row) { + let query = {} + if (row.flowType == '1') { + query = { + taskDefinitionKey: row.taskDefinitionKey, + taskIds: row.actiProcInstId, + prcType: row.flowType, + prcNum: row.prcNum, + isTrue: true + } + let newUrl = this.$router.resolve({ + path: '/handshakeProcess', + query: query + }) + window.open(newUrl.href, '_blank') + } }, onSelectChange(value) { this.selectedRowKeys = [] @@ -206,7 +250,7 @@ this.pageSize = pageSize this.getList() }, - getList(){ + getList() { let queryParam = JSON.parse(JSON.stringify(this.queryParam)) Object.keys(queryParam).forEach(val => { if (queryParam[val] instanceof Array) { @@ -216,7 +260,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - flowType:'1', + flowType: '1', ...queryParam } this.loading = true @@ -234,7 +278,7 @@ this.loading = false } }) - }, + } } } @@ -299,6 +343,7 @@ ::v-deep .ant-table-body { background: transparent !important; } + .page { text-align: right; margin-top: 20px;