diff --git a/mock/modules/sdy.js b/mock/modules/sdy.js index f748914..cf606e8 100644 --- a/mock/modules/sdy.js +++ b/mock/modules/sdy.js @@ -13,6 +13,20 @@ const data = Mock.mock({ } ] }) +const loans = Mock.mock({ + "list|45": [ + { + "id|+1": 1, + 'proposer': '@cname', + 'student': '@integer(100000000,999999999)', + 'allowance': '@integer(10000,50000)', + 'department': '@pick(["机电工程系","护理分院","建筑系","材料科学与工程系","环境科学与工程系"])', + 'cation': '@pick(["2021-2022学年度","2022-2023学年度"])', + 'loanTerm': '@pick(["已放款","未放款"])', + 'timeofapplication': '@date("yyyy-MM-dd")', + } + ] +}) export default [ { url: '/get-sdy-managment-list', @@ -58,5 +72,38 @@ export default [ code: 200, } } - } + }, + // 借款管理 + { + url: '/get-sdy-loan-list', + method: 'get', + response: () => { + return { + code: 200, + data: loans + } + } + }, + // 添加借款人 + { + url: '/post-sdy-loan-add', + method: 'post', + response: (req) => { + const newLoan = { + id: loans.list.length + 1, + proposer: req.body.proposer, + student: req.body.student, + allowance: req.body.allowance, + department: req.body.department, + cation: req.body.cation, + loanTerm: req.body.loanTerm, + timeofapplication: req.body.timeofapplication, + } + loans.list.push(newLoan) + return { + code: 200, + data: newLoan + } + } + }, ] \ No newline at end of file diff --git a/mock/modules/ycy.js b/mock/modules/ycy.js index 69091dd..94304eb 100644 --- a/mock/modules/ycy.js +++ b/mock/modules/ycy.js @@ -8,7 +8,6 @@ const StockList = Mock.mock({ billserial: "@integer(100000000,199999999)1", billType: "@integer(0,4)", stockNum: "@integer(1,2)", - unit: "@cword(张本,1)", stockDate: "@date", operator: "@cname", remark: " @integer(10000000000,19999999999)", @@ -182,6 +181,21 @@ const breakageList = Mock.mock({ }, ], }); +// +const detailReportList = Mock.mock({ + "list|5": [ + { + "id|+1": 0, + branch: "@cname", + stockNum: "@integer(1,20)张", + cancelNum: "@integer(0,20)张", + receiveNum: "@integer(0,20)张", + breakNum: "@integer(0,20)张", + destoryNum: "@integer(0,20)张", + grossBillRatio: "25%", + }, + ], +}); export default [ { @@ -252,4 +266,14 @@ export default [ }; }, }, + { + url: "/api/detailReportList", + method: "get", + response: () => { + return { + code: 200, + data: detailReportList, + }; + }, + }, ]; diff --git a/package-lock.json b/package-lock.json index 7f33dcb..243e37f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "axios": "^1.6.8", "dayjs": "^1.11.10", + "echarts": "^5.5.0", "less": "^4.2.0", "mockjs": "^1.1.0", "pinia": "^2.1.7", @@ -1024,6 +1025,20 @@ "node": ">=0.4.0" } }, + "node_modules/echarts": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz", + "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.5.0" + } + }, + "node_modules/echarts/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "node_modules/ee-first": { "version": "1.1.1", "license": "MIT" @@ -2058,6 +2073,19 @@ "version": "3.1.1", "dev": true, "license": "ISC" + }, + "node_modules/zrender": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz", + "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==", + "dependencies": { + "tslib": "2.3.0" + } + }, + "node_modules/zrender/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" } } } diff --git a/package.json b/package.json index 98f0615..beb66d2 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,9 @@ "dependencies": { "axios": "^1.6.8", "dayjs": "^1.11.10", + "echarts": "^5.5.0", + "exceljs": "^4.4.0", + "file-saver": "^2.0.5", "less": "^4.2.0", "mockjs": "^1.1.0", "pinia": "^2.1.7", diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/src/api/finance-bill-manage/detailReportList.js b/src/api/finance-bill-manage/detailReportList.js new file mode 100644 index 0000000..82162bf --- /dev/null +++ b/src/api/finance-bill-manage/detailReportList.js @@ -0,0 +1,7 @@ +import request from "@/utils/requestMock"; + +const API = { + DETAILREPORT_LIST: "/detailReportList", +}; + +export const reqDetailReportList = () => request.get(API.DETAILREPORT_LIST); diff --git a/src/api/receivables-management/management.js b/src/api/receivables-management/management.js index f7740e3..317622d 100644 --- a/src/api/receivables-management/management.js +++ b/src/api/receivables-management/management.js @@ -1,8 +1,17 @@ import request from '@/utils/request' - +// 收款管理 export function APIReceivablesList() { return request.get('/get-sdy-managment-list') } +//查询收款 export function APIReceivablesAdd(data) { return request.post('/post-sdy-managment-find', data) +} +//贷款管理 +export function APILoansList() { + return request.get('/get-sdy-loan-list') +} +//查询贷款 +export function APILoansAdd(data) { + return request.post('/post-sdy-loan-add', data) } \ No newline at end of file diff --git a/src/components/echarts/bar.vue b/src/components/echarts/bar.vue new file mode 100644 index 0000000..7d94e15 --- /dev/null +++ b/src/components/echarts/bar.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/src/components/echarts/line.vue b/src/components/echarts/line.vue new file mode 100644 index 0000000..3e21e69 --- /dev/null +++ b/src/components/echarts/line.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/components/echarts/pie.vue b/src/components/echarts/pie.vue new file mode 100644 index 0000000..8343c39 --- /dev/null +++ b/src/components/echarts/pie.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue index 7647ca5..15d9975 100644 --- a/src/layout/components/LayoutAside.vue +++ b/src/layout/components/LayoutAside.vue @@ -31,6 +31,9 @@ 票据核销 + + 报表明细 +