From a8879f7817fd8d7f13a0edd62533d93e9034947f Mon Sep 17 00:00:00 2001 From: "xunyu.guo" <916759660@qq.com> Date: Thu, 13 Jan 2022 15:07:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=A2=E6=97=97?= =?UTF-8?q?=E3=80=81=E5=A4=A7=E4=BC=97=E5=B9=B3=E5=8F=B0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/vw_menu.js | 10 +- .../ux/billManage/kanbanOutOrder/detail.vue | 55 +++++++ .../billManage/kanbanWithOutOrder/detail.vue | 50 ++++++ .../billManage/sparepartOutOrder/detail.vue | 55 +++++++ .../views/ux/billManage/vwOutOrder/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_f_outorder/detail.vue | 55 +++++++ .../hq_f_outorder_chickout/detail.vue | 153 ++++++++++++------ .../ux/vw/dataInput/hq_h_checkout/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_h_outorder/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_m_checkout/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_m_outorder/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_y_outorder/detail.vue | 55 +++++++ .../ux/vw/dataInput/hq_y_report/index.vue | 3 +- vue/src/views/ux/vw/dataInput/r3/index.vue | 4 +- 14 files changed, 662 insertions(+), 53 deletions(-) diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 204db7e3..ab89dc8c 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -30,7 +30,7 @@ const vwMenudataRouter = { name: 'Invoices', meta: { title: '发票汇总', - roles: ['SettleAccount.Reports'], + roles: ['SettleAccount.Invoices'], icon: '对比' } }, @@ -153,7 +153,7 @@ const vwMenudataRouter = { name: 'KanBanWithCode',//命名路由 meta: { title: '看板结算输出', - //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '看板' } }, @@ -163,7 +163,7 @@ const vwMenudataRouter = { name: 'KanbanUnSettled',//命名路由 meta: { title: '看板未结输出', - //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '看板' } }, @@ -173,7 +173,7 @@ const vwMenudataRouter = { name: 'KanBanWithOutCode',//命名路由 meta: { title: '无条码看板结算输出', - //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '看板' } }, @@ -183,7 +183,7 @@ const vwMenudataRouter = { name: 'SparePartReport',//命名路由 meta: { title: '备件结算输出', - //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '供货' } } diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index d5ccde75..83465868 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wmskanbanoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 058d50e6..fca5e7c3 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + { + // let id = element.id; + // params.push(id); + // }); + // myalert = "选中项"; + // } + // this.$confirm("是否删除" + myalert + "?", "提示", { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // }) + // .then(() => { + // this.$axios + // .posts("/api/settleaccount/Job/delete", params) + // .then((response) => { + // const index = this.list.indexOf(row); + // this.$notify({ + // title: "成功", + // message: "删除成功", + // type: "success", + // duration: 2000, + // }); + // this.getList(); + // }); + // }) + // .catch(() => { + // this.$message({ + // type: "info", + // message: "已取消操作", + // }); + // }); + // }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index ac9479fe..6c6afa4d 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -32,6 +32,14 @@ @click="print()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wmsSharePartoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue index 3e501f78..4d3d14c0 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wmsjitoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue index d087bb52..48f68ef9 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WMSHQFKanbanoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue index 96b3c02d..ed33752a 100644 --- a/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue @@ -32,6 +32,15 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + - - + + + width="100" + >
@@ -125,7 +136,7 @@ :title="formTitle" width="700px" > - 确认
@@ -221,6 +230,7 @@ export default { return {}; }, }, + listQuery: { Filters: [ { @@ -238,7 +248,10 @@ export default { version: "", guids: "", billNum: "", - accountDate:"" + accountDate: "", + }, + listDeleteQuery: { + billNum: "", }, page: 1, JobversionValue: "", @@ -250,9 +263,9 @@ export default { showExcelImport: false, tableHeight: document.documentElement.clientHeight - 230, isEdit: false, - accountDatelist:{ - accountDate:"" - } + accountDatelist: { + accountDate: "", + }, }; }, mounted() { @@ -386,44 +399,94 @@ export default { }); }); }, - print() { + print() { this.dialogFormVisible = true; }, //出库单 handleCreateBills(row) { this.dialogFormVisible = true; - this.listLoading = true; - this.listOutPutQuery.guids = []; - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.billNum = this.customerInfo.parentId; - if (this.accountDatelist != "") { - this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; - } - //this.listOutPutQuery.accountDate = this.accountDatelist; - console.log( - "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) - ); + this.listLoading = true; + this.listOutPutQuery.guids = []; + this.listOutPutQuery.version = this.customerInfo.version; + this.listOutPutQuery.billNum = this.customerInfo.parentId; + if (this.accountDatelist != "") { + this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; + } + //this.listOutPutQuery.accountDate = this.accountDatelist; + console.log( + "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + ); + + this.$axios + .posts( + "/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass", + this.listOutPutQuery + ) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "生成成功", + type: "success", + duration: 2000, + }); + this.getList(); + this.listLoading = false; + }) + .catch(() => { + this.listLoading = false; + }); + }, + //删除出库单 + handleDelete(row) { + var params = []; + let myalert = ""; //声明变量，其变量必须在此声明后使用 + if (row) { + //单行 + params.push(row.id); + myalert = row.name; + } else { + //多选 + this.multipleSelection.forEach((element) => { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + // if (this.listDeleteQuery != "") { + // this.listQuery.billNum = this.listDeleteQuery.billNum; + // } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts( + "/api/settleaccount/wmsHQFSharePartoutput/WmsOutPutDelete", + this.listDeleteQuery + ) - this.$axios - .posts( - "/api/settleaccount/WMSHQFKanbanoutput/WmsHQFKanbanOutPut-Pass", - this.listOutPutQuery - ) - .then((response) => { - const index = this.list.indexOf(row); - this.$notify({ - title: "成功", - message: "生成成功", - type: "success", - duration: 2000, + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); }); - this.getList(); - this.listLoading = false; - }) - .catch(() => { - this.listLoading = false; + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", }); - + }); }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue index d94c4c7c..7bacb41a 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WmsHQHSharePartoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue index 5b1e04c9..0fea6920 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WmsHQHKanbanoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue index e1dffab1..0168a91e 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WmsHQMSharePartoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue index f7a3a4ed..31aa7adc 100644 --- a/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_m_outorder/detail.vue @@ -32,6 +32,14 @@ @click="handleCancelBills()" >取消出库(支持批量) + 删除出库单(支持批量) + { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WMSHQMKanbanoutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index e1c2cafb..302453e7 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -31,6 +31,14 @@ icon="el-icon-download" @click="handleCancelBills()" >取消出库(支持批量) + + 删除出库单(支持批量) { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.listDeleteQuery.billNum = this.listQuery.billNum ; + console.log("单据号：" + JSON.stringify(this.listDeleteQuery)); + this.$confirm("是否删除" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", this.listDeleteQuery) + .then((response) => { + const index = this.list.indexOf(row); + this.$notify({ + title: "成功", + message: "删除成功", + type: "success", + duration: 2000, + }); + this.getList(); + }); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", + }); + }); + }, /** 刷新列表 */ handleHandle(data) { if (data.type !== "edit") { diff --git a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue index 21b355d0..13c8a6ea 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_report/index.vue @@ -702,7 +702,8 @@ export default { //判断已经生成出库单的不能再生成出库操作 this.multipleSelection.forEach((element) => { let state = element.fileName; - if (state != "" && state != "已确认") { + if (state != "" && state != "已确认") + { this.isEdit = true; getbillNum += state + ","; } diff --git a/vue/src/views/ux/vw/dataInput/r3/index.vue b/vue/src/views/ux/vw/dataInput/r3/index.vue index 2cc26d79..a88a127d 100644 --- a/vue/src/views/ux/vw/dataInput/r3/index.vue +++ b/vue/src/views/ux/vw/dataInput/r3/index.vue @@ -17,14 +17,14 @@ >导入文件（Excel） - 导出Csv - + --> Date: Thu, 13 Jan 2022 15:11:25 +0800 Subject: [PATCH 2/2] 11 --- vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue index 302453e7..98b20a1b 100644 --- a/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_y_outorder/detail.vue @@ -459,6 +459,7 @@ export default { cancelButtonText: "取消", type: "warning", }) + .then(() => { this.$axios .posts("/api/settleaccount/WmsHQCaroutput/WmsOutPutDelete", this.listDeleteQuery)