From cc6e95fba2a5fe024b39f7c12454688420d7d3ff Mon Sep 17 00:00:00 2001
From: cyf009 <591388323@qq.com>
Date: Fri, 28 Feb 2025 08:25:07 +0800
Subject: [PATCH] 111111
---
.../mapper/xml/EntryBillMapper.xml | 82 ++++++++++---------
.../views/stagingentryapplication/index.vue | 36 ++++++--
2 files changed, 75 insertions(+), 43 deletions(-)
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
index 7dcfc09e..78b90ff5 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
@@ -46,10 +46,10 @@
where b.entry_type in('鍒版杞殏瀛�')
<if test="qry.voucherStateSelect=='椹冲洖' or qry.voucherState.contains('寰呭鐞�') or qry.voucherState.contains('鍏ㄩ儴')">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>)a
left join
@@ -66,10 +66,10 @@
where b.entry_type in('鏆傚瓨杞敹鍏�')
<if test="qry.voucherStateSelect=='椹冲洖' or qry.voucherState.contains('寰呭鐞�') or qry.voucherState.contains('鍏ㄩ儴')">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>) b
on a.income_id=b.income_id where b.income_id is null
@@ -88,10 +88,10 @@
where b.entry_type in('鍒版杞殏瀛�')
<if test="qry.voucherStateSelect=='椹冲洖' or qry.voucherState.contains('寰呭鐞�') or qry.voucherState.contains('鍏ㄩ儴')">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>)a
left join
@@ -108,10 +108,10 @@
where b.entry_type in('鏆傚瓨杞敹鍏�')
<if test="qry.voucherStateSelect=='椹冲洖' or qry.voucherState.contains('寰呭鐞�') or qry.voucherState.contains('鍏ㄩ儴')">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>) b
on a.income_id=b.income_id where b.income_id is not null )
@@ -130,10 +130,10 @@
where b.entry_type in('鍒版杞敹鍏�')
<if test="qry.voucherStateSelect=='椹冲洖' or qry.voucherState.contains('寰呭鐞�') or qry.voucherState.contains('鍏ㄩ儴')">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>
)
@@ -254,10 +254,10 @@
</if>
<if test="qry.voucherStateSelect=='椹冲洖'">
AND d.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>
where c.entry_type in ('琛ュ紑绁ㄥ叆璐�')
@@ -304,10 +304,10 @@
</if>
<if test="qry.voucherStateSelect=='椹冲洖'">
AND c.batch_id = (
- SELECT MAX(batch_id)
- FROM t_voucher
- WHERE income_id = a.income_id
- AND available = 'Yes'
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ AND tt.available = 'Yes'
)
</if>
where
@@ -393,22 +393,28 @@
left join t_voucher d ON d.income_id = c.income_id
and d.id=c.voucher_id
- <if test="qry.voucherState !=null and qry.voucherState.contains('寰呭鐞�')">
- and d.voucher_state!='椹冲洖'
- </if>
+<!-- <if test="qry.voucherState !=null and qry.voucherState.contains('寰呭鐞�')">-->
+<!-- and d.voucher_state!='椹冲洖'-->
+<!-- </if>-->
+ AND c.batch_id = (
+ SELECT MAX(tt.batch_id)
+ FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
+ WHERE tt.income_id = a.id and ff.entry_type = '鍒版杞殏瀛�'
+ AND tt.available = 'Yes'
+ )
+
and d.available='Yes'
left join t_bank_account_number e on e.bank_number=a.income_account and e.available='Yes'
-
+ left join (select a.income_id from t_entry_bill_flow a join t_voucher
+ b on a.income_id=b.income_id
+ and a.voucher_id=b.id
+ where a.entry_type in('鍒版杞敹鍏�','鏆傚瓨杞敹鍏�')
+ and b.available!='NO') g on a.id=g.income_id
<where>
a.available='Yes' and a.is_offline=0
+ and g.income_id is null
- AND c.batch_id = (
- SELECT MAX(tt.batch_id)
- FROM t_voucher tt left join t_entry_bill_flow ff on tt.id = ff.voucher_id
- WHERE tt.income_id = a.id and ff.entry_type = '鍒版杞殏瀛�'
- AND tt.available = 'Yes'
- )
<if test="qry.voucherStateSelect !=null and qry.voucherStateSelect.equals('宸插叆璐�'.toString()) ">
diff --git a/WebSite/src/views/stagingentryapplication/index.vue b/WebSite/src/views/stagingentryapplication/index.vue
index 4053c17a..329a6dbb 100644
--- a/WebSite/src/views/stagingentryapplication/index.vue
+++ b/WebSite/src/views/stagingentryapplication/index.vue
@@ -149,12 +149,16 @@
>
<el-table-column type="selection" v-if="selectShow" show-overflow-tooltip label="鎿嶄綔">
</el-table-column>
- <el-table-column show-overflow-tooltip v-if="!selectShow" label="鎿嶄綔" width="125px;">
+ <el-table-column show-overflow-tooltip label="鎿嶄綔" width="125px;">
+
<template v-slot="slot">
+ <el-button type="text" @click="incomeDetail(slot.row)"
+ >璇︽儏</el-button
+ >
<el-button type="text" v-if="slot.row.voucherState=='宸插叆璐�'" @click="rebackIncomeVoucher(slot.row)"
>鎾ゅ洖鏆傚瓨</el-button
>
- <el-button type="text" v-if="slot.row.batchId!='' || slot.row.batchId!=null" @click="printIncome(slot.row)"
+ <el-button type="text" v-if="slot.row.batchId!=null" @click="printIncome(slot.row)"
>鎵撳嵃</el-button
>
@@ -170,6 +174,12 @@
<span class="ellipsisclass">{{ slot.row.billNo }}</span>
</template></el-table-column
>
+ <el-table-column label="鍥炲崟杩涘害" width="125px;"
+ ><template v-slot="slot">
+ <span class="ellipsisclass">{{ slot.row.incomeSpeed }}</span>
+ </template></el-table-column
+ >
+
<el-table-column label="鍑瘉鐘舵€�" width="125px;"
><template v-slot="slot">
<span class="ellipsisclass">{{ slot.row.voucherState }}</span>
@@ -237,6 +247,11 @@
@closeQuery="selectStagingEntryApplication"
>
</StagingentryApplicationBatch>
+ <IncomeDetail
+ v-if="incomeDetailPara.visible"
+ :incomeDetailPara="incomeDetailPara"
+ v-model:visible="incomeDetailPara.visible"
+ ></IncomeDetail>
</el-card>
</div>
</template>
@@ -250,10 +265,11 @@ import AccountEntryManage from '@/api/AccountEntryManage';
import Pagination from '@/components/Pagination';
import { ElMessage, ElNotification, ElMessageBox } from 'element-plus';
import StagingentryApplicationBatch from './components/stagingentryapplicationbatch.vue';
+import IncomeDetail from '../common/incomedetail.vue';
import Income from '@/api/Income';
export default {
name: 'stagingentryapplication',
- components: { Pagination, StagingentryApplicationBatch },
+ components: { Pagination, StagingentryApplicationBatch ,IncomeDetail},
setup() {
const data = reactive({
queryMod: {
@@ -307,7 +323,11 @@ export default {
],*/
entryApplicationList: [],
selectShow:true,
- txtAlign:'right'
+ txtAlign:'right',
+ incomeDetailPara: {
+ visible: false,
+ incomeId: '',
+ },
});
onMounted(() => {
Emun.getVoucherStateApplyEnum()
@@ -492,6 +512,7 @@ export default {
cancelButtonText: '鍙栨秷',
type: 'warning',
}).then(() => {
+ debugger;
Income.rebackIncomeVoucher(row.incomeId,row.voucherId)
.then((rs) => {
if (rs.code != '00000') {
@@ -505,6 +526,10 @@ export default {
});
}
+ const incomeDetail = (row) => {
+ data.incomeDetailPara.incomeId = row.incomeId;
+ data.incomeDetailPara.visible = true;
+ };
return {
...toRefs(data),
selectStagingEntryApplication,
@@ -516,7 +541,8 @@ export default {
configdate,
currency,
printIncome,
- rebackIncomeVoucher
+ rebackIncomeVoucher,
+ incomeDetail
};
},
};
--
GitLab