From 7aacbe24ba8243ef8518ecebc8fbedf7b21aa48d Mon Sep 17 00:00:00 2001
From: cyf009 <591388323@qq.com>
Date: Thu, 27 Feb 2025 12:22:05 +0800
Subject: [PATCH] 111111
---
.../entryapplication/components/incomeapplication.vue | 8 +++++---
WebSite/src/views/entryapplication/index.vue | 7 +++++++
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/WebSite/src/views/entryapplication/components/incomeapplication.vue b/WebSite/src/views/entryapplication/components/incomeapplication.vue
index c2125f74..c7186769 100644
--- a/WebSite/src/views/entryapplication/components/incomeapplication.vue
+++ b/WebSite/src/views/entryapplication/components/incomeapplication.vue
@@ -34,8 +34,9 @@
</template></el-table-column
>
<el-table-column label="鍑瘉鐘舵€�" width="125px;"
+ v-if="showState"
><template v-slot="slot">
- <span class="ellipsisclass">{{ slot.row.entryType=='鍒版杞殏瀛�' && slot.row.voucherState=='宸插叆璐�'?'': slot.row.voucherState }}</span>
+ <span class="ellipsisclass">{{ slot.row.entryType=='鍒版杞敹鍏�' && slot.row.voucherState=='宸插叆璐�'?'': slot.row.voucherState }}</span>
</template></el-table-column
>
<el-table-column label="浜ゆ槗鏃ユ湡"
@@ -152,7 +153,7 @@ export default {
billNo: props.queryMod.billNo==null?'':props.queryMod.billNo,
beginIncomeDate: props.queryMod.beginIncomeDate==null?'':props.queryMod.beginIncomeDate,
endIncomeDate: props.queryMod.endIncomeDate==null?'':props.queryMod.endIncomeDate,
- voucherState:props.queryMod.endIncomeDate==null?[]:props.queryMod.voucherState,
+ voucherState:props.queryMod.voucherState==null?[]:props.queryMod.voucherState,
pageIndex: props.queryMod.pageIndex,
pageSize: props.queryMod.pageSize,
},
@@ -167,7 +168,8 @@ export default {
rejectReason:'',
type:"鍏ヨ处鐢宠"
},
- txtAlign:'right'
+ txtAlign:'right',
+ showState:false
});
watch(
() => props.queryMod,
diff --git a/WebSite/src/views/entryapplication/index.vue b/WebSite/src/views/entryapplication/index.vue
index 05f119b1..41c6fd23 100644
--- a/WebSite/src/views/entryapplication/index.vue
+++ b/WebSite/src/views/entryapplication/index.vue
@@ -208,6 +208,13 @@ export default {
const queryEntryApplication = () => {
if (data.activeName == 'first') {
firstMethod.value.selectIncomeEntryApplication();
+ if(data.queryMod.voucherState[0]=="鍏ㄩ儴")
+ {
+ firstMethod.value.showState=true;
+ }else
+ {
+ firstMethod.value.showState=false;
+ }
} else {
secondMethod.value.selectInvoiceTackleEntryApplication();
}
--
GitLab