diff --git a/mock/modules/ycy.js b/mock/modules/ycy.js index 2141287..69091dd 100644 --- a/mock/modules/ycy.js +++ b/mock/modules/ycy.js @@ -178,6 +178,7 @@ const breakageList = Mock.mock({ breakDate: "@date", operator: "@cname", breakStatus: "@integer(0,2)", + breakInfo: "@csentence", }, ], }); diff --git a/src/layout/components/LayoutAside.vue b/src/layout/components/LayoutAside.vue index 83ee151..7647ca5 100644 --- a/src/layout/components/LayoutAside.vue +++ b/src/layout/components/LayoutAside.vue @@ -14,19 +14,22 @@ - 票据入库管理 + 票据入库 - 票据退库管理 + 票据退库 - 票据领用管理 + 票据领用 - 票据退领管理 + 票据退领 - 票据报损管理 + 票据报损 + + + 票据核销 diff --git a/src/pages/finance-bill-manage/billBreakage.vue b/src/pages/finance-bill-manage/billBreakage.vue index c653c4d..38f6784 100644 --- a/src/pages/finance-bill-manage/billBreakage.vue +++ b/src/pages/finance-bill-manage/billBreakage.vue @@ -231,7 +231,16 @@ clearable /> - + + + @@ -305,6 +314,13 @@ const columns = ref([ align: "center", width: "100", }, + { + colKey: "breakInfo", + title: "报损原因", + ellipsis: true, + align: "center", + width: "100", + }, { colKey: "status", title: "操作", @@ -365,6 +381,7 @@ const dialogData = ref({ billType: "", breakNum: Number, breakDate: "", + breakInfo: "", }); // 查询表单 @@ -444,6 +461,7 @@ const breakageAdd = () => { billType: "", breakNum: Number, breakDate: "", + breakInfo: "", }; }; @@ -458,6 +476,7 @@ const FORM_RULES = { breakNum: [{ required: true, message: "请输入报损数量", trigger: "blur" }], breakDate: [{ required: true, message: "请选择报损日期", trigger: "change" }], operator: [{ required: true, message: "请输入操作员", trigger: "blur" }], + breakInfo: [{ required: true, message: "请输入报损原因", trigger: "blur" }], }; // 新增 diff --git a/src/pages/finance-bill-manage/billDestroy.vue b/src/pages/finance-bill-manage/billDestroy.vue new file mode 100644 index 0000000..fc4a6a6 --- /dev/null +++ b/src/pages/finance-bill-manage/billDestroy.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/src/router/modules/financeBillManage.js b/src/router/modules/financeBillManage.js index c4aff91..9da78d7 100644 --- a/src/router/modules/financeBillManage.js +++ b/src/router/modules/financeBillManage.js @@ -4,6 +4,7 @@ import BillCancelURL from "@/pages/finance-bill-manage/billCancel.vue"; import BillReceiptURL from "@/pages/finance-bill-manage/billReceipt.vue"; import BillQuitneckURL from "@/pages/finance-bill-manage/billQuitneck.vue"; import BillBreakagekURL from "@/pages/finance-bill-manage/billBreakage.vue"; +import BillDestroyURL from "@/pages/finance-bill-manage/billDestroy.vue"; const financeBillManage = [ { @@ -52,6 +53,14 @@ const financeBillManage = [ title: "票据报损", }, }, + { + path: "BillDestroy", + name: "billDestroy", + component: BillDestroyURL, + meta: { + title: "票据核销", + }, + }, ], }, ]; diff --git a/src/stores/billBreakage.js b/src/stores/billBreakage.js index 9569d3e..52d451e 100644 --- a/src/stores/billBreakage.js +++ b/src/stores/billBreakage.js @@ -5,6 +5,7 @@ export const useBreakage = defineStore("breakageList", { state: () => { return { breakageList: [], + destroyList: [], }; }, actions: { @@ -22,6 +23,8 @@ export const useBreakage = defineStore("breakageList", { this.breakageList.unshift(arr); localStorage.setItem("breakageList", JSON.stringify(this.breakageList)); } + this.destroyList.push(arr); + localStorage.setItem("destroyList", JSON.stringify(this.breakageList)); return this.breakageList; }, deleteBreakageList(item) { diff --git a/src/stores/billDestroy.js b/src/stores/billDestroy.js new file mode 100644 index 0000000..6aeac69 --- /dev/null +++ b/src/stores/billDestroy.js @@ -0,0 +1,19 @@ +import { defineStore } from "pinia"; + +export const useDestroy = defineStore("destroyList", { + state: () => { + return { + destroyList: [], + }; + }, + actions: { + async getDestroyList() { + this.destroyList = JSON.parse( + localStorage.getItem("breakageList") + ).destroyList; + console.log(this.destroyList); + return this.destroyList; + }, + }, + persist: true, +});