From 2c77cf41d17e59ae01493562fe1206c66c5e56a5 Mon Sep 17 00:00:00 2001 From: "xunyu.guo" <916759660@qq.com> Date: Wed, 12 Jan 2022 10:25:33 +0800 Subject: [PATCH 1/2] 1 --- .../ux/billManage/kanbanOutOrder/detail.vue | 146 ++++++++---------- .../billManage/kanbanWithOutOrder/detail.vue | 146 ++++++++---------- .../billManage/sparepartOutOrder/detail.vue | 146 ++++++++---------- .../ux/vw/dataInput/hq_f_outorder/detail.vue | 1 + .../hq_f_outorder_chickout/detail.vue | 3 +- .../ux/vw/dataInput/hq_h_checkout/detail.vue | 1 + .../ux/vw/dataInput/hq_h_outorder/detail.vue | 1 + .../ux/vw/dataInput/hq_m_checkout/detail.vue | 1 + .../ux/vw/dataInput/hq_m_outorder/detail.vue | 1 + .../ux/vw/dataInput/hq_y_outorder/detail.vue | 1 + 10 files changed, 209 insertions(+), 238 deletions(-) diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue index 571affd4..06355f2a 100644 --- a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -21,7 +21,7 @@ type="success" icon="el-icon-check" size="mini" - @click="handleCreateBills()" + @click="print()" >确认出库单(支持批量) +
+ + + + + + + + +
+ 取消 + 确认 +
+ +
@@ -177,10 +216,14 @@ export default { billNum: "", }, listOutPutQuery: { + accountDate:"", version: "", guids: "", billNum: "", }, + accountDatelist:{ + accountDate:"" + }, page: 1, JobversionValue: "", JobversionValueVerson: "", @@ -315,99 +358,44 @@ export default { }); }); }, + print() { + this.dialogFormVisible = true; + }, //出库单 handleCreateBills(row) { - if (this.multipleSelection.length == 0) { + 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.$confirm("是否全部确认出库?", "提示", { - 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.getList(); - this.listLoading = false; - }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", + + 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.getList(); this.listLoading = false; - }); - } else { - this.listLoading = true; - 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 = "选中项"; - } - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.guids = params; - this.listOutPutQuery.billNum = this.customerInfo.parentId; - console.log( - "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery) - ); - 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.getList(); - this.listLoading = false; - }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", - }); this.listLoading = false; }); - } + }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 571affd4..70888ee7 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -21,7 +21,7 @@ type="success" icon="el-icon-check" size="mini" - @click="handleCreateBills()" + @click="print()" >确认出库单(支持批量) +
+ + + + + + + + +
+ 取消 + 确认 +
+ +
@@ -180,6 +219,7 @@ export default { version: "", guids: "", billNum: "", + accountDate:"" }, page: 1, JobversionValue: "", @@ -191,6 +231,9 @@ export default { showExcelImport: false, tableHeight: document.documentElement.clientHeight - 230, isEdit: false, + accountDatelist:{ + accountDate:"" + } }; }, mounted() { @@ -315,99 +358,44 @@ export default { }); }); }, + print() { + this.dialogFormVisible = true; + }, //出库单 handleCreateBills(row) { - if (this.multipleSelection.length == 0) { + 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.$confirm("是否全部确认出库?", "提示", { - 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.getList(); - this.listLoading = false; - }); - }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", + + 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.getList(); this.listLoading = false; - }); - } else { - this.listLoading = true; - 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 = "选中项"; - } - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.guids = params; - this.listOutPutQuery.billNum = this.customerInfo.parentId; - console.log( - "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery) - ); - 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.getList(); - this.listLoading = false; - }); }) .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", - }); this.listLoading = false; }); - } + }, /** 刷新列表 */ handleHandle(data) { diff --git a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue index 2fe0925e..83ffd680 100644 --- a/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/sparepartOutOrder/detail.vue @@ -29,7 +29,7 @@ size="mini" type="warning" icon="el-icon-download" - @click="handleCancelBills()" + @click="print()" >取消出库(支持批量) +
+ + + + + + + + +
+ 取消 + 确认 +
+ +
@@ -180,6 +219,7 @@ export default { version: "", guids: "", billNum: "", + accountDate:"" }, page: 1, JobversionValue: "", @@ -191,6 +231,9 @@ export default { showExcelImport: false, tableHeight: document.documentElement.clientHeight - 230, isEdit: false, + accountDatelist:{ + accountDate:"" + } }; }, mounted() { @@ -315,99 +358,44 @@ export default { }); }); }, + print() { + this.dialogFormVisible = true; + }, //出库单 handleCreateBills(row) { - if (this.multipleSelection.length == 0) { + 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.$confirm("是否全部确认出库?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$axios - .posts( - "/api/settleaccount/wmsSharePartoutput/WmsSharePartOutPut-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.$message({ - type: "info", - message: "已取消操作", + + 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; - }); - } else { - this.listLoading = true; - 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 = "选中项"; - } - this.listOutPutQuery.version = this.customerInfo.version; - this.listOutPutQuery.guids = params; - this.listOutPutQuery.billNum = this.customerInfo.parentId; - console.log( - "部分选择时确认出库条件：" + JSON.stringify(this.listOutPutQuery) - ); - this.$confirm("是否确认将选中的出库" + myalert + "?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.$axios - .posts( - "/api/settleaccount/wmsjitoutput/WmsJitOutPut-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.$message({ - type: "info", - message: "已取消操作", - }); this.listLoading = false; }); - } + }, /** 刷新列表 */ handleHandle(data) { 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 8fed5bf5..d555926f 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 @@ -289,6 +289,7 @@ export default { tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 53f47f1a..054cf064 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 @@ -171,7 +171,7 @@ export default { rules: { //前端定义的规则，后端也有验证 erpMaterialCode: [ - { required: true, message: "必须输入！", trigger: "blur" }, + { required: true, message: "必须输入！", trigger: "change" }, ], }, searchContent: "", // 输入内容 @@ -290,6 +290,7 @@ export default { //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 927636ae..8802027b 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 @@ -289,6 +289,7 @@ export default { //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 74eec35b..4362097a 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 @@ -295,6 +295,7 @@ export default { tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 66884b5f..66475341 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 @@ -290,6 +290,7 @@ export default { //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 feef263d..416f60c7 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 @@ -289,6 +289,7 @@ export default { tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, 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 98254e74..90998943 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 @@ -291,6 +291,7 @@ export default { tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 }); tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 }); tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, From cb1ecbd48d5902f6cc0ac71608d733af76af3ff2 Mon Sep 17 00:00:00 2001 From: "xunyu.guo" <916759660@qq.com> Date: Wed, 12 Jan 2022 10:29:59 +0800 Subject: [PATCH 2/2] 1 --- vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue index 70888ee7..96f47915 100644 --- a/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/kanbanWithOutOrder/detail.vue @@ -119,6 +119,7 @@ size="small" label-width="120px" > +