diff --git a/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java index 668c8a74..0d5b85c1 100644 --- a/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java +++ b/core/service/src/main/java/com/wansenai/service/financial/impl/IncomeReceiptServiceImpl.java @@ -115,6 +115,7 @@ public Response> getIncomeReceiptPageList(QueryIncomeDTO queryInc .ge(StringUtils.hasLength(queryIncomeDTO.getStartDate()), FinancialMain::getReceiptDate, queryIncomeDTO.getStartDate()) .le(StringUtils.hasLength(queryIncomeDTO.getEndDate()), FinancialMain::getReceiptDate, queryIncomeDTO.getEndDate()) .eq(FinancialMain::getType, "收入") + .eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED) .page(page); var incomeVOList = new ArrayList(financialMainPage.getRecords().size() + 1); diff --git a/web/src/views/financial/advance-charge/advance.data.ts b/web/src/views/financial/advance-charge/advance.data.ts index 9ab22b5a..0a243dd9 100644 --- a/web/src/views/financial/advance-charge/advance.data.ts +++ b/web/src/views/financial/advance-charge/advance.data.ts @@ -162,4 +162,22 @@ export const formState: UnwrapRef = reactive({ remark: '', totalAmount: 0, collectedAmount: 0, -}); \ No newline at end of file +}); + +export const advanceChargeTableColumns: BasicColumn[] = [ + { + title: '账户名称', + dataIndex: 'accountName', + width: 200, + }, + { + title: '金额', + dataIndex: 'amount', + width: 180, + }, + { + title: '备注', + dataIndex: 'remark', + width: 200, + }, +] \ No newline at end of file diff --git a/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue b/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue new file mode 100644 index 00000000..7b737b9d --- /dev/null +++ b/web/src/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue @@ -0,0 +1,171 @@ + + + diff --git a/web/src/views/financial/advance-charge/index.vue b/web/src/views/financial/advance-charge/index.vue index 6f4efe92..e7e13199 100644 --- a/web/src/views/financial/advance-charge/index.vue +++ b/web/src/views/financial/advance-charge/index.vue @@ -12,8 +12,9 @@ +
@@ -52,13 +54,14 @@ import {useMessage} from "@/hooks/web/useMessage"; import {columns, searchFormSchema} from "@/views/financial/advance-charge/advance.data"; import {getAdvancePageList, deleteBatchAdvance, updateAdvanceStatus} from "@/api/financial/advance"; import AdvanceChargeModal from "@/views/financial/advance-charge/components/AdvanceChargeModal.vue"; +import ViewAdvanceChargeModal from "@/views/financial/advance-charge/components/ViewAdvanceChargeModal.vue"; import {Tag} from "ant-design-vue"; export default defineComponent({ name: 'advanceCharge', - components: {Tag, TableAction, BasicTable, AdvanceChargeModal }, + components: {Tag, TableAction, BasicTable, AdvanceChargeModal, ViewAdvanceChargeModal}, setup() { - const [registerModal, {openModal}] = useModal(); + const [viewAdvanceChargeModalRef, {openModal: openAdvanceChargeModal}] = useModal(); const { createMessage } = useMessage(); const advanceChargeModalRef = ref(null); const [registerTable, { reload, getSelectRows }] = useTable({ @@ -142,17 +145,24 @@ export default defineComponent({ reload(); } + function handleView(record: Recordable){ + openAdvanceChargeModal(true, { + id: record.id, + }); + } + return { registerTable, - registerModal, handleCreate, handleDelete, handleBatchDelete, handleEdit, + handleView, handleSuccess, handleOnStatus, handleCancel, - advanceChargeModalRef + advanceChargeModalRef, + viewAdvanceChargeModalRef } } }) diff --git a/web/src/views/financial/collection/components/ViewCollectionModal.vue b/web/src/views/financial/collection/components/ViewCollectionModal.vue index 55325f12..4bac5ada 100644 --- a/web/src/views/financial/collection/components/ViewCollectionModal.vue +++ b/web/src/views/financial/collection/components/ViewCollectionModal.vue @@ -5,7 +5,10 @@ title="收款单-详情" :sub-title= "receiptNumber"> {{ customerName }} @@ -61,6 +64,7 @@ import { Statistic, } from 'ant-design-vue'; import {collectionReceiptTableColumns} from "@/views/financial/collection/collection.data"; +import printJS from "print-js"; export default defineComponent({ name: 'ViewExpenseModal', components: { @@ -113,6 +117,46 @@ export default defineComponent({ closeModal(); } + function exportTable() { + + } + + const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; + const flexItem = 'display: flex; flex-direction: column; justify-content: space-between; font-size: 12px;'; + function primaryPrint() { + const header = ` +
+
单据编号:${receiptNumber.value}
+
单据日期:${receiptDate.value}
+
单据金额:${totalCollectionAmount.value}
+
+
+
收款账户:${collectionAccountName.value}
+
优惠金额:${discountAmount.value}
+
实际收款:${actualCollectionAmount.value}
+
+
+
客户:${customerName.value}
+
财务人员:${financialPersonName.value}
+
备注:${remark.value}
+
+`; + printJS({ + documentTitle: "EAIRP (收款单单据-详情)", + header: header, + properties: collectionReceiptTableColumns.map((item) => { + return { + field: item.dataIndex, + displayName: item.title, + }; + }), + printable: tableData.value, + gridHeaderStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + gridStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + type: 'json', + }); + } + return { receiptNumber, customerName, @@ -128,6 +172,8 @@ export default defineComponent({ registerModal, getTitle, handleSubmit, + exportTable, + primaryPrint }; }, }); diff --git a/web/src/views/financial/expense/components/ViewExpenseModal.vue b/web/src/views/financial/expense/components/ViewExpenseModal.vue index a3f60f8e..58468fda 100644 --- a/web/src/views/financial/expense/components/ViewExpenseModal.vue +++ b/web/src/views/financial/expense/components/ViewExpenseModal.vue @@ -5,7 +5,10 @@ title="支出单-详情" :sub-title= "receiptNumber"> {{ relatedPersonName }} @@ -59,6 +62,7 @@ import { Statistic, } from 'ant-design-vue'; import {expenseReceiptTableColumns} from "@/views/financial/expense/expense.data"; +import printJS from "print-js"; export default defineComponent({ name: 'ViewExpenseModal', components: { @@ -107,6 +111,42 @@ export default defineComponent({ closeModal(); } + function exportTable() { + + } + + const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; + const flexItem = 'display: flex; flex-direction: column; justify-content: space-between; font-size: 12px;'; + function primaryPrint() { + const header = ` +
+
单据编号:${receiptNumber.value}
+
单据日期:${receiptDate.value}
+
单据金额:${expenseAmount.value}
+
+
+
往来单位:${relatedPersonName.value}
+
支出账户:${expenseAccountName.value}
+
财务人员:${financialPersonName.value}
+
备注:${remark.value}
+
+`; + printJS({ + documentTitle: "EAIRP (支出单单据-详情)", + header: header, + properties: expenseReceiptTableColumns.map((item) => { + return { + field: item.dataIndex, + displayName: item.title, + }; + }), + printable: tableData.value, + gridHeaderStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + gridStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + type: 'json', + }); + } + return { receiptNumber, relatedPersonName, @@ -120,6 +160,8 @@ export default defineComponent({ registerModal, getTitle, handleSubmit, + exportTable, + primaryPrint }; }, }); diff --git a/web/src/views/financial/income/components/ViewIncomeModal.vue b/web/src/views/financial/income/components/ViewIncomeModal.vue index 8c609e12..3fce26bf 100644 --- a/web/src/views/financial/income/components/ViewIncomeModal.vue +++ b/web/src/views/financial/income/components/ViewIncomeModal.vue @@ -5,7 +5,10 @@ title="收入单-详情" :sub-title= "receiptNumber"> {{ relatedPersonName }} @@ -59,6 +62,7 @@ import { Statistic, } from 'ant-design-vue'; import {incomeReceiptTableColumns} from "@/views/financial/income/income.data"; +import printJS from "print-js"; export default defineComponent({ name: 'ViewIncomeModal', @@ -108,6 +112,41 @@ export default defineComponent({ closeModal(); } + function exportTable() { + + } + + const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; + const flexItem = 'display: flex; flex-direction: column; justify-content: space-between; font-size: 12px;'; + function primaryPrint() { + const header = ` +
+
单据编号:${receiptNumber.value}
+
单据日期:${receiptDate.value}
+
单据金额:${incomeAmount.value}
+
+
+
收入账户:${incomeAccountName.value}
+
财务人员:${financialPersonName.value}
+
备注:${remark.value}
+
+`; + printJS({ + documentTitle: "EAIRP (收入单单据-详情)", + header: header, + properties: incomeReceiptTableColumns.map((item) => { + return { + field: item.dataIndex, + displayName: item.title, + }; + }), + printable: tableData.value, + gridHeaderStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + gridStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + type: 'json', + }); + } + return { receiptNumber, relatedPersonName, @@ -121,6 +160,8 @@ export default defineComponent({ registerModal, getTitle, handleSubmit, + exportTable, + primaryPrint }; }, }); diff --git a/web/src/views/financial/payment/components/ViewPaymentModal.vue b/web/src/views/financial/payment/components/ViewPaymentModal.vue index a44bb3fc..493d13d5 100644 --- a/web/src/views/financial/payment/components/ViewPaymentModal.vue +++ b/web/src/views/financial/payment/components/ViewPaymentModal.vue @@ -5,7 +5,10 @@ title="付款单-详情" :sub-title= "receiptNumber"> {{ supplierName }} @@ -61,6 +64,7 @@ import { Statistic, } from 'ant-design-vue'; import {paymentReceiptTableColumns} from "@/views/financial/payment/payment.data"; +import printJS from "print-js"; export default defineComponent({ name: 'ViewExpenseModal', components: { @@ -113,6 +117,46 @@ export default defineComponent({ closeModal(); } + function exportTable() { + + } + + const flexContainer = 'display: flex; justify-content: space-between; border-bottom: 1px solid #ddd; padding: 8px;'; + const flexItem = 'display: flex; flex-direction: column; justify-content: space-between; font-size: 12px;'; + function primaryPrint() { + const header = ` +
+
单据编号:${receiptNumber.value}
+
单据日期:${receiptDate.value}
+
单据金额:${totalPaymentAmount.value}
+
+
+
付款账户:${paymentAccountName.value}
+
优惠金额:${discountAmount.value}
+
实际付款:${actualPaymentAmount.value}
+
+
+
供应商:${supplierName.value}
+
财务人员:${financialPersonName.value}
+
备注:${remark.value}
+
+`; + printJS({ + documentTitle: "EAIRP (付款单单据-详情)", + header: header, + properties: paymentReceiptTableColumns.map((item) => { + return { + field: item.dataIndex, + displayName: item.title, + }; + }), + printable: tableData.value, + gridHeaderStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + gridStyle: 'border: 1px solid #ddd; font-size: 12px; text-align: center; padding: 8px;', + type: 'json', + }); + } + return { receiptNumber, supplierName, @@ -128,6 +172,8 @@ export default defineComponent({ registerModal, getTitle, handleSubmit, + exportTable, + primaryPrint }; }, }); diff --git a/web/src/views/financial/transfer/components/ViewTransferModal.vue b/web/src/views/financial/transfer/components/ViewTransferModal.vue index d208b80f..116aa030 100644 --- a/web/src/views/financial/transfer/components/ViewTransferModal.vue +++ b/web/src/views/financial/transfer/components/ViewTransferModal.vue @@ -5,7 +5,10 @@ title="转账单-详情" :sub-title= "receiptNumber"> {{ receiptDate }} @@ -49,7 +52,7 @@