From 5ffed191f35ed44f0fb5afe36149b86dda2351e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 5 Sep 2021 20:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E9=83=BD=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/bill/AllocationOutList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/AssembleList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/DisassembleList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/OtherInList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/OtherOutList.vue | 14 ++++++++++++-- .../src/views/bill/PurchaseBackList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/PurchaseInList.vue | 14 ++++++++++++-- .../src/views/bill/PurchaseOrderList.vue | 19 ++----------------- jshERP-web/src/views/bill/RetailBackList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/RetailOutList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/SaleBackList.vue | 14 ++++++++++++-- jshERP-web/src/views/bill/SaleOrderList.vue | 4 ++-- jshERP-web/src/views/bill/SaleOutList.vue | 14 ++++++++++++-- .../src/views/bill/mixins/BillListMixin.js | 17 ++++++++++++++--- .../src/views/financial/AdvanceInList.vue | 14 ++++++++++++-- jshERP-web/src/views/financial/GiroList.vue | 14 ++++++++++++-- jshERP-web/src/views/financial/ItemInList.vue | 14 ++++++++++++-- .../src/views/financial/ItemOutList.vue | 14 ++++++++++++-- .../src/views/financial/MoneyInList.vue | 14 ++++++++++++-- .../src/views/financial/MoneyOutList.vue | 14 ++++++++++++-- .../financial/mixins/FinancialListMixin.js | 15 +++++++++++++-- .../views/system/modules/FunctionModal.vue | 3 ++- .../views/system/modules/RolePushBtnModal.vue | 3 ++- 23 files changed, 239 insertions(+), 60 deletions(-) diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 8a5ea971..7375d0f3 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -68,6 +68,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -95,10 +97,14 @@ 编辑 - + 删除 + @@ -165,6 +171,9 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -175,7 +184,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index fc958500..ee4659a4 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -68,6 +68,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -95,10 +97,14 @@ 编辑 - + 删除 + @@ -165,6 +171,9 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -175,7 +184,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 38db8206..94cc178f 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -68,6 +68,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -95,10 +97,14 @@ 编辑 - + 删除 + @@ -165,6 +171,9 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -175,7 +184,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index fc0ef9d1..c8f5493a 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -104,10 +106,14 @@ 编辑 - + 删除 + @@ -176,6 +182,9 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -186,7 +195,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index f68d2641..e5a5c2c6 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -104,10 +106,14 @@ 编辑 - + 删除 + @@ -176,6 +182,9 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -186,7 +195,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index d6bbe510..cbca4ac2 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -104,10 +106,14 @@ 编辑 - + 删除 + @@ -188,6 +194,9 @@ } }, { title: '退款', dataIndex: 'changeAmount',width:50}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -198,7 +207,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 8905cd07..737c3598 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -105,10 +107,14 @@ 编辑 - + 删除 + @@ -195,6 +201,9 @@ return debt? debt.toFixed(2):'' } }, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -205,7 +214,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 0f9d89f2..ac15d6d9 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -78,7 +78,7 @@ 删除 审核 - 反审核 + 反审核 批量操作 @@ -184,7 +184,7 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, - {title: '状态', dataIndex: 'status', width: 80, align: "center", + { title: '状态', dataIndex: 'status', width: 80, align: "center", scopedSlots: { customRender: 'customRenderStatus' } }, { @@ -211,21 +211,6 @@ computed: { }, methods: { - myHandleEdit(record) { - if(record.status === '0') { - this.$refs.modalForm.action = "edit"; - this.handleEdit(record); - } else { - this.$message.warning("抱歉，只有未审核的单据才能编辑！") - } - }, - myHandleDelete(record) { - if(record.status === '0') { - this.handleDelete(record.id) - } else { - this.$message.warning("抱歉，只有未审核的单据才能删除！") - } - } } } diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 8abaa584..97c6fc03 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -104,10 +106,14 @@ 编辑 - + 删除 + @@ -177,6 +183,9 @@ { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '付款', dataIndex: 'changeAmount',width:50}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -187,7 +196,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 5eba2f7e..6b8b9366 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -77,6 +77,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -104,10 +106,14 @@ 编辑 - + 删除 + @@ -177,6 +183,9 @@ { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, { title: '收款', dataIndex: 'changeAmount',width:50}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -187,7 +196,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 0a9960d0..99e82173 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -78,6 +78,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -105,10 +107,14 @@ 编辑 - + 删除 + @@ -188,6 +194,9 @@ } }, { title: '退款', dataIndex: 'changeAmount',width:50}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -198,7 +207,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 74af4a72..b2b96941 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -79,7 +79,7 @@ 删除 审核 - 反审核 + 反审核 批量操作 @@ -184,7 +184,7 @@ { title: '单据日期', dataIndex: 'operTimeStr',width:145}, { title: '操作员', dataIndex: 'userName',width:80}, { title: '金额合计', dataIndex: 'totalPrice',width:80}, - {title: '状态', dataIndex: 'status', width: 70, align: "center", + { title: '状态', dataIndex: 'status', width: 70, align: "center", scopedSlots: { customRender: 'customRenderStatus' } }, { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 4a2cacf3..5d3f4224 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -78,6 +78,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -106,10 +108,14 @@ 编辑 - + 删除 + @@ -195,6 +201,9 @@ return debt? debt.toFixed(2):'' } }, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -205,7 +214,8 @@ url: { list: "/depotHead/list", delete: "/depotHead/delete", - deleteBatch: "/depotHead/deleteBatch" + deleteBatch: "/depotHead/deleteBatch", + batchSetStatusUrl: "/depotHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js index 19811536..31e4056e 100644 --- a/jshERP-web/src/views/bill/mixins/BillListMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js @@ -32,8 +32,19 @@ export const BillListMixin = { this.handleAdd(); }, myHandleEdit(record) { - this.$refs.modalForm.action = "edit"; - this.handleEdit(record); + if(record.status === '0') { + this.$refs.modalForm.action = "edit"; + this.handleEdit(record); + } else { + this.$message.warning("抱歉，只有未审核的单据才能编辑！") + } + }, + myHandleDelete(record) { + if(record.status === '0') { + this.handleDelete(record.id) + } else { + this.$message.warning("抱歉，只有未审核的单据才能删除！") + } }, myHandleDetail(record, type) { this.handleDetail(record, type); @@ -59,7 +70,7 @@ export const BillListMixin = { }, removeStatusColumn() { //没有审核反审核权限的时候直接移除状态列 - if(this.btnEnableList.indexOf(2)===-1) { + if(this.btnEnableList.indexOf(2)===-1 && this.btnEnableList.indexOf(7)===-1) { this.columns.splice(7,1) } }, diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index a0e0c1bd..930a1cfc 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -73,6 +73,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -100,10 +102,14 @@ 编辑 - + 删除 + @@ -156,6 +162,9 @@ { title: '合计金额', dataIndex: 'totalPrice',width:80}, { title: '收款金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -167,7 +176,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index d1422dbd..8b927e11 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -64,6 +64,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -91,10 +93,14 @@ 编辑 - + 删除 + @@ -144,6 +150,9 @@ { title: '操作员', dataIndex: 'userName',width:80}, { title: '实付金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -155,7 +164,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index 478b696c..bfa85593 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -73,6 +73,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -100,10 +102,14 @@ 编辑 - + 删除 + @@ -155,6 +161,9 @@ { title: '操作员', dataIndex: 'userName',width:80}, { title: '收入金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -166,7 +175,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index 9859cdc4..b2b029de 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -73,6 +73,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -100,10 +102,14 @@ 编辑 - + 删除 + @@ -155,6 +161,9 @@ { title: '操作员', dataIndex: 'userName',width:80}, { title: '支出金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -166,7 +175,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index 25570e92..ff450ecb 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -73,6 +73,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -101,10 +103,14 @@ 编辑 - + 删除 + @@ -158,6 +164,9 @@ { title: '优惠金额', dataIndex: 'discountMoney',width:80}, { title: '实际收款', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -169,7 +178,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index 6bec7ab2..6c76a3d5 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -73,6 +73,8 @@ 删除 + 审核 + 反审核 批量操作 @@ -101,10 +103,14 @@ 编辑 - + 删除 + @@ -158,6 +164,9 @@ { title: '优惠金额', dataIndex: 'discountMoney',width:80}, { title: '实际付款', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, + { title: '状态', dataIndex: 'status', width: 80, align: "center", + scopedSlots: { customRender: 'customRenderStatus' } + }, { title: '操作', dataIndex: 'action', @@ -169,7 +178,8 @@ url: { list: "/accountHead/list", delete: "/accountHead/delete", - deleteBatch: "/accountHead/deleteBatch" + deleteBatch: "/accountHead/deleteBatch", + batchSetStatusUrl: "/accountHead/batchSetStatus" } } }, diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js index 56b2a088..4de91a31 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js @@ -31,8 +31,19 @@ export const FinancialListMixin = { this.handleAdd(); }, myHandleEdit(record) { - this.$refs.modalForm.action = "edit"; - this.handleEdit(record); + if(record.status === '0') { + this.$refs.modalForm.action = "edit"; + this.handleEdit(record); + } else { + this.$message.warning("抱歉，只有未审核的单据才能编辑！") + } + }, + myHandleDelete(record) { + if(record.status === '0') { + this.handleDelete(record.id) + } else { + this.$message.warning("抱歉，只有未审核的单据才能删除！") + } }, myHandleDetail(record, type) { this.handleDetail(record, type); diff --git a/jshERP-web/src/views/system/modules/FunctionModal.vue b/jshERP-web/src/views/system/modules/FunctionModal.vue index b8093faf..fccf7a94 100644 --- a/jshERP-web/src/views/system/modules/FunctionModal.vue +++ b/jshERP-web/src/views/system/modules/FunctionModal.vue @@ -66,7 +66,8 @@ jselectMultiple: { options: [ { text: '编辑', value: '1' }, - { text: '审核反审核', value: '2' }, + { text: '审核', value: '2' }, + { text: '反审核', value: '7' }, { text: '导入导出', value: '3' }, { text: '启用禁用', value: '4' }, { text: '打印', value: '5' }, diff --git a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue index 37d48ee1..339b6a0b 100644 --- a/jshERP-web/src/views/system/modules/RolePushBtnModal.vue +++ b/jshERP-web/src/views/system/modules/RolePushBtnModal.vue @@ -37,7 +37,8 @@ :loading="loading"> 编辑 - 审核反审核 + 审核 + 反审核 导入导出 启用禁用 打印