diff --git a/src/PagesStatistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue index 8102581..a801adf 100644 --- a/src/PagesStatistics/businessOverview.vue +++ b/src/PagesStatistics/businessOverview.vue @@ -369,7 +369,19 @@ const getOverview = () => { getPaymentCount(); getRevenueCount(); }; + +// 获取客户/供应商应收应付总额 +const getTotal = () => { + ReceiveApi.getTotal().then((res:any) => { + if(res.code === 200) { + const {unPayCustomerTotal, unPaySupplierTotal} = res.data + list[0].num = unPayCustomerTotal + list[1].num = unPaySupplierTotal + } + }) +} onMounted(() => { + getTotal() getOverview(); }); diff --git a/src/PagesStatistics/customerChecking.vue b/src/PagesStatistics/customerChecking.vue index 48d0e6b..186efd9 100644 --- a/src/PagesStatistics/customerChecking.vue +++ b/src/PagesStatistics/customerChecking.vue @@ -7,6 +7,8 @@ {{ item.supplierName }} ¥{{ item.unPayTotalPrice }} + + diff --git a/src/PagesStatistics/supplierChecking.vue b/src/PagesStatistics/supplierChecking.vue index a4c904a..fa1affa 100644 --- a/src/PagesStatistics/supplierChecking.vue +++ b/src/PagesStatistics/supplierChecking.vue @@ -7,6 +7,8 @@ {{ item.supplierName }} ¥{{ item.unPayTotalPrice }} + + diff --git a/src/pages.json b/src/pages.json index 3a7bd28..def9012 100644 --- a/src/pages.json +++ b/src/pages.json @@ -347,6 +347,18 @@ "navigationBarTitleText": "权限管理" } }, + { + "path": "paymentDetail", + "style": { + "navigationBarTitleText": "支付明细" + } + }, + { + "path": "incomeDetail", + "style": { + "navigationBarTitleText": "收入明细" + } + }, { "path": "components/addSupplierType", "style": { @@ -406,6 +418,18 @@ "style": { "navigationBarTitleText": "新增权限" } + }, + { + "path": "components/addPayment", + "style": { + "navigationBarTitleText": "新增支付明细" + } + }, + { + "path": "components/payContent", + "style": { + "navigationBarTitleText": "支付详情" + } } ] } diff --git a/src/pagesApp/components/CustomFilterDialog.vue b/src/pagesApp/components/CustomFilterDialog.vue new file mode 100644 index 0000000..d210277 --- /dev/null +++ b/src/pagesApp/components/CustomFilterDialog.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/pagesApp/components/SupplierDialog.vue b/src/pagesApp/components/SupplierDialog.vue new file mode 100644 index 0000000..e2ffb8c --- /dev/null +++ b/src/pagesApp/components/SupplierDialog.vue @@ -0,0 +1,241 @@ + + + diff --git a/src/pagesApp/components/addPayment.vue b/src/pagesApp/components/addPayment.vue new file mode 100644 index 0000000..5a70099 --- /dev/null +++ b/src/pagesApp/components/addPayment.vue @@ -0,0 +1,505 @@ + + + diff --git a/src/pagesApp/components/payContent.vue b/src/pagesApp/components/payContent.vue new file mode 100644 index 0000000..172230c --- /dev/null +++ b/src/pagesApp/components/payContent.vue @@ -0,0 +1,80 @@ + + + diff --git a/src/pagesApp/incomeDetail.vue b/src/pagesApp/incomeDetail.vue new file mode 100644 index 0000000..c93cf48 --- /dev/null +++ b/src/pagesApp/incomeDetail.vue @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/src/pagesApp/paymentDetail.vue b/src/pagesApp/paymentDetail.vue new file mode 100644 index 0000000..161a0a6 --- /dev/null +++ b/src/pagesApp/paymentDetail.vue @@ -0,0 +1,343 @@ + + + +./components/CustomFilterDialog.vue diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue index 73ab9cb..eb0c731 100644 --- a/src/pagesHome/index.vue +++ b/src/pagesHome/index.vue @@ -436,7 +436,7 @@ const appList = reactive([ title: "支付明细", fn: () => { uni.navigateTo({ - url: "/pagesApp/shipmentDetail", // 要跳转到的页面路径 + url: "/pagesApp/paymentDetail", // 要跳转到的页面路径 }); }, }, @@ -445,7 +445,7 @@ const appList = reactive([ title: "收入明细", fn: () => { uni.navigateTo({ - url: "/pagesApp/receiveCl", // 要跳转到的页面路径 + url: "/pagesApp/incomeDetail", // 要跳转到的页面路径 }); }, }, diff --git a/src/pagesShipment/form/settlementForm.vue b/src/pagesShipment/form/settlementForm.vue index b5a10ec..a553a43 100644 --- a/src/pagesShipment/form/settlementForm.vue +++ b/src/pagesShipment/form/settlementForm.vue @@ -429,7 +429,7 @@ const handleUpload = () => { resolve({ ...(res.data as any), businessId: model1.order.id, - imagesType: ImagesType.Settlement, // 单据资源 + imagesType: ImagesType.NORMARL, // 单据资源 orderType: OrderType.Shipment, // 出库单 }); } @@ -553,7 +553,7 @@ onLoad((option) => { PictureApi.getAnnex({ businessId: model1.order.id, orderType: OrderType.Shipment, - imagesType: ImagesType.Settlement, + imagesType: ImagesType.NORMARL, }).then((res) => { if (res.code === 200) { model1.order.fileLists = res.data; diff --git a/src/services/finance.ts b/src/services/finance.ts index e6bebab..014b2a1 100644 --- a/src/services/finance.ts +++ b/src/services/finance.ts @@ -27,6 +27,16 @@ export const addPaymentDetails = (data: any) => { }) } +// 删除 +export const deletePaymentDs = (data: any) => { + return http({ + method: 'POST', + url: '/api/paymentdtails/deletePaymentDs', + data, + }) +} + + // 收入明细新增 export const addRevenueDes = (data: any) => { return http({ diff --git a/src/services/receive.ts b/src/services/receive.ts index 201cdc2..d33d65a 100644 --- a/src/services/receive.ts +++ b/src/services/receive.ts @@ -126,6 +126,15 @@ export const getReconciliation = (data: any) => { }); }; +// 概况总应收应付 +export const getTotal = () => { + return http({ + method: "GET", + url: "/api/orderIn/getTotal" + }); +}; + + diff --git a/src/utils/enum.ts b/src/utils/enum.ts index 6592284..020b2a0 100644 --- a/src/utils/enum.ts +++ b/src/utils/enum.ts @@ -3,6 +3,8 @@ export enum OrderType { Receive = 1, Shipment = 2, + Pay = 3, + Income = 4 } // 扣杂状态:0扣杂1扣点 export enum ButtonType { @@ -20,12 +22,13 @@ export enum MultiCategory { Multiple = 1, } -// 0:普通资源1:皮重 2毛重 3 结算单据 +// 0:普通资源1:皮重 2毛重 export enum ImagesType { NORMARL = 0, Tare = 1, GROSSWEIGHT = 2, - Settlement = 3 + // Settlement = 3, + // Payment = 4 } //磅单状态:0:待定价1:待过皮2:待审核3:已审核待支付4:已支付 // 磅单状态:0:待出货1:待过毛2:待审核3:已审未付4:已审已付