From ec58a2a81cbbe3846d598088f083f6e330b37a0b Mon Sep 17 00:00:00 2001 From: ycy <2861518472@qq.com> Date: Sun, 7 Apr 2024 18:02:23 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E7=A5=A8=E6=8D=AE=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E5=AE=8C=E6=88=90,=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE=E5=AE=8C=E6=88=90(=E8=BF=98=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=8A=A0=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/modules/ycy.js | 34 +++ src/api/finance-bill-manage/receiptList.js | 7 + src/layout/components/LayoutAside.vue | 3 + src/pages/finance-bill-manage/billCancel.vue | 228 +++++++++--------- src/pages/finance-bill-manage/billReceipt.vue | 191 +++++++++++++++ src/pages/finance-bill-manage/billStock.vue | 189 ++++++++------- src/router/modules/financeBillManage.js | 11 +- src/stores/billReceipt.js | 19 ++ 8 files changed, 481 insertions(+), 201 deletions(-) create mode 100644 src/api/finance-bill-manage/receiptList.js create mode 100644 src/pages/finance-bill-manage/billReceipt.vue create mode 100644 src/stores/billReceipt.js diff --git a/mock/modules/ycy.js b/mock/modules/ycy.js index 821f693..5be9a75 100644 --- a/mock/modules/ycy.js +++ b/mock/modules/ycy.js @@ -13,6 +13,29 @@ const StockList = Mock.mock({ }, ], }); + +const personName = () => { + return [ + { + label: "员工名单", + children: [ + { + label: "孙东宇", + }, + { + label: "杨春宇", + }, + { + label: "吕才卓", + }, + { + label: "刘欣宇", + }, + ], + }, + ]; +}; + const CancelList = Mock.mock({ "list|20-30": [ { @@ -49,4 +72,15 @@ export default [ }; }, }, + { + url: "/api/personName", + method: "get", + response: () => { + const list = personName(); + return { + code: 200, + data: list, + }; + }, + }, ]; diff --git a/src/api/finance-bill-manage/receiptList.js b/src/api/finance-bill-manage/receiptList.js new file mode 100644 index 0000000..6ca8a2d --- /dev/null +++ b/src/api/finance-bill-manage/receiptList.js @@ -0,0 +1,7 @@ +import request from "@/utils/requestMock"; + +const API = { + PERSON_LIST: "/personName", +}; + +export const reqPersonName = () => request.get(API.PERSON_LIST); diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue index eabebfb..f061731 100644 --- a/src/layout/components/LayoutAside.vue +++ b/src/layout/components/LayoutAside.vue @@ -11,6 +11,9 @@ 票据退库管理 + + 票据领用管理 + diff --git a/src/pages/finance-bill-manage/billCancel.vue b/src/pages/finance-bill-manage/billCancel.vue index 29bd0e7..176872a 100644 --- a/src/pages/finance-bill-manage/billCancel.vue +++ b/src/pages/finance-bill-manage/billCancel.vue @@ -1,116 +1,129 @@ - - - - - - + + + + + + + - - - - - + + + - - - - - + + + + - - - - - - 查询 - 重置 - - - - - - - 票据列表 - - - - - - - - - - - {{ item.label }} + + + + - - - - - {{ item.label }} - + + 查询 + 重置 + + + + + + + 票据列表 - - - - {{ "审批" }} - {{ - "重新审批" - }} - - - - + + + + + + + + + + {{ item.label }} + + + + + + {{ item.label }} + + + + + + {{ + "审批" + }} + {{ + "重新审批" + }} + + + + + + { } } .table-box { - height: 41rem; + height: 42rem; background-color: @base-white-color; padding: 1rem; padding-top: 0; @@ -449,4 +462,3 @@ onMounted(() => { justify-content: space-between; } -@/api/finance-bill-manage/cancelList diff --git a/src/pages/finance-bill-manage/billReceipt.vue b/src/pages/finance-bill-manage/billReceipt.vue new file mode 100644 index 0000000..62d31cd --- /dev/null +++ b/src/pages/finance-bill-manage/billReceipt.vue @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + 票据列表 + + + + + + + + + + + {{ + item.label + }} + + + + + + {{ item.label }} + + + + + + {{ + "审批" + }} + {{ + "重新审批" + }} + + + + + + + + + + + + + diff --git a/src/pages/finance-bill-manage/billStock.vue b/src/pages/finance-bill-manage/billStock.vue index aa4bbd2..69691f0 100644 --- a/src/pages/finance-bill-manage/billStock.vue +++ b/src/pages/finance-bill-manage/billStock.vue @@ -1,98 +1,104 @@ - - - - - - + + + + + + + - - - - - + + + - - - - - - 查询 - 重置 - - - - - - - 票据列表 - - - - - 新增票据 - - - - - - - - - - {{ item.label }} + + + + - - - 修改 - 删除 - - - + + 查询 + 重置 + + + + + + + 票据列表 + + + + + 新增票据 + + + + + + + + + + {{ item.label }} + + + + 修改 + 删除 + + + + { } } .table-box { - height: 41rem; + height: 42rem; background-color: @base-white-color; padding: 1rem; padding-top: 0; @@ -488,4 +494,3 @@ onMounted(() => { justify-content: space-between; } -@/api/finance-bill-manage/stockList diff --git a/src/router/modules/financeBillManage.js b/src/router/modules/financeBillManage.js index bc01b5d..16f7a92 100644 --- a/src/router/modules/financeBillManage.js +++ b/src/router/modules/financeBillManage.js @@ -1,6 +1,7 @@ import Layout from "@/layout/index.vue"; import BillStockURL from "@/pages/finance-bill-manage/billStock.vue"; import BillCancelURL from "@/pages/finance-bill-manage/billCancel.vue"; +import BillReceiptURL from "@/pages/finance-bill-manage/billReceipt.vue"; const financeBillManage = [ { @@ -22,7 +23,15 @@ const financeBillManage = [ name: "billCancel", component: BillCancelURL, meta: { - title: "票据上传", + title: "票据退库", + }, + }, + { + path: "BillReceipt", + name: "billReceipt", + component: BillReceiptURL, + meta: { + title: "票据领用", }, }, ], diff --git a/src/stores/billReceipt.js b/src/stores/billReceipt.js new file mode 100644 index 0000000..6a73ca8 --- /dev/null +++ b/src/stores/billReceipt.js @@ -0,0 +1,19 @@ +import { defineStore } from "pinia"; +import { reqPersonName } from "@/api/finance-bill-manage/receiptList"; + +export const useReceiptList = defineStore("ReceiptList", { + state: () => { + return { + personName: [], + }; + }, + actions: { + async getPersonNameList() { + const { data } = await reqPersonName(); + this.personName = data; + console.log(this.personName); + return this.personName; + }, + }, + persist: true, +});