From 68c7eacfd2544ef6ffcb99bf7360de40d4ab0b42 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 26 Oct 2022 16:30:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E5=87=BB=E7=A1=AE=E8=AE=A4=E5=87=BA=E5=BA=93=20?= =?UTF-8?q?=E7=BB=99=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ux/billManage/kanbanOutOrder/detail.vue | 210 +----------------- .../billManage/kanbanWithOutOrder/detail.vue | 8 + .../billManage/sparepartOutOrder/detail.vue | 8 + .../billManage/sparepartOutOrder90/detail.vue | 8 + .../views/ux/billManage/vwOutOrder/detail.vue | 21 +- .../ux/billManage/wmsCusomerKanban/detail.vue | 8 + .../ux/vw/dataInput/OnetimeSale/detail.vue | 8 + .../ux/vw/dataInput/hq_h_outorder/detail.vue | 8 + .../ux/vw/dataInput/hq_kb_output/detail.vue | 8 + 9 files changed, 84 insertions(+), 203 deletions(-) diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index 33cc6416..915345ad 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -441,6 +441,14 @@ export default { }, //弹出出库单界面 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); @@ -573,95 +581,6 @@ export default { trailing: false, //在延时结束后不调用,保证事件只被触发一次 } ), - // saveBills(row) { - // this.listOutPutQuery.guids = []; - // this.listOutPutQuery.version = this.customerInfo.version; - // this.listOutPutQuery.billNum = this.customerInfo.parentId; - // if (this.accountDatelist.accountDate == "") { - // this.$message({ - // message: "请选择日期！", - // type: "warning", - // }); - // return; - // } - // this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; - - // console.log("确认出库条件：" + JSON.stringify(this.listOutPutQuery)); - - // let myalert = ""; - // var getAccountMonth = moment(this.accountDatelist.accountDate).format( - // "YYYY-MM" - // ); - // let date = new Date(); - // let currentMonth = moment(date).format("YYYY-MM"); - // if (getAccountMonth < currentMonth) { - // myalert = "过账日期小于当前月份"; - // this.$confirm("是否确认" + myalert + "?", "提示", { - // confirmButtonText: "确定", - // cancelButtonText: "取消", - // type: "warning", - // }) - // .then(() => { - // this.$axios - // .posts( - // "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "生成成功", - // type: "success", - // duration: 2000, - // }); - // this.accountDatelist.accountDate = ""; - // this.dialogFormVisible = false; - // this.getList(); - // this.formLoading = false; - // }) - // .catch(() => { - // this.formLoading = false; - // }); - // }) - // .catch(() => { - // this.$message({ - // type: "info", - // message: "已取消操作", - // }); - // this.formLoading = false; - // }); - // } else if (getAccountMonth === currentMonth) { - // this.$axios - // .posts( - // "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Pass", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "生成成功", - // type: "success", - // duration: 2000, - // }); - // this.accountDatelist.accountDate = ""; - // this.dialogFormVisible = false; - // this.getList(); - // this.formLoading = false; - // }) - // .catch(() => { - // this.formLoading = false; - // }); - // } else { - // this.$message({ - // type: "warning", - // message: "选择的过账日期不能大于当前月份！", - // }); - // this.formLoading = false; - // return; - // } - // }, //取消出库单 CancelBills: _.debounce( @@ -784,119 +703,6 @@ export default { trailing: false, //在延时结束后不调用,保证事件只被触发一次 } ), - // CancelBills(row) { - // if (this.accountDatelist.accountDate == "") { - // this.$message({ - // message: "请选择日期！", - // type: "warning", - // }); - // return; - // } - // var params = []; - // if (row) { - // //单行 - // params.push(row.id); - // } else { - // //多选 - // this.multipleSelection.forEach((element) => { - // let id = element.id; - // params.push(id); - // }); - // } - // this.listOutPutQuery.version = this.customerInfo.version; - // this.listOutPutQuery.guids = params; - // this.listOutPutQuery.billNum = this.customerInfo.parentId; - // this.listOutPutQuery.accountDate = this.accountDatelist.accountDate; - // console.log("取消出库条件：" + JSON.stringify(this.listOutPutQuery)); - // let myalert = ""; - // var getAccountMonth = moment(this.accountDatelist.accountDate).format( - // "YYYY-MM" - // ); //选择的日期 - // let date = new Date(); - // let currentMonth = moment(date).format("YYYY-MM"); //当前月 - // console.log( - // "过账日期:" + - // JSON.stringify(getAccountMonth) + - // "当前日期:" + - // JSON.stringify(currentMonth) - // ); - // if (getAccountMonth < currentMonth) { - // myalert = "过账日期小于当前月份"; - - // this.$confirm("是否确认" + myalert + "?", "提示", { - // confirmButtonText: "确定", - // cancelButtonText: "取消", - // type: "warning", - // }) - // .then(() => { - // this.$axios - // .posts( - // "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "操作成功", - // type: "success", - // duration: 2000, - // }); - // this.accountDatelist.accountDate = ""; - // this.dialogFormVisible = false; - // this.getList(); - // this.formLoading = false; - // }) - // .catch(() => { - // this.formLoading = false; - // this.$message({ - // type: "info", - // message: "调用服务出错！", - // }); - // }); - // }) - // .catch(() => { - // this.$message({ - // type: "info", - // message: "已取消操作", - // }); - // this.formLoading = false; - // }); - // } else if (getAccountMonth === currentMonth) { - // this.$axios - // .posts( - // "/api/settleaccount/wmskanbanoutput/WmsKanbanOutPut-Cancel", - // this.listOutPutQuery - // ) - // .then((response) => { - // const index = this.list.indexOf(row); - // this.$notify({ - // title: "成功", - // message: "操作成功", - // type: "success", - // duration: 2000, - // }); - // this.accountDatelist.accountDate = ""; - // this.dialogFormVisible = false; - // this.getList(); - // this.formLoading = false; - // }) - // .catch(() => { - // this.formLoading = false; - // this.$message({ - // type: "info", - // message: "调用服务出错！", - // }); - // }); - // } else { - // this.$message({ - // type: "warning", - // message: "选择的过账日期不能大于当前月份！", - // }); - // this.formLoading = false; - // return; - // } - // }, //删除出库单 handleDelete(row) { diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index a8df08ae..17758846 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -571,6 +571,14 @@ export default { }, //创建出库单 handleCreateBills(row) { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index ba629de1..e499250c 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -539,6 +539,14 @@ export default { //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); diff --git a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue index 358aec5f..aa1b9a07 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder90/detail.vue @@ -448,6 +448,14 @@ export default { //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue index f6f50bbf..d53daee8 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -609,6 +609,14 @@ export default { //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); @@ -934,7 +942,7 @@ export default { duration: 2000, }); //this.getList(); - this.$emit("Change", "删除成功"); + this.$emit("Change", "删除成功"); }); }) .catch(() => { @@ -1020,6 +1028,17 @@ export default { this.listOutPutQuery.version = this.customerInfo.version; this.listOutPutQuery.billNum = this.customerInfo.parentId; + //版本下拉选择20220921 + this.listOutPutQuery.Filters = []; + var column = "state"; + let filter = { + logic: 0, + column: column, + action: 0, + value: this.selectJobVersionValue, + }; + this.listOutPutQuery.Filters.push(filter); + console.log( "大众准时化出库单导出：" + JSON.stringify(this.listOutPutQuery) ); diff --git a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue index de8eadb8..046602fb 100644 --- a/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue +++ b/vue/src/views/ux/billManage/wmsCusomerKanban/detail.vue @@ -452,6 +452,14 @@ export default { }, //弹出出库单界面 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); diff --git a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue index 6a8e3d64..1519fccd 100644 --- a/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue +++ b/vue/src/views/ux/vw/dataInput/OnetimeSale/detail.vue @@ -551,6 +551,14 @@ export default { }, //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); 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 501d31ce..c4865624 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 @@ -622,6 +622,14 @@ export default { //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields(); diff --git a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue index fd7aff58..19e492d6 100644 --- a/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue +++ b/vue/src/views/ux/vw/dataInput/hq_kb_output/detail.vue @@ -554,6 +554,14 @@ export default { }, //确认出库单 handleCreateBills() { + var getdata = JSON.stringify(this.list); + if (getdata == "[]") { + this.$message({ + type: "info", + message: "当前列表为空,不能执行出库操作！", + }); + return; + } this.dialogFormVisible = true; if (this.$refs["accountDatelist"] !== undefined) { this.$refs["accountDatelist"].resetFields();