From 2332440e8113e728bc0a986a25238123bd377055 Mon Sep 17 00:00:00 2001 From: jiangweiguo <1578967617@qq.com> Date: Sat, 11 May 2024 16:15:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=85=AC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bs/vendorPayment.js | 7 ++++--- src/components/ApprovalProcess/index.vue | 8 ++++++-- src/router/modules/contract.js | 3 ++- src/views/company/fileShow/index.vue | 4 +++- src/views/contract/payment/index.vue | 2 +- src/views/home/index.vue | 14 ++++++++++---- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/api/bs/vendorPayment.js b/src/api/bs/vendorPayment.js index dfe5d04..6a55b6c 100644 --- a/src/api/bs/vendorPayment.js +++ b/src/api/bs/vendorPayment.js @@ -27,10 +27,11 @@ export function deleteVendorPayment(id) { } // 获得对公付款 -export function getVendorPayment(id) { +export function getVendorPayment(query) { return request({ - url: '/bs/vendor-payment/get?id=' + id, - method: 'get' + url: '/bs/vendor-payment/get', + method: 'get', + params: query }) } diff --git a/src/components/ApprovalProcess/index.vue b/src/components/ApprovalProcess/index.vue index 35e2971..0fc9153 100644 --- a/src/components/ApprovalProcess/index.vue +++ b/src/components/ApprovalProcess/index.vue @@ -19,9 +19,9 @@
-
{{ step.assigneeUser.nickname }}
+
{{ step.assigneeUser?.nickname }}
审批时间： {{ parseTime(step.endTime) || '-' }}
-
部门：{{ step.assigneeUser.deptName }}
+
部门：{{ step.assigneeUser?.deptName }}
审批意见：{{ step.reason }}
@@ -95,6 +95,9 @@ export default { if (this.processInstanceId) { getProcessInstance(this.processInstanceId).then((res) => { this.startObj = res.data || {} + console.log( + this.startObj + ); }) getTaskListByProcessInstanceId(this.processInstanceId).then(response => { // 审批记录 @@ -136,6 +139,7 @@ export default { }) }); this.$emit('onSetId', (Array.isArray(this.runningTasks) && this.runningTasks.length ? this.runningTasks[this.runningTasks.length - 1] : {}).id) + console.log(this.tasks ,'tasks'); }); } } diff --git a/src/router/modules/contract.js b/src/router/modules/contract.js index 72dee85..de380de 100644 --- a/src/router/modules/contract.js +++ b/src/router/modules/contract.js @@ -18,9 +18,10 @@ export default { { path: '/custom', name: `${pre}custom`, component: () => import('@/views/contract/custom'), meta: { cache: true, title: '客户合同审批' } }, { path: '/pay', name: `${pre}pay`, component: () => import('@/views/contract/pay'), meta: { cache: true, title: '付款审批' } }, { path: '/corporateReceipts', name: `${pre}corporateReceipts`, component: () => import('@/views/contract/corporateReceipts'), meta: { cache: true, title: '对公收款' } }, - { path: '/corporateReceiptsApproval', name: `${pre}corporateReceipts`, component: () => import('@/views/contract/corporateReceipts'), meta: { cache: true, title: '对公收款' } }, + { path: '/corporateReceiptsApproval', name: `${pre}corporateReceiptsApproval`, component: () => import('@/views/contract/corporateReceipts'), meta: { cache: true, title: '对公收款审批' } }, { path: '/receipts', name: `${pre}receipts`, component: () => import('@/views/contract/receipts'), meta: { cache: true, title: '收款审批' } }, { path: '/corporatePayment', name: `${pre}corporatePayment`, component: () => import('@/views/contract/corporatePayment'), meta: { cache: true, title: '对公付款' } }, + { path: '/corporatePaymentApproval', name: `${pre}corporatePaymentApproval`, component: () => import('@/views/contract/corporatePayment'), meta: { cache: true, title: '对公付款审批' } }, { path: '/payment', name: `${pre}payment`, component: () => import('@/views/contract/payment'), meta: { cache: true, title: '付款审批' } }, ])('contract-') } diff --git a/src/views/company/fileShow/index.vue b/src/views/company/fileShow/index.vue index 24c721a..0fd6b06 100644 --- a/src/views/company/fileShow/index.vue +++ b/src/views/company/fileShow/index.vue @@ -23,7 +23,9 @@ export default { data() { return { showFdf: false, - previewUrl: 'http://60.204.223.58:8086/onlinePreview?url=', + // previewUrl: 'http://60.204.223.58:8086/onlinePreview?url=', + // KKFileView + previewUrl: 'http://139.224.253.31:48012/onlinePreview?url=', url: '', btnList: [ { title: '返回', icon: 'revoke', color: "#909399", key: 0 }, diff --git a/src/views/contract/payment/index.vue b/src/views/contract/payment/index.vue index f64657a..214c941 100644 --- a/src/views/contract/payment/index.vue +++ b/src/views/contract/payment/index.vue @@ -191,7 +191,7 @@ export default { if (this.$route.query.id) { this.$loading(true, 'loadingSb') let api = getVendorPayment - api(this.$route.query.id).then((res) => { + api({id:this.$route.query.id, isApproval: true,}).then((res) => { // isApproval为审批字段，有审批权限 this.form = { ...(res.data || {}), responsibleId: res.data.responsibleId ? Number(res.data.responsibleId) : null, diff --git a/src/views/home/index.vue b/src/views/home/index.vue index f889a6a..3429a99 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -193,12 +193,18 @@ export default { icon: 'friends-o', show: this.permission_btns.includes('bs:vendor-receipt:query'), }, + { + route: '/corporatePaymentApproval', + title: '对公付款审批', + icon: 'friends-o', + show: this.permission_btns.includes('bs:vendor-payment:query'), + }, ], title: '审批', }, { row: [ - { + /* { route: '/mySupplier', title: '供应商合同审批', icon: 'friends-o', @@ -211,7 +217,7 @@ export default { title: '客户合同审批', icon: 'manager-o', show: this.permission_btns.includes('bs:customer-contract:query'), - }, + }, */ /* { route: '/myBidder', title: '中标审批', @@ -230,12 +236,12 @@ export default { icon: 'friends-o', show: this.permission_btns.includes('bs:vendor-receipt:query'), }, - /* { + { route: '/corporatePayment', title: '对公付款', icon: 'friends-o', show: this.permission_btns.includes('bs:vendor-payment:query'), - }, */ + }, ], title: '对公', },