增加对公模块

pull/2/head
jwg 6 months ago
parent 62ce60e8d6
commit 2332440e81

@ -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
})
}

@ -19,9 +19,9 @@
</div>
<div class="step-info">
<!-- {{step}} -->
<div class="step-name">{{ step.assigneeUser.nickname }}</div>
<div class="step-name">{{ step.assigneeUser?.nickname }}</div>
<div class="step-status">审批时间 {{ parseTime(step.endTime) || '-' }}</div>
<div class="step-status">部门{{ step.assigneeUser.deptName }}</div>
<div class="step-status">部门{{ step.assigneeUser?.deptName }}</div>
<div class="step-status">审批意见{{ step.reason }}</div>
</div>
</div>
@ -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');
});
}
}

@ -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-')
}

@ -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 },

@ -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,

@ -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: '对公',
},

Loading…
Cancel
Save