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 5dafc2da137ad0fb4942826f451194f2e57238fd..862e9d8d06de4db871faf727b1d8fa51dec19e0e 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 @@ -31,7 +31,7 @@ left join t_invoice d on d.id=c.invoice_id and d.invoice_state='宸插紑' left join t_project_type h on h.id=a.project_type_id left join (select a.* from (select distinct a.income_id,b.entry_type,a.id entry_bill_id, b.id entry_bill_flow_id - ,b.voucher_id,c.voucher_state + ,b.voucher_id, '' voucher_state from t_entry_bill a left join t_entry_bill_flow b on a.id=b.entry_id left join t_voucher c on c.id=b.voucher_id diff --git a/WebSite/src/views/entryapplication/components/incomeapplication.vue b/WebSite/src/views/entryapplication/components/incomeapplication.vue index fa0ff1e99b2145c86ba58d09c6c048482ece1ebe..be8c86a5a32a9e04bcaaf9abfdcb2d22107debe5 100644 --- a/WebSite/src/views/entryapplication/components/incomeapplication.vue +++ b/WebSite/src/views/entryapplication/components/incomeapplication.vue @@ -91,11 +91,7 @@ <span class="ellipsisclass">{{ slot.row.needInQuire }}</span> </template></el-table-column > - <el-table-column label="鍏ヨ处绫诲瀷" - ><template v-slot="slot"> - <span class="ellipsisclass">{{ slot.row.entryType }}</span> - </template></el-table-column - > + <el-table-column label="鐢宠鐘舵€�" ><template v-slot="slot"> <span class="ellipsisclass">{{ slot.row.voucherState }}</span>