mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：审批单合并成审批中心

dev_1.0.2
jiangpeng 2026-08-03 14:49:41 +08:00
parent a9ed35793a
commit 0b693760df
2 changed files with 102 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oms_web/oms_vue/src/views/approve/all/index.vue
View File

@ -935,6 +935,7 @@ export default {
this.$modal.msgSuccess(this.ticketConfirmDialogTitle + '成功') this.$modal.msgSuccess(this.ticketConfirmDialogTitle + '成功')
this.ticketDialogVisible = false this.ticketDialogVisible = false
this.getList() this.getList()
this.getTotal()
}).catch(error => { }).catch(error => {
console.error('审批失败: ', error) console.error('审批失败: ', error)
this.$modal.msgError('审批失败！' + (error.msg || error.message)) this.$modal.msgError('审批失败！' + (error.msg || error.message))
@ -1138,6 +1139,7 @@ export default {
this.currentOrderId = null this.currentOrderId = null
this.showApproveButtons = false this.showApproveButtons = false
this.getList() this.getList()
this.getTotal()
}, },
handleApproveConfirm() { handleApproveConfirm() {
if (this.$refs.approveDialog) { if (this.$refs.approveDialog) {

100
ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml
View File

@ -67,6 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('order_approve_online', 'order_approve_offline') where btc.process_key in ('order_approve_online', 'order_approve_offline')
and t1.order_code = btc.business_key and t1.order_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('order_approve_online', 'order_approve_offline')
and t1.order_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -133,6 +138,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('purchase_order_online') where btc.process_key in ('purchase_order_online')
and t1.purchase_no = btc.business_key and t1.purchase_no = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('purchase_order_online')
and t1.purchase_no = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -200,6 +210,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_payment') where btc.process_key in ('finance_payment')
and t1.payment_bill_code = btc.business_key and t1.payment_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_payment')
and t1.payment_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -267,6 +282,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_refund') where btc.process_key in ('finance_refund')
and t1.payment_bill_code = btc.business_key and t1.payment_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_refund')
and t1.payment_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -334,6 +354,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('fianance_ticket') where btc.process_key in ('fianance_ticket')
and t1.ticket_bill_code = btc.business_key and t1.ticket_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('fianance_ticket')
and t1.ticket_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -401,6 +426,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_ticket_refound') where btc.process_key in ('finance_ticket_refound')
and t1.ticket_bill_code = btc.business_key and t1.ticket_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_ticket_refound')
and t1.ticket_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -468,6 +498,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_receipt_approve') where btc.process_key in ('finance_receipt_approve')
and t1.receipt_bill_code = btc.business_key and t1.receipt_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_receipt_approve')
and t1.receipt_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -535,6 +570,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_receipt_refound') where btc.process_key in ('finance_receipt_refound')
and t1.receipt_bill_code = btc.business_key and t1.receipt_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_receipt_refound')
and t1.receipt_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -602,6 +642,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_invoice_approve') where btc.process_key in ('finance_invoice_approve')
and t1.invoice_bill_code = btc.business_key and t1.invoice_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_invoice_approve')
and t1.invoice_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -669,6 +714,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_invoice_refound') where btc.process_key in ('finance_invoice_refound')
and t1.invoice_bill_code = btc.business_key and t1.invoice_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_invoice_refound')
and t1.invoice_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
<if test="processNo != null and processNo != ''"> <if test="processNo != null and processNo != ''">
@ -709,6 +759,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('order_approve_online', 'order_approve_offline') where btc.process_key in ('order_approve_online', 'order_approve_offline')
and t1.order_code = btc.business_key and t1.order_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('order_approve_online', 'order_approve_offline')
and t1.order_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -726,6 +781,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('purchase_order_online') where btc.process_key in ('purchase_order_online')
and t1.purchase_no = btc.business_key and t1.purchase_no = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('purchase_order_online')
and t1.purchase_no = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -744,6 +804,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_payment') where btc.process_key in ('finance_payment')
and t1.payment_bill_code = btc.business_key and t1.payment_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_payment')
and t1.payment_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -762,6 +827,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_refund') where btc.process_key in ('finance_refund')
and t1.payment_bill_code = btc.business_key and t1.payment_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_refund')
and t1.payment_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -780,6 +850,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('fianance_ticket') where btc.process_key in ('fianance_ticket')
and t1.ticket_bill_code = btc.business_key and t1.ticket_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('fianance_ticket')
and t1.ticket_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -798,6 +873,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_ticket_refound') where btc.process_key in ('finance_ticket_refound')
and t1.ticket_bill_code = btc.business_key and t1.ticket_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_ticket_refound')
and t1.ticket_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -816,6 +896,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_receipt_approve') where btc.process_key in ('finance_receipt_approve')
and t1.receipt_bill_code = btc.business_key and t1.receipt_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_receipt_approve')
and t1.receipt_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -834,6 +919,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_receipt_refound') where btc.process_key in ('finance_receipt_refound')
and t1.receipt_bill_code = btc.business_key and t1.receipt_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_receipt_refound')
and t1.receipt_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -852,6 +942,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_invoice_approve') where btc.process_key in ('finance_invoice_approve')
and t1.invoice_bill_code = btc.business_key and t1.invoice_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_invoice_approve')
and t1.invoice_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
union all union all
@ -870,6 +965,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where btc.process_key in ('finance_invoice_refound') where btc.process_key in ('finance_invoice_refound')
and t1.invoice_bill_code = btc.business_key and t1.invoice_bill_code = btc.business_key
and btc.approve_user = #{approveUser} and btc.approve_user = #{approveUser}
union all
select 1 from bu_todo as bt
where bt.process_key in ('finance_invoice_refound')
and t1.invoice_bill_code = bt.business_key
and bt.approve_user = #{approveUser}
) )
</if> </if>
) as t ) as t