From f399d23c94ac1828f3ad2697732e1311ec615737 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Fri, 24 Dec 2021 13:07:34 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedate/m100Online/RepetitionMB.vue | 28 +++++++++++++++++-- .../basedate/m100Online/RepetitionZHB.vue | 26 +++++++++++++++-- .../pg-fis/basedate/m100Online/ScrapMB.vue | 26 +++++++++++++++-- .../pg-fis/basedate/m100Online/ScrapZHB.vue | 21 ++++++++++++-- .../basedate/m100Online/normalPritIndex.vue | 12 ++++---- 5 files changed, 99 insertions(+), 14 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue index cb254ea2..b17f9a03 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -387,6 +387,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -424,8 +426,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -524,8 +531,25 @@ export default { this.listQuery ) .then((response) => { + + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; + setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue index 2a6856c1..83226746 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue @@ -342,6 +342,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -379,8 +381,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -480,6 +487,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 3f2b7d7b..445fd29f 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -361,6 +361,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -398,8 +400,13 @@ export default { }); tempsTabs.push({ - label: "底盘号", - prop: "Vin", + label: "起始底盘号", + prop: "beginVin", + width: 160, + }); + tempsTabs.push({ + label: "结束底盘号", + prop: "endVin", width: 160, }); return tempsTabs; @@ -499,6 +506,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index e84caa89..02335f75 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -373,6 +373,8 @@ export default { var tempsTabs = []; tempsTabs.push({ label: "装箱单号", prop: "billNum", width: 140 }); tempsTabs.push({ label: "单据顺号", prop: "billSerialNum", width: 120 }); + tempsTabs.push({ label: "起始顺序号", prop: "beginHostSN", width: 120 }); + tempsTabs.push({ label: "结束顺序号", prop: "endHostSN", width: 120 }); tempsTabs.push({ label: "左或右", prop: "billLocation", @@ -410,12 +412,12 @@ export default { }); tempsTabs.push({ - label: "起底盘号", + label: "起始底盘号", prop: "beginVin", width: 160, }); tempsTabs.push({ - label: "止底盘号", + label: "结束底盘号", prop: "endVin", width: 160, }); @@ -515,6 +517,21 @@ export default { this.listQuery ) .then((response) => { + response.items.forEach((item)=>{ + if(item.printType == 0) + { + item.printType = "正常打印"; + } + else if(item.printType == 1) + { + item.printType = "重打"; + } + else + { + item.printType = "补打"; + } + + }); this.list = response.items; this.totalCount = response.totalCount; setTimeout(() => { diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 336bc746..3912ce51 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -546,7 +546,7 @@ export default { dialogFormVisible: false, formTitle: "", isEdit: false, - formLoading: false, + formLoading: false, //关闭窗口 tableHeight: document.documentElement.clientHeight - 335, detailTableHeight: 250, details: [], //修改子表数据源 @@ -1277,7 +1277,7 @@ export default { this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); if (this.listQuery.productType === 1) { - //门板-打印 + //柱护板-打印 this.hostCheckQuery.beginHostSN = parseInt(this.form.beginHostSN); this.hostCheckQuery.endHostSN = parseInt(this.form.endHostSN); this.hostCheckQuery.productLine = this.listQuery.productLine; @@ -1467,7 +1467,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1514,7 +1514,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -1973,7 +1973,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { @@ -2012,7 +2012,7 @@ export default { console.log(this.fileQuery.dataname); this.$axios .posts( - "/Handlers/Handler1.ashx?report=menban", + "/Handlers/Handler1.ashx?report=zhuhuban", qs.stringify(this.fileQuery) ) .then((response) => { From d0d1863e4eb23ffa4a743f73d08e6ad9a445dc46 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Fri, 24 Dec 2021 15:14:06 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/ImportTxt/index.vue | 46 ++-- .../pg-fis/basedate/m100Online/ScrapMB.vue | 209 +++++++++++++----- .../pg-fis/basedate/m100Online/ScrapZHB.vue | 194 ++++++++++++---- 3 files changed, 332 insertions(+), 117 deletions(-) diff --git a/vue/src/components/ImportTxt/index.vue b/vue/src/components/ImportTxt/index.vue index 6392dce9..8a2b1e7d 100644 --- a/vue/src/components/ImportTxt/index.vue +++ b/vue/src/components/ImportTxt/index.vue @@ -151,13 +151,13 @@ {{ this.resultData.successMessage }} - 下载错误数据 + > -->

@@ -427,7 +427,7 @@ export default { this.factoryList = []; // this.listQuery.SkipCount = (this.page - 1) * 500; this.$axios - .posts("/api/settleaccount/CentralizedControl/openlist") + .posts("/api/newjit/assembly-cfg-erp/import") .then((response) => { response.forEach((element) => { let options = {}; @@ -440,25 +440,25 @@ export default { this.listLoading = false; }); }, - getAllCarModel() { - //取车型列表信息 - this.carModelList = []; - this.listQueryCustom.SkipCount = (this.page - 1) * 500; - console.log(JSON.stringify(this.listQueryCustom)); - this.$axios - .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom) - .then((response) => { - response.items.forEach((element) => { - let options = {}; - options.value = element.value; - options.label = element.description; - this.carModelList.push(options); - }); - }) - .catch(() => { - this.listLoading = false; - }); - }, + // getAllCarModel() { + // //取车型列表信息 + // this.carModelList = []; + // this.listQueryCustom.SkipCount = (this.page - 1) * 500; + // console.log(JSON.stringify(this.listQueryCustom)); + // this.$axios + // .posts("/api/settleaccount/CodeSetting/list", this.listQueryCustom) + // .then((response) => { + // response.items.forEach((element) => { + // let options = {}; + // options.value = element.value; + // options.label = element.description; + // this.carModelList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); + // }, handleImportExcelClick() { //父组件中，初始化此子组件时调用 this.fileuploadList = []; @@ -602,7 +602,7 @@ export default { this.stepList[0].status = "wait"; this.resultData.errTemplate = res; //指定错误模板名称，作为参数，用于错误模板下载 this.resultData.errSize = 1; //保持大于0，用于控制错误数据下载按钮的可不可见 - this.resultData.successMessage = "数据导入失败！"; + this.resultData.successMessage = res.message; this.stepsActive = 3; } } diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 445fd29f..9d67cedc 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -99,7 +99,7 @@ type="danger" icon="el-icon-delete" size="mini" - @click="handleDelete()" + @click="print()" >作废(支持批量) @@ -195,6 +195,57 @@ /> +
+ + + + + + + + + + +
+ 取消 + 确 认 +
+ +
@@ -243,6 +294,7 @@ export default { }; return { crmType: "M100Online-MB", + dialogTableVisible: false, getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, @@ -506,20 +558,14 @@ export default { this.listQuery ) .then((response) => { - response.items.forEach((item)=>{ - if(item.printType == 0) - { + response.items.forEach((item) => { + if (item.printType == 0) { item.printType = "正常打印"; - } - else if(item.printType == 1) - { + } else if (item.printType == 1) { item.printType = "重打"; - } - else - { + } else { item.printType = "补打"; } - }); this.list = response.items; this.totalCount = response.totalCount; @@ -581,25 +627,21 @@ export default { .catch(() => {}); } }, - //作废操作，支持批量操作-门板 - handleDelete(row) { - //批量删除 + print(row) { var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - let myalertcount = []; if (row) { //单行 params.push(row.id); - myalert = row.name; } else { //多选 this.multipleSelection.forEach((element) => { let id = element.id; params.push(id); }); - myalert = "选中项"; } - console.log("作废查询参数：" + JSON.stringify(params)); + this.zuofei = params; + + this.dialogTableVisible = true; this.$axios .posts("/api/newjit/MenBanPackingList/get-all-del-List", params) .then((response) => { @@ -613,46 +655,111 @@ export default { return; } else { this.fileQuery.dataname = JSON.stringify(response); - response.forEach((itemsss) => { - myalertcount.push(itemsss.billNum); - }); + this.zflist = response; console.log( "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + JSON.stringify(this.fileQuery.dataname) ); - this.$confirm( - "是否作废选中的" + response.length + "条记录?", - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(() => { - this.$axios - .posts("/api/newjit/MenBanPackingList/scrap", 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: "已取消操作", - }); - }); } }) .catch(() => {}); }, + + //作废详情页确认按钮 + handleDelete() { + //debugger; + let params = this.zuofei; + + this.$axios + .posts("/api/newjit/MenBanPackingList/scrap", params) + .then((response) => { + console.log( + "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + JSON.stringify(response) + ); + this.$notify({ + title: "成功", + message: "作废成功", + type: "success", + duration: 2000, + }); + }); + this.dialogTableVisible = false; + this.getList(); + }, + + //作废操作，支持批量操作-门板 + // handleDelete(row) { + // //批量删除 + // var params = []; + // let myalert = ""; //声明变量，其变量必须在此声明后使用 + // let myalertcount = []; + // if (row) { + // //单行 + // params.push(row.id); + // myalert = row.name; + // } else { + // //多选 + // this.multipleSelection.forEach((element) => { + // let id = element.id; + // params.push(id); + // }); + // myalert = "选中项"; + // } + // console.log("作废查询参数：" + JSON.stringify(params)); + // this.$axios + // .posts("/api/newjit/MenBanPackingList/get-all-del-List", params) + // .then((response) => { + // //alert(response.status); + // const index = this.list.indexOf(row); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // this.fileQuery.dataname = JSON.stringify(response); + // response.forEach((itemsss) => { + // myalertcount.push(itemsss.billNum); + // }); + // console.log( + // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + // JSON.stringify(this.fileQuery.dataname) + // ); + // this.$confirm( + // "是否作废选中的" + response.length + "条记录?", + // "提示", + // { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // } + // ) + // .then(() => { + // this.$axios + // .posts("/api/newjit/MenBanPackingList/scrap", 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: "已取消操作", + // }); + // }); + // } + // }) + // .catch(() => {}); + // }, fetchData(id) { //循环动态 this.$axios diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index 02335f75..b9c1b721 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -124,7 +124,7 @@ type="danger" icon="el-icon-delete" size="mini" - @click="handleDelete()" + @click="print()" >作废(支持批量) @@ -200,6 +200,53 @@ /> +
+ + + + + + + + + + +
+ 取消 + 确 认 +
+ +
@@ -248,6 +295,7 @@ export default { }; return { crmType: "M100Online-MB", + dialogTableVisible :false, getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, @@ -594,25 +642,21 @@ export default { .catch(() => {}); } }, - //作废操作，支持批量操作-门板 - handleDelete(row) { - //批量删除 - var params = []; - let myalert = ""; //声明变量，其变量必须在此声明后使用 - let myalertcount = []; + print(row) { + var params = []; if (row) { //单行 params.push(row.id); - myalert = row.name; } else { //多选 this.multipleSelection.forEach((element) => { let id = element.id; params.push(id); }); - myalert = "选中项"; } - console.log("作废查询参数：" + JSON.stringify(params)); + this.zuofei = params; + + this.dialogTableVisible = true; this.$axios .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params) .then((response) => { @@ -626,46 +670,110 @@ export default { return; } else { this.fileQuery.dataname = JSON.stringify(response); - response.forEach((itemsss) => { - myalertcount.push(itemsss.billNum); - }); + this.zflist = response; console.log( - "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + "柱护板-调用Handlers/Handler1.ashx?report=menban传的值：" + JSON.stringify(this.fileQuery.dataname) ); - this.$confirm( - "是否作废选中的" + response.length + "条记录?", - "提示", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - } - ) - .then(() => { - this.$axios - .posts("/api/newjit/ZhuHuBanPackingList/scrap", 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: "已取消操作", - }); - }); } }) .catch(() => {}); }, + //作废详情页确认按钮 + handleDelete() { + //debugger; + let params = this.zuofei; + + this.$axios + .posts("/api/newjit/ZhuHuBanPackingList/scrap", params) + .then((response) => { + console.log( + "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + JSON.stringify(response) + ); + this.$notify({ + title: "成功", + message: "作废成功", + type: "success", + duration: 2000, + }); + + }); + this.dialogTableVisible = false; + this.getList(); + }, + //作废操作，支持批量操作-门板 + // handleDelete(row) { + // //批量删除 + // var params = []; + // let myalert = ""; //声明变量，其变量必须在此声明后使用 + // let myalertcount = []; + // if (row) { + // //单行 + // params.push(row.id); + // myalert = row.name; + // } else { + // //多选 + // this.multipleSelection.forEach((element) => { + // let id = element.id; + // params.push(id); + // }); + // myalert = "选中项"; + // } + // console.log("作废查询参数：" + JSON.stringify(params)); + // this.$axios + // .posts("/api/newjit/ZhuHuBanPackingList/get-all-del-List", params) + // .then((response) => { + // //alert(response.status); + // const index = this.list.indexOf(row); + // if (response.status === false) { + // this.$message({ + // message: response.message, + // type: "error", + // }); + // return; + // } else { + // this.fileQuery.dataname = JSON.stringify(response); + // response.forEach((itemsss) => { + // myalertcount.push(itemsss.billNum); + // }); + // console.log( + // "门板-调用Handlers/Handler1.ashx?report=menban传的值：" + + // JSON.stringify(this.fileQuery.dataname) + // ); + // this.$confirm( + // "是否作废选中的" + response.length + "条记录?", + // "提示", + // { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning", + // } + // ) + // .then(() => { + // this.$axios + // .posts("/api/newjit/ZhuHuBanPackingList/scrap", 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: "已取消操作", + // }); + // }); + // } + // }) + // .catch(() => {}); + // }, fetchData(id) { //循环动态 this.$axios From 519e09ba204f51a258cf0e717ee0e70a61c4f60f Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Fri, 24 Dec 2021 16:08:25 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue | 2 ++ vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue | 1 + 2 files changed, 3 insertions(+) diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index 9d67cedc..ecdff526 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -295,6 +295,8 @@ export default { return { crmType: "M100Online-MB", dialogTableVisible: false, + zflist: null, + zuofei: [], getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index b9c1b721..6d80af76 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -296,6 +296,7 @@ export default { return { crmType: "M100Online-MB", dialogTableVisible :false, + zflist:null, getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, From 3a867f0a39f160f094fead2f2e062ae704072c51 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Fri, 24 Dec 2021 16:32:14 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/pg-fis/basedate/select/index.vue | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue index ab0dd54d..eb065065 100644 --- a/vue/src/views/pg-fis/basedate/select/index.vue +++ b/vue/src/views/pg-fis/basedate/select/index.vue @@ -9,6 +9,40 @@ v-show="showSearch" :inline="true" > + + + + + + + + + + Date: Sat, 25 Dec 2021 08:05:50 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pg-fis/basedate/m100Online/ScrapMB.vue | 5 ++- .../pg-fis/basedate/m100Online/ScrapZHB.vue | 34 +++++++++---------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue index ecdff526..d300b26a 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue @@ -297,7 +297,10 @@ export default { dialogTableVisible: false, zflist: null, zuofei: [], - getRowKeys: (row) => { + getRowKeys: + + + (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, expands: [], //只展开一行放入当前行id diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue index 6d80af76..4256dae6 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue @@ -201,7 +201,11 @@
- +
- 取消 确 认 @@ -295,8 +299,9 @@ export default { }; return { crmType: "M100Online-MB", - dialogTableVisible :false, - zflist:null, + dialogTableVisible: false, + zuofei: [], + zflist: null, getRowKeys: (row) => { return row.id; //这里看这一行中需要根据哪个属性值是id }, @@ -566,20 +571,14 @@ export default { this.listQuery ) .then((response) => { - response.items.forEach((item)=>{ - if(item.printType == 0) - { + response.items.forEach((item) => { + if (item.printType == 0) { item.printType = "正常打印"; - } - else if(item.printType == 1) - { + } else if (item.printType == 1) { item.printType = "重打"; - } - else - { + } else { item.printType = "补打"; } - }); this.list = response.items; this.totalCount = response.totalCount; @@ -680,7 +679,7 @@ export default { }) .catch(() => {}); }, - //作废详情页确认按钮 + //作废详情页确认按钮 handleDelete() { //debugger; let params = this.zuofei; @@ -698,10 +697,9 @@ export default { type: "success", duration: 2000, }); - }); - this.dialogTableVisible = false; - this.getList(); + this.dialogTableVisible = false; + this.getList(); }, //作废操作，支持批量操作-门板 // handleDelete(row) { From 7bd302d973b061d278997964b0d7172181eae0a8 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 28 Dec 2021 13:42:25 +0800 Subject: [PATCH 06/13] =?UTF-8?q?1228=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E7=9A=84=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=8F=8A=E5=87=BA=E5=BA=93=E5=8D=95=E7=AE=A1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/components/ImportExcel-base/index.vue | 3 +- vue/src/router/index.js | 20 +- vue/src/router/modules/bt_menu.js | 44 ++ vue/src/router/modules/hq_menu.js | 125 ++++ vue/src/router/modules/vwFisData.js | 10 + vue/src/router/modules/vw_menu.js | 171 +++++ vue/src/router/modules/vw_out_order.js | 54 ++ .../pg-fis/basedate/m100Online/index.vue | 2 +- vue/src/views/ux/basedata/index.vue | 7 + .../InvoiceSettledDetailDiff/index.vue | 2 +- vue/src/views/ux/billManage/index.vue | 7 + .../ux/billManage/kanbanOutOrder/detail.vue | 541 ++++++++++++++++ .../ux/billManage/kanbanOutOrder/index.vue | 317 ++++++++++ .../views/ux/billManage/vwOutOrder/detail.vue | 540 ++++++++++++++++ .../views/ux/billManage/vwOutOrder/index.vue | 317 ++++++++++ vue/src/views/ux/vw/dataInput/hq_bt/index.vue | 594 ++++++++++++++++++ vue/src/views/ux/vw/dataInput/hq_f/index.vue | 594 ++++++++++++++++++ vue/src/views/ux/vw/dataInput/hq_h/index.vue | 4 +- vue/src/views/ux/vw/dataInput/hq_m/index.vue | 594 ++++++++++++++++++ vue/static/tableFieldForSearch.json | 155 +++++ 20 files changed, 4090 insertions(+), 11 deletions(-) create mode 100644 vue/src/router/modules/bt_menu.js create mode 100644 vue/src/router/modules/hq_menu.js create mode 100644 vue/src/router/modules/vw_menu.js create mode 100644 vue/src/router/modules/vw_out_order.js create mode 100644 vue/src/views/ux/basedata/index.vue create mode 100644 vue/src/views/ux/billManage/index.vue create mode 100644 vue/src/views/ux/billManage/kanbanOutOrder/detail.vue create mode 100644 vue/src/views/ux/billManage/kanbanOutOrder/index.vue create mode 100644 vue/src/views/ux/billManage/vwOutOrder/detail.vue create mode 100644 vue/src/views/ux/billManage/vwOutOrder/index.vue create mode 100644 vue/src/views/ux/vw/dataInput/hq_bt/index.vue create mode 100644 vue/src/views/ux/vw/dataInput/hq_f/index.vue create mode 100644 vue/src/views/ux/vw/dataInput/hq_m/index.vue diff --git a/vue/src/components/ImportExcel-base/index.vue b/vue/src/components/ImportExcel-base/index.vue index fb7631b0..f8468ed3 100644 --- a/vue/src/components/ImportExcel-base/index.vue +++ b/vue/src/components/ImportExcel-base/index.vue @@ -302,6 +302,7 @@ export default { scrapClaims: "CP7报废和索赔", sparePart: "大众备件结算明细", hqHPlatform: "红旗H平台导入", + hqMPlatform: "红旗M平台导入", bomdatabase: "产品结构BOM", prebatch: "预批量", secondaryPriceRatio: "二配结算价格比例", @@ -328,7 +329,7 @@ export default { scrapClaims: "/api/settleaccount/ScrapClaims/ExcelImport", //CP7报废和索赔导入 sparePart: "/api/settleaccount/SparePart/ExcelImport", //大众备件结算明细导入 hqHPlatform: "/api/settleaccount/HQHPlatform/ExcelImport", //红旗H平台导入 - + hqMPlatform: "/api/settleaccount/HQMPlatform/ExcelImport", //红旗M平台导入 bomdatabase: "/api/settleaccount/bom/ExcelImport", prebatch: "/api/settleaccount/Prebatch/ExcelImport", secondaryPriceRatio: diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 4f0f543f..a1bc2d5a 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -16,6 +16,10 @@ import vwFisDataRouter from './modules/vwFisData' import wheeldataRouter from './modules/wheeldata' import vwNoBarcodeRouter from './modules/vwKBNoBarcodedata' import JobTimeDataRouter from './modules/jobtimedata' +import vwMenudataRouter from './modules/vw_menu' +import hqMenudataRouter from './modules/hq_menu' +import btcarDataRouter from './modules/bt_menu' +import vwOutOrderDataRouter from './modules/vw_out_order' //import newjitRouter from './modules/newjit-basedata' import pgfis from './modules/fis' import pgfisPrint from './modules/fisprint' @@ -86,8 +90,8 @@ export const constantRoutes = [ children: [ { path: 'dashboard', - component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis - //component: () => import('@/views/ux/backGroundWork'), + //component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),//fis + component: () => import('@/views/ux/backGroundWork'), name: 'Dashboard', meta: { title: '系统首页', @@ -170,14 +174,18 @@ export const asyncRoutes = [ /** when your routing map is too long, you can split it into small modules **/ managerRouter,//系统首页 personRouter,//系统管理 - //basedataRouter,//基础数据维护 + basedataRouter,//基础数据维护 + vwMenudataRouter,//大众 + hqMenudataRouter,//红旗 + vwOutOrderDataRouter, + //btcarDataRouter,//一汽轿车 //vwFisDataRouter,//结算与开票数据导入 //billdataRouter,//销售结算与开票报表 //businessdataRouter, //wheeldataRouter,//大众看板和备件 - pgfisPrint,//排序单打印 - pgfis,//派格fis - //JobTimeDataRouter,//后台作业监控 + // pgfisPrint,//排序单打印 + // pgfis,//派格fis + JobTimeDataRouter,//后台作业监控 // 404 page must be placed at the end !!! { path: '*', redirect: '/404', hidden: true } diff --git a/vue/src/router/modules/bt_menu.js b/vue/src/router/modules/bt_menu.js new file mode 100644 index 00000000..b20b3408 --- /dev/null +++ b/vue/src/router/modules/bt_menu.js @@ -0,0 +1,44 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const btcarDataRouter = { + path: '/cpat', + component: Layout, + redirect: 'pg', + name: 'btcar', + //hidden: true, + meta: { + //requiresAuth: true, + title: '一轿奔腾', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'hq-car-platform', + component: () => import('@/views/ux/vw/dataInput/hq_bt'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-car-platform-export', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '一轿奔腾结算核对输出', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + ] +} + +export default btcarDataRouter + diff --git a/vue/src/router/modules/hq_menu.js b/vue/src/router/modules/hq_menu.js new file mode 100644 index 00000000..be030aad --- /dev/null +++ b/vue/src/router/modules/hq_menu.js @@ -0,0 +1,125 @@ + +import Layout from '@/layout' + +const hqMenudataRouter = { + path: '/capt-hq', + component: Layout, + redirect: 'ux/vw/dataInput/hq_h', + name: 'HQData', + meta: { + title: '红旗工厂', + icon: '红旗', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-h-data', + name: 'import-h-data',//命名路由-二级 + component: () => import('@/views/ux/vw/dataInput/hq_h'), + redirect: 'ux/vw/dataInput/hq_h', + meta: { + title: 'H平台', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'hq-H-platform', + component: () => import('@/views/ux/vw/dataInput/hq_h'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗H平台导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'hq-H-platform-export', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'H平台结算差异输出', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + } + ] + }, + { + path: '/export-m-data', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'export-m-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_m', + meta: { + title: 'M平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + { + path: 'hq-M-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'H平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '二配' + } + } + ] + }, + { + path: '/export-f-data', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'export-f-data',//命名路由 + redirect: '/ux/vw/dataInput/hq_f', + meta: { + title: 'F平台', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: 'hq-F-platform', + component: () => import('@/views/ux/vw/dataInput/hq_f'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗F平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + + { + path: 'hq-F-platform-export', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: 'F平台结算差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '二配' + } + } + ] + } + ] +} + +export default hqMenudataRouter + + + + + diff --git a/vue/src/router/modules/vwFisData.js b/vue/src/router/modules/vwFisData.js index 6b4da0d5..e52fc1d1 100644 --- a/vue/src/router/modules/vwFisData.js +++ b/vue/src/router/modules/vwFisData.js @@ -88,6 +88,16 @@ const vwFisDataRouter = { icon: '结算' } }, + { + path: 'hq-M-platform', + component: () => import('@/views/ux/vw/dataInput/hq_m'), + name: 'ERPEI',//命名路由 + meta: { + title: '红旗M平台导入', + //roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, ] } diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js new file mode 100644 index 00000000..2ec6da00 --- /dev/null +++ b/vue/src/router/modules/vw_menu.js @@ -0,0 +1,171 @@ + +import Layout from '@/layout' + +const vwMenudataRouter = { + path: '/capt-vw', + component: Layout, + redirect: 'ux/basedata/Invoice/index', + name: 'HQData', + meta: { + title: '大众工厂', + icon: 'vw', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns', 'SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + keepAlive: false, + }, + children: [ + { + path: '/import-data', + name: 'import-data',//命名路由-二级 + component: () => import('@/views/ux/billManage/index'), + redirect: 'ux/basedata/Invoice/index', + meta: { + title: '数据导入', + // roles: ['SettleAccount.HQKBs', 'SettleAccount.HQSpecKBs'], + icon: '看板' + }, + children: [ + { + path: 'invoice', + component: () => import('@/views/ux/basedata/Invoice/index'), + name: 'Invoices', + meta: { + title: '发票汇总', + roles: ['SettleAccount.Invoices'], + icon: '对比' + } + }, + { + path: 'settle-account-finish', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS结算明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'unsettle-account', + component: () => import('@/views/ux/vw/dataInput/r3'), + name: 'SettleAccount', + meta: { + title: 'FIS未结明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'kan-ban', + component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), + name: 'VWKanBan',//命名路由 + meta: { + title: '大众看板结算明细', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '发运' + } + }, + { + path: 'spare-part', + component: () => import('@/views/ux/vw/dataInput/SparePart'), + name: 'SparePart',//命名路由 + meta: { + title: '大众备件结算明细导入', + roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'scrap-claims', + component: () => import('@/views/ux/vw/dataInput/ScrapClaims'), + name: 'ScrapClaims', + meta: { + title: 'CP7报废和索赔导入', + roles: ['SettleAccount.FISs'], + icon: '文件' + } + }, + ] + }, + { + path: '/export-data', + component: () => import('@/views/ux/billManage/index'), + name: 'export-data',//命名路由 + redirect: 'export-data', + meta: { + title: '数据输出', + //roles: ['SettleAccount.HQConsigns', 'SettleAccount.HQSpecConsigns'], + icon: '结算' + }, + children: [ + { + path: '/invoice-settled/diff', + component: () => import('@/views/ux/billManage/InvoiceSettledDiff'), + name: 'InvoiceSettledDiff',//命名路由 + meta: { + title: '发票与结算核对汇总', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '结算对比' + } + }, + { + path: '/invoice-settled/detaildiff', + component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'), + name: 'InvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化结算核对明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '结算对比' + } + }, + { + path: '/unInvoice-settled/detailDiff', + component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), + name: 'UnInvoiceSettledDetailDiff',//命名路由 + meta: { + title: '准时化量差输出', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '售后' + } + }, + { + path: '/unsettle-diff/export', + component: () => import('@/views/ux/billManage/UnSettleDiffExport'), + name: 'UnSettleDiffExport',//命名路由 + meta: { + title: '准时化未结差异比对输出', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '售后' + } + }, + { + path: '/kbwithcode', + component: () => import('@/views/ux/billManage/kanBanWithCode'), + name: 'KanBanWithCode',//命名路由 + meta: { + title: '看板结算数量差异输出', + //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） + icon: '对比' + } + }, + + { + path: '/vwsparepart', + component: () => import('@/views/ux/billManage/sparePart'), + name: 'SparePartReport',//命名路由 + meta: { + title: '备件结算数量差异输出', + //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） + icon: '二配' + } + } + ] + } + ] +} + +export default vwMenudataRouter + + + + + diff --git a/vue/src/router/modules/vw_out_order.js b/vue/src/router/modules/vw_out_order.js new file mode 100644 index 00000000..cba355fb --- /dev/null +++ b/vue/src/router/modules/vw_out_order.js @@ -0,0 +1,54 @@ +//大众-FIS结算-路由 +import Layout from '@/layout' + +const vwOutOrderDataRouter = { + path: '/cpat-order', + component: Layout, + redirect: 'pg', + name: '业务数据', + //hidden: true, + meta: { + //requiresAuth: true, + title: '大众出库单管理', + index: 0, + type: 'crm', + icon: '单据导入', + keepAlive: false, + }, + children: [ + { + path: 'vw-out-order', + component: () => import('@/views/ux/billManage/vwOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众准时化出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + { + path: 'kanban-out-order', + component: () => import('@/views/ux/billManage/kanbanOutOrder/index'), + name: 'SettleAccount',//命名路由 + meta: { + title: '大众看板出库单', + roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） + icon: '结算' + } + }, + // { + // path: 'invoice', + // component: () => import('@/views/ux/basedata/Invoice/index'), + // name: 'Invoices',//命名路由 + // meta: { + // title: '大众发票汇总导入', + // roles: ['SettleAccount.Invoices'], + // icon: '对比' + // } + // }, + + ] +} + +export default vwOutOrderDataRouter + diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 41361ed5..4bc19bd0 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -857,7 +857,7 @@ export default { }, getList(data) { this.listLoading = true; - if (data != undefined) {alert() + if (data != undefined) { this.listQuery.SkipCount = (this.page - 1) * data.limit; } else { this.listQuery.SkipCount = (this.page - 1) * 15; diff --git a/vue/src/views/ux/basedata/index.vue b/vue/src/views/ux/basedata/index.vue new file mode 100644 index 00000000..509198d1 --- /dev/null +++ b/vue/src/views/ux/basedata/index.vue @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 93de70ed..7a5ed184 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -17,7 +17,7 @@ type="primary" icon="el-icon-plus" @click="handleCreate" - >统计 + >统计明细 + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue new file mode 100644 index 00000000..c7fdcb9a --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/detail.vue @@ -0,0 +1,541 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/kanbanOutOrder/index.vue b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue new file mode 100644 index 00000000..cd7f23ba --- /dev/null +++ b/vue/src/views/ux/billManage/kanbanOutOrder/index.vue @@ -0,0 +1,317 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue new file mode 100644 index 00000000..41322532 --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -0,0 +1,540 @@ + + + + + + + + diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue new file mode 100644 index 00000000..cd7f23ba --- /dev/null +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -0,0 +1,317 @@ + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_bt/index.vue b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_bt/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_f/index.vue b/vue/src/views/ux/vw/dataInput/hq_f/index.vue new file mode 100644 index 00000000..e5d35866 --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_f/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/src/views/ux/vw/dataInput/hq_h/index.vue b/vue/src/views/ux/vw/dataInput/hq_h/index.vue index b14ebcbe..e5d35866 100644 --- a/vue/src/views/ux/vw/dataInput/hq_h/index.vue +++ b/vue/src/views/ux/vw/dataInput/hq_h/index.vue @@ -243,7 +243,7 @@ export default { formTitle: "", drawer: false, showExcelImport: false, - tableHeight: document.documentElement.clientHeight - 260, + tableHeight: document.documentElement.clientHeight - 220, isEdit: false, }; }, @@ -251,7 +251,7 @@ export default { var self = this; window.onresize = function () { var offsetHei = document.documentElement.clientHeight; - self.tableHeight = offsetHei - 260; + self.tableHeight = offsetHei - 220; }; }, created() { diff --git a/vue/src/views/ux/vw/dataInput/hq_m/index.vue b/vue/src/views/ux/vw/dataInput/hq_m/index.vue new file mode 100644 index 00000000..f4c47c4e --- /dev/null +++ b/vue/src/views/ux/vw/dataInput/hq_m/index.vue @@ -0,0 +1,594 @@ + + + + + + + + + + diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 555b4a5d..f86d9b2e 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2773,5 +2773,160 @@ "setting": [] } ] + }, + "hqHPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "hqMPlatform": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "采购订单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "purchaseOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料代码", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialCode", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "科目号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "accountNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "交货单号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "deliveryOrderNo", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factory", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "工厂名称", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "factoryName", + "setting": [] + } + ] + }, + "vwOutOrder": { + "id": "36", + "data": [ + { + "fieldId": 3, + "formType": "text", + "name": "单据号", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "wmsBillNum", + "setting": [] + }, + { + "fieldId": 5, + "formType": "text", + "name": "物料组", + "type": 1, + "value": "", + "fieldType": 1, + "fieldName": "materialGroup", + "setting": [] + } + ] } } \ No newline at end of file From 63c00ed3c988e5e098c0f303cc7eb9528a3f3395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 28 Dec 2021 14:37:28 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 23 ++++++++++--------- .../billManage/InvoiceSettledDiff/index.vue | 1 - .../UnInvoiceSettledDetailDiff/index.vue | 23 ++++++++++--------- .../billManage/UnSettleDiffExport/index.vue | 23 ++++++++++--------- .../ux/billManage/kanBanWithCode/index.vue | 23 ++++++++++--------- .../views/ux/billManage/sparePart/index.vue | 20 +++++++++------- 6 files changed, 60 insertions(+), 53 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 7a5ed184..f6a08f39 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -393,23 +393,24 @@ - + :key="item.label" + :label="item.value" + :value="item.label" + > + {{ item.label }} + {{ + item.value + }} + @@ -1146,7 +1147,7 @@ export default { response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 736c2e9d..e18bd5e6 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -379,7 +379,6 @@ - diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 7d837232..2c70c9ac 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -385,23 +385,24 @@ - + :key="item.label" + :label="item.value" + :value="item.label" + > + {{ item.label }} + {{ + item.value + }} + @@ -959,7 +960,7 @@ export default { response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index 5fa2d4c3..a6339174 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -386,23 +386,24 @@ - + :key="item.label" + :label="item.value" + :value="item.label" + > + {{ item.label }} + {{ + item.value + }} + @@ -911,7 +912,7 @@ export default { response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 9e0f12b1..6a7beffe 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -393,23 +393,24 @@ - + :key="item.label" + :label="item.value" + :value="item.label" + > + {{ item.label }} + {{ + item.value + }} + @@ -963,7 +964,7 @@ export default { response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description + "/" + element.value; + options.label = element.value; this.materialGroupList.push(options); }); }) diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index a0b13a3c..1a31c7d0 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -393,20 +393,24 @@ - + :key="item.label" + :label="item.value" + :value="item.label" + > + {{ item.label }} + {{ + item.value + }} + From 4ab72126f607ef1e999952c5d6f2011e3cad706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 28 Dec 2021 15:03:52 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 70 +++++++++++++++++-- .../ux/billManage/kanBanWithCode/index.vue | 66 +++++++++++++++-- .../views/ux/billManage/sparePart/index.vue | 66 +++++++++++++++-- 3 files changed, 185 insertions(+), 17 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index f6a08f39..0ee755bf 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -35,6 +35,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) + 已确认
@@ -395,6 +403,7 @@ { + let id = element.id; + params.push(id); + }); + myalert = "选中项"; + } + this.$confirm("是否确认" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", 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: "已取消操作", + }); + }); }, //出库单 handleCreateBills(row){ @@ -1417,7 +1474,6 @@ export default { }; - + \ No newline at end of file diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 6a7beffe..8dc9769f 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -35,6 +35,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) + 已确认
@@ -756,11 +764,11 @@ export default { // prop: "actionName", // width: 120, // }); - // tempsTabs.push({ - // label: "状态", - // prop: "stateName", - // width: 100, - // }); + tempsTabs.push({ + label: "状态", + prop: "FileName", + width: 100, + }); return tempsTabs; }, }, @@ -817,6 +825,54 @@ export default { }); }); }, + handleConfirm(row){ + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否确认" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", 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: "已取消操作", + }); + }); + }, //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 1a31c7d0..3b02f892 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -35,6 +35,14 @@ @click="handleCreateBills()" >生成出库单(支持批量) + 已确认 @@ -743,11 +751,11 @@ export default { // prop: "actionName", // width: 120, // }); - // tempsTabs.push({ - // label: "状态", - // prop: "stateName", - // width: 100, - // }); + tempsTabs.push({ + label: "状态", + prop: "FileName", + width: 100, + }); return tempsTabs; }, }, @@ -804,6 +812,54 @@ export default { }); }); }, + handleConfirm(row){ + if (this.multipleSelection.length == 0) { + this.$message({ + message: "至少选择一行！", + type: "warning", + }); + return; + } + 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.$confirm("是否确认" + myalert + "?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.$axios + .posts("/api/settleaccount/wms/WmsJitOutPut", 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: "已取消操作", + }); + }); + }, //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { From baf6557cdbf1fc9b49674ea33c427620cde4e88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 28 Dec 2021 15:40:28 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 0ee755bf..2edd2e49 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -905,13 +905,13 @@ export default { this.multipleSelection = val; }, handleConfirm(row){ - if (this.multipleSelection.length == 0) { - this.$message({ - message: "至少选择一行！", - type: "warning", - }); - return; - } + // if (this.multipleSelection.length == 0) { + // this.$message({ + // message: "至少选择一行！", + // type: "warning", + // }); + // return; + // } var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { @@ -933,7 +933,7 @@ export default { }) .then(() => { this.$axios - .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params) .then((response) => { const index = this.list.indexOf(row); this.$notify({ @@ -982,7 +982,7 @@ export default { }) .then(() => { this.$axios - .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPut", params) .then((response) => { const index = this.list.indexOf(row); this.$notify({ @@ -991,6 +991,7 @@ export default { type: "success", duration: 2000, }); + console.log(response); this.getList(); }); }) From 5039c4b9f867d97cec3bdbc902bcd52efc5f3a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 28 Dec 2021 16:27:07 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 18 ++++++++++-------- .../ux/billManage/kanBanWithCode/index.vue | 6 +++--- .../views/ux/billManage/sparePart/index.vue | 8 ++++---- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 2edd2e49..96cac314 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -954,13 +954,13 @@ export default { }, //出库单 handleCreateBills(row){ - if (this.multipleSelection.length == 0) { - this.$message({ - message: "至少选择一行！", - type: "warning", - }); - return; - } + // if (this.multipleSelection.length == 0) { + // this.$message({ + // message: "至少选择一行！", + // type: "warning", + // }); + // return; + // } var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { @@ -984,6 +984,7 @@ export default { this.$axios .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPut", params) .then((response) => { + console.log("检查柱护板-hostCheckQuery"+JSON.stringify(response)); const index = this.list.indexOf(row); this.$notify({ title: "成功", @@ -991,11 +992,12 @@ export default { type: "success", duration: 2000, }); - console.log(response); + this.getList(); }); }) .catch(() => { + this.$message({ type: "info", message: "已取消操作", diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index 8dc9769f..cb33fdaa 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -737,7 +737,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 120, }); tempsTabs.push({ label: "模块名称", @@ -766,8 +766,8 @@ export default { // }); tempsTabs.push({ label: "状态", - prop: "FileName", - width: 100, + prop: "fileName", + width: 150, }); return tempsTabs; }, diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 3b02f892..aa7f6e55 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -719,7 +719,7 @@ export default { tempsTabs.push({ label: "版本号", prop: "type", - width: 85, + width: 120, }); tempsTabs.push({ label: "单据流水号", @@ -753,8 +753,8 @@ export default { // }); tempsTabs.push({ label: "状态", - prop: "FileName", - width: 100, + prop: "fileName", + width: 150, }); return tempsTabs; }, @@ -841,7 +841,7 @@ export default { }) .then(() => { this.$axios - .posts("/api/settleaccount/wms/WmsJitOutPut", params) + .posts("/api/settleaccounWmsJitOutPutt/wms/", params) .then((response) => { const index = this.list.indexOf(row); this.$notify({ From 7ac41906675bb376b72e39fa380f66feedfc3451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=90=20=E5=BC=A0?= <2366389513@qq.com> Date: Tue, 28 Dec 2021 16:38:40 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20getlist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue | 2 +- vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue | 2 +- .../views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue | 2 +- vue/src/views/ux/billManage/UnSettleDiffExport/index.vue | 2 +- vue/src/views/ux/billManage/kanBanWithCode/index.vue | 2 +- vue/src/views/ux/billManage/sparePart/index.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 96cac314..6f9fc50d 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -1424,7 +1424,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众发票与结算核对明细表"; + this.listQuery.name = "准时化结算核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index e18bd5e6..0d9c579d 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -989,7 +989,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众发票与结算核对汇总表"; + this.listQuery.name = "发票与结算核对汇总"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index 2c70c9ac..cd71ff50 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -1177,7 +1177,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化结算数量差异比对表"; + this.listQuery.name = "准时化量差输出"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index a6339174..dcc93423 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -1121,7 +1121,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化未结差异比对表"; + this.listQuery.name = "准时化未结差异比对输出"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index cb33fdaa..f7a365ec 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -1209,7 +1209,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众看板结算与交货核对明细表"; + this.listQuery.name = "看板结算数量差异输出"; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index aa7f6e55..5149bd7e 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -1210,7 +1210,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众准时化结算门板价格差异比对报表"; + this.listQuery.name = "备件结算数量差异输出"; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) .then((response) => { From e8f19f469ca1fdca697e5facee25af36bde52f01 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Tue, 28 Dec 2021 17:16:05 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceSettledDetailDiff/index.vue | 51 +++++++++++-------- .../views/ux/billManage/vwOutOrder/detail.vue | 20 +++----- .../views/ux/billManage/vwOutOrder/index.vue | 4 +- vue/static/tableFieldForSearch.json | 4 +- 4 files changed, 42 insertions(+), 37 deletions(-) diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index 2edd2e49..ff79ffe8 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -35,7 +35,7 @@ @click="handleCreateBills()" >生成出库单(支持批量) - - { this.$axios - .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params) + .posts("/api/settleaccount/wmsjitoutput/WmsJitOutPutAudit", params) .then((response) => { const index = this.list.indexOf(row); this.$notify({ title: "成功", - message: "生成成功", + message: "操作成功", type: "success", duration: 2000, }); @@ -953,7 +957,7 @@ export default { }); }, //出库单 - handleCreateBills(row){ + handleCreateBills(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -975,14 +979,21 @@ export default { }); myalert = "选中项"; } + this.listBillQuery.guids = params; + this.listBillQuery.version = this.JobversionValue; + console.log("出库单条件：" + JSON.stringify(this.listBillQuery)); this.$confirm("是否确认出库" + myalert + "?", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) .then(() => { + alert(this.JobversionValue); this.$axios - .gets("/api/settleaccount/wmsjitoutput/WmsJitOutPut", params) + .posts( + "/api/settleaccount/wmsjitoutput/WmsJitOutPut", + this.listBillQuery + ) .then((response) => { const index = this.list.indexOf(row); this.$notify({ @@ -991,7 +1002,7 @@ export default { type: "success", duration: 2000, }); - console.log(response); + console.log(response); this.getList(); }); }) @@ -1422,7 +1433,7 @@ export default { getList() { this.listLoading = true; //导入界面中超链接过来的参数 - this.listQuery.name = "大众发票与结算核对明细表"; + this.listQuery.name = "准时化结算核对明细"; this.listQuery.type = this.JobversionValue; this.$axios .posts("/api/settleaccount/Job/list", this.listQuery) diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue index 41322532..f64c24b9 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -152,13 +152,14 @@ export default { Filters: [ { logic: 0, - column: "", + column: "Enabled", action: 0, - value: "", + value: "true", }, //默认查询可用的 ], SkipCount: 0, - MaxResultCount: 15 + MaxResultCount: 15, + billNum: "", }, listOutPutQuery: { version: "", @@ -170,7 +171,7 @@ export default { formTitle: "", drawer: false, showExcelImport: false, - tableHeight: document.documentElement.clientHeight - 260, + tableHeight: document.documentElement.clientHeight - 210, isEdit: false, }; }, @@ -218,6 +219,7 @@ export default { tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, }, @@ -400,15 +402,7 @@ export default { } else { this.listQuery.SkipCount = (this.page - 1) * 15; } - this.listQuery.Filters = []; - let filter = { - logic: 0, - column: "billNum", - action: 0, - value: this.customerInfo.parentId, - }; - this.listQuery.Filters.push(filter); - //this.listQuery.ParentId = this.customerInfo.parentId; + this.listQuery.billNum = this.customerInfo.parentId; console.log("查询条件：" + JSON.stringify(this.listQuery)); this.$axios .posts( diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue index cd7f23ba..ab32ba22 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/index.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -234,8 +234,8 @@ export default { } return moment(date).format("YYYY-MM-DD HH:mm:ss"); } - if (column.property == "documentStatus") { - return { 0: "新建", 1: "进行中", 5: "完成", 9: "取消" }[ + if (column.property == "state") { + return { 0: "已提交", 1: "已出库", 2: "不能出库" }[ row[column.property] ]; } diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index f86d9b2e..31f598ab 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2910,11 +2910,11 @@ { "fieldId": 3, "formType": "text", - "name": "单据号", + "name": "零件号", "type": 1, "value": "", "fieldType": 1, - "fieldName": "wmsBillNum", + "fieldName": "materialCode", "setting": [] }, { From 6a06a50adcfef7e98f18c4c9f8a36aef103fe9f2 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 29 Dec 2021 17:14:52 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=BB=84=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=85=88=E5=89=8D=E4=BA=A4?= =?UTF-8?q?=E7=BB=99=E5=AE=9E=E4=B9=A0=E7=94=9F=E5=81=9A=E7=9A=84=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=8F=88=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E9=81=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/src/router/modules/vw_menu.js | 36 ++-- .../ux/billManage/FisUnSettledDiff/index.vue | 2 +- .../InvoiceSettledDetailDiff/index.vue | 110 ++++++++-- .../billManage/InvoiceSettledDiff/index.vue | 2 +- .../ux/billManage/IssuedUnsettled/index.vue | 2 +- .../ux/billManage/SettleDoorPanel/index.vue | 2 +- .../UnInvoiceSettledDetailDiff/index.vue | 14 +- .../billManage/UnSettleDiffExport/index.vue | 14 +- .../ux/billManage/UnSettledDiff/index.vue | 2 +- .../ux/billManage/kanBanWithCode/index.vue | 33 ++- .../views/ux/billManage/sparePart/index.vue | 188 ++++++++++------ .../views/ux/billManage/vwOutOrder/detail.vue | 200 ++++++++++++------ .../views/ux/billManage/vwOutOrder/index.vue | 5 +- vue/static/tableFieldForSearch.json | 18 ++ 14 files changed, 441 insertions(+), 187 deletions(-) diff --git a/vue/src/router/modules/vw_menu.js b/vue/src/router/modules/vw_menu.js index 2ec6da00..5d8e00ed 100644 --- a/vue/src/router/modules/vw_menu.js +++ b/vue/src/router/modules/vw_menu.js @@ -41,7 +41,7 @@ const vwMenudataRouter = { meta: { title: 'FIS结算明细', roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） - icon: '结算' + icon: '库存' } }, { @@ -59,9 +59,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'), name: 'VWKanBan',//命名路由 meta: { - title: '大众看板结算明细', + title: '大众看板结算导入', roles: ['SettleAccount.SettleAccounts'],//控制页面角色（可以设置多个角色） - icon: '发运' + icon: '看板' } }, { @@ -69,9 +69,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/vw/dataInput/SparePart'), name: 'SparePart',//命名路由 meta: { - title: '大众备件结算明细导入', + title: '大众备件结算导入', roles: ['SettleAccount.Boms'],//控制页面角色（可以设置多个角色） - icon: '结算' + icon: '工厂' } }, { @@ -104,7 +104,7 @@ const vwMenudataRouter = { meta: { title: '发票与结算核对汇总', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '结算对比' + icon: '结算' } }, { @@ -122,7 +122,7 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'), name: 'UnInvoiceSettledDetailDiff',//命名路由 meta: { - title: '准时化量差输出', + title: '准时化量差价差输出', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） icon: '售后' } @@ -132,19 +132,29 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/UnSettleDiffExport'), name: 'UnSettleDiffExport',//命名路由 meta: { - title: '准时化未结差异比对输出', + title: '准时化未结核对', roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） - icon: '售后' + icon: '器具' } }, + { + path: '/unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识） + component: () => import('@/views/ux/billManage/IssuedUnsettled/index'), + name: 'UnsettledDetail',//命名路由 + meta: { + title: '准时化未结明细', + roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色） + icon: '报表' + } + }, { path: '/kbwithcode', component: () => import('@/views/ux/billManage/kanBanWithCode'), name: 'KanBanWithCode',//命名路由 meta: { - title: '看板结算数量差异输出', + title: '看板结算输出', //roles: ['SettleAccount.EstimatedStockDiffReports'],//控制页面角色（可以设置多个角色） - icon: '对比' + icon: '看板' } }, @@ -153,9 +163,9 @@ const vwMenudataRouter = { component: () => import('@/views/ux/billManage/sparePart'), name: 'SparePartReport',//命名路由 meta: { - title: '备件结算数量差异输出', + title: '备件结算输出', //roles: ['abpvnext_master.ProjectPeople'],//控制页面角色（可以设置多个角色） - icon: '二配' + icon: '供货' } } ] diff --git a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue index cb67d913..d37088e2 100644 --- a/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/FisUnSettledDiff/index.vue @@ -512,7 +512,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 80, + width: 130, }); tempsTabs.push({ label: "当前版本", diff --git a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue index c40a4b55..0541e6fd 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue @@ -63,7 +63,7 @@ 说明：每间隔15秒进行自动刷新！说明：每间隔30秒进行自动刷新！ @@ -83,6 +83,7 @@ border highlight-current-row style="width: 100%" + @sort-change="sortChange" @row-click="handleRowClick" @selection-change="handleSelectionChange" @filter-change="filterChange" @@ -402,11 +403,34 @@ + + {{ item.label }} + {{ + item.value + }} + + + @@ -534,28 +558,25 @@ - + - - - - + - + - - - + { clearInterval(timer); @@ -897,7 +916,7 @@ export default { width: 220, }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -905,6 +924,33 @@ export default { }, }, methods: { + sortChange(data) { + const { prop, order } = data; + if (!prop || !order) { + this.handleFilter(); + return; + } + this.listQuery.Sorting = prop + " " + order; + console.log(this.listQuery.Sorting); + this.handleFilter(); + }, + /** 筛选操作 */ + handleFilter() { + this.page = 1; + this.getList(); + this.listQuery.Filters = []; + if (this.searchContent != "") { + var column = "taskId"; + let filter = { + logic: 0, + column: column, + action: 0, + value: this.searchContent, + }; + this.listQuery.Filters.push(filter); + } + this.getList(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -988,14 +1034,15 @@ export default { type: "warning", }) .then(() => { - alert(this.JobversionValue); this.$axios .posts( "/api/settleaccount/wmsjitoutput/WmsJitOutPut", this.listBillQuery ) .then((response) => { - console.log("检查柱护板-hostCheckQuery"+JSON.stringify(response)); + console.log( + "检查柱护板-hostCheckQuery" + JSON.stringify(response) + ); const index = this.list.indexOf(row); this.$notify({ title: "成功", @@ -1003,12 +1050,11 @@ export default { type: "success", duration: 2000, }); - + this.getList(); }); }) .catch(() => { - this.$message({ type: "info", message: "已取消操作", @@ -1206,12 +1252,34 @@ export default { }); }, //获取物料组车型 + // getMaterialGroup() { + // this.$axios + // .posts("/api/settleaccount/CodeSetting/list", { + // project: "物料组", + // maxResultCount: 1000, + // skipCount: 0, + // }) + // .then((response) => { + // this.materialGroupList = []; + // response.items.forEach((element) => { + // let options = {}; + // options.value = element.description; + // options.label = element.value; + // this.materialGroupList.push(options); + // }); + // }) + // .catch(() => { + // this.listLoading = false; + // }); + // }, + //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting:"value ascending" }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue index 0d9c579d..53b6a364 100644 --- a/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue @@ -626,7 +626,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue index fe737698..6e6ac6a8 100644 --- a/vue/src/views/ux/billManage/IssuedUnsettled/index.vue +++ b/vue/src/views/ux/billManage/IssuedUnsettled/index.vue @@ -730,7 +730,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue index 2aa3f604..c810301d 100644 --- a/vue/src/views/ux/billManage/SettleDoorPanel/index.vue +++ b/vue/src/views/ux/billManage/SettleDoorPanel/index.vue @@ -772,7 +772,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue index cd71ff50..068ea053 100644 --- a/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue +++ b/vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue @@ -385,18 +385,21 @@ - {{ item.label }} {{ @@ -774,7 +777,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -954,6 +957,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue index dcc93423..bfd56ab4 100644 --- a/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue +++ b/vue/src/views/ux/billManage/UnSettleDiffExport/index.vue @@ -386,18 +386,21 @@ - {{ item.label }} {{ @@ -731,7 +734,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -906,6 +909,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/UnSettledDiff/index.vue b/vue/src/views/ux/billManage/UnSettledDiff/index.vue index fc2a3da1..c3602e58 100644 --- a/vue/src/views/ux/billManage/UnSettledDiff/index.vue +++ b/vue/src/views/ux/billManage/UnSettledDiff/index.vue @@ -728,7 +728,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", diff --git a/vue/src/views/ux/billManage/kanBanWithCode/index.vue b/vue/src/views/ux/billManage/kanBanWithCode/index.vue index f7a365ec..8c051717 100644 --- a/vue/src/views/ux/billManage/kanBanWithCode/index.vue +++ b/vue/src/views/ux/billManage/kanBanWithCode/index.vue @@ -35,7 +35,7 @@ @click="handleCreateBills()" >生成出库单(支持批量) - - {{ item.label }} {{ @@ -464,25 +467,23 @@ - - - + @@ -754,18 +755,13 @@ export default { prop: "createdAt", width: 150, }); - tempsTabs.push({ + tempsTabs.push({ label: "说明", prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -825,7 +821,7 @@ export default { }); }); }, - handleConfirm(row){ + handleConfirm(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -1014,6 +1010,7 @@ export default { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; diff --git a/vue/src/views/ux/billManage/sparePart/index.vue b/vue/src/views/ux/billManage/sparePart/index.vue index 5149bd7e..567066e5 100644 --- a/vue/src/views/ux/billManage/sparePart/index.vue +++ b/vue/src/views/ux/billManage/sparePart/index.vue @@ -35,7 +35,7 @@ @click="handleCreateBills()" >生成出库单(支持批量) - - {{ item.label }} {{ @@ -428,17 +431,30 @@ - + + + + + + + @@ -483,37 +499,60 @@ - - + + - - + + - - - + + - +
@@ -577,6 +616,25 @@ export default { return time.getTime() <= new Date(this.startTime).getTime(); }, }, + pickerOptions1: { + disabledDate: (time) => { + //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now(); + return time.getTime() <= new Date(this.startTime).getTime(); + }, + }, + + pickerOptions2: { + disabledDate: (time) => { + //if (this.endTime != "") { + return time.getTime() > new Date(this.cp5endTime).getTime(); + //} + }, + }, + pickerOptions3: { + disabledDate: (time) => { + return time.getTime() <= new Date(this.cp5startTime).getTime(); + }, + }, startTime: "", endTime: "", pickerOptionsCp7: { @@ -601,6 +659,7 @@ export default { radio: "0", //结算状态：0未结 1部分结算 versionList: [], materialGroupList: [], + getmaterialGroupValue: "", // 是否显示详细弹出层 openView: false, versionValue: "", @@ -630,16 +689,20 @@ export default { searchContent: "", // 输入内容 form: {}, formCount: { - name: "未结算对比", - // datetime5: [], - // datetime7: [], - settledate: "", - materialCode: "", - sapMaterialCode: "", - chassisNumber: "", - kennCode: "", - version: "", + startTime: "", + endTime: "", + cp5startTime: "", + cp5endTime: "", + // name: "未结算对比", + // settledate: "", + // materialCode: "", + // sapMaterialCode: "", + // chassisNumber: "", + // kennCode: "", + // version: "", }, + cp5startTime: "", + cp5endTime: "", list: null, totalCount: 0, listLoading: true, @@ -724,7 +787,7 @@ export default { tempsTabs.push({ label: "单据流水号", prop: "taskId", - width: 85, + width: 130, }); tempsTabs.push({ label: "模块名称", @@ -746,13 +809,8 @@ export default { prop: "remark", width: 220, }); - // tempsTabs.push({ - // label: "操作名称", - // prop: "actionName", - // width: 120, - // }); tempsTabs.push({ - label: "状态", + label: "审批状态", prop: "fileName", width: 150, }); @@ -760,6 +818,15 @@ export default { }, }, methods: { + //cp5 + getdateValueCp5(val) { + this.cp5startTime = val; + this.getbalanceIndexData(); + }, + getdateValCp5(val) { + this.cp5endTime = val; + this.getbalanceIndexData(); + }, handleSelectionChange(val) { this.multipleSelection = val; }, @@ -812,7 +879,7 @@ export default { }); }); }, - handleConfirm(row){ + handleConfirm(row) { if (this.multipleSelection.length == 0) { this.$message({ message: "至少选择一行！", @@ -994,20 +1061,20 @@ export default { this.listLoading = false; }); }, - //获取物料组车型 getMaterialGroup() { this.$axios .posts("/api/settleaccount/CodeSetting/list", { project: "物料组", maxResultCount: 1000, skipCount: 0, + sorting: "value ascending", }) .then((response) => { this.materialGroupList = []; response.items.forEach((element) => { let options = {}; options.value = element.description; - options.label = element.description; + options.label = element.value; this.materialGroupList.push(options); }); }) @@ -1021,7 +1088,8 @@ export default { this.datetime5 = []; this.startTime = ""; this.endTime = ""; - // this.datetime7 = []; + this.cp5startTime = ""; + this.cp5endTime = ""; }, save() { this.$refs.formCount.validate((valid) => { @@ -1031,22 +1099,18 @@ export default { if (this.formCount.materialCode != "") { this.listExportQuery.materialCode = this.formCount.materialCode; //物料号 } - // if (this.formCount.sapMaterialCode != "") { - // this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号 - // } + if (this.formCount.sapCode != "") { + this.listExportQuery.sapCode = this.formCount.sapCode; //厂内物料号 + } if (this.formCount.kennCode != "") { this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号 } - var getdate5 = JSON.stringify(this.datetime5); - if (getdate5 != "[]") { - alert(this.datetime5[0]); - this.listExportQuery.begin = this.datetime5 - ? this.datetime5[0] || undefined - : undefined; - this.listExportQuery.end = this.datetime5 - ? this.datetime5[1] || undefined - : undefined; - } + this.listExportQuery.begin = this.cp5startTime + ? this.cp5startTime + : undefined; + this.listExportQuery.end = this.cp5endTime + ? this.cp5endTime + : undefined; if (this.startTime != "") { this.listExportQuery.cp7begin = this.startTime; //CP7开始时间 } @@ -1057,8 +1121,7 @@ export default { this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号 } if (this.formCount.materialGroupValue != "") { - this.listExportQuery.materialGroup = - this.formCount.materialGroupValue; //物料组车型 + this.listExportQuery.materialGroup = this.getmaterialGroupValue; //物料组车型 } console.log( "大众备件结算核对-导出条件：" + JSON.stringify(this.listExportQuery) @@ -1096,6 +1159,11 @@ export default { this.formTitle = "报表统计"; this.isEdit = false; this.form = {}; + this.datetime5 = []; + this.startTime = ""; + this.endTime = ""; + this.cp5startTime = ""; + this.cp5endTime = ""; this.dialogFormVisible = true; }, filterHandler(value, row, column) { diff --git a/vue/src/views/ux/billManage/vwOutOrder/detail.vue b/vue/src/views/ux/billManage/vwOutOrder/detail.vue index f64c24b9..b3bea7bf 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/detail.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/detail.vue @@ -10,6 +10,12 @@ @click="handleDownload()" >导出全部 --> + { this.customerInfo.parentId = element.ParentId; + this.customerInfo.version = element.Version; }); if (this.customerInfo.parentId != "") { this.getList(); @@ -209,21 +228,38 @@ export default { tempsTabs.push({ label: "版本", prop: "version", - width: 150, + width: 110, }); tempsTabs.push({ label: "零件号", prop: "materialCode", width: 150, }); + tempsTabs.push({ label: "KEEN号", prop: "kennCode", width: 170 }); + tempsTabs.push({ label: "底盘号", prop: "chassisNumber", width: 190 }); tempsTabs.push({ label: "零件描述", prop: "materialDesc", width: 250 }); tempsTabs.push({ label: "物料组", prop: "materialGroup", width: 220 }); - tempsTabs.push({ label: "数量", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 100 }); + tempsTabs.push({ label: "数量", prop: "qty", width: 100 }); tempsTabs.push({ label: "状态", prop: "state", width: 100 }); return tempsTabs; }, }, methods: { + //版本下拉列表选择项 + JobVersionValue(params) { + //版本下拉选择 + this.listQuery.Filters = []; + var column = "state"; + let filter = { + logic: 0, + column: column, + action: 0, + value: params.value, + }; + this.listQuery.Filters.push(filter); + this.getList(); + }, //取消出库单 handleCancelBills(row) { if (this.multipleSelection.length == 0) { @@ -233,8 +269,7 @@ export default { }); return; } - //var params = []; - var params = ""; + var params = []; let myalert = ""; //声明变量，其变量必须在此声明后使用 if (row) { //单行 @@ -244,13 +279,14 @@ export default { //多选 this.multipleSelection.forEach((element) => { let id = element.id; - //params.push(id); - params += id + ","; + params.push(id); }); myalert = "选中项"; } - this.listOutPutQuery.version = row.version; - this.listOutPutQuery.ids = params.substr(0, params.length - 1); + 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: "确定", @@ -284,59 +320,96 @@ export default { //出库单 handleCreateBills(row) { if (this.multipleSelection.length == 0) { - this.$message({ - message: "至少选择一行！", + this.listLoading = true; + this.listOutPutQuery.guids = []; + this.listOutPutQuery.version = this.customerInfo.version; + this.listOutPutQuery.billNum = this.customerInfo.parentId; + console.log( + "未选择时全部确认出库条件：" + JSON.stringify(this.listOutPutQuery) + ); + this.$confirm("是否全部确认出库?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", type: "warning", - }); - return; - } - //var params = []; - 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); - params += id + ","; - }); - myalert = "选中项"; - } - this.listOutPutQuery.version = row.version; - this.listOutPutQuery.ids = params.substr(0, params.length - 1); - - 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, + }) + .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; }); - this.getList(); + }) + .catch(() => { + this.$message({ + type: "info", + message: "已取消操作", }); + 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", }) - .catch(() => { - this.$message({ - type: "info", - message: "已取消操作", + .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) { @@ -346,6 +419,15 @@ export default { }, /** 格式化字段 */ fieldFormatter(row, column) { + if (column.property == "state") { + return { + 0: "未处理", + 1: "申请出库", + 2: "确认出库", + 3: "不能出库", + 4: "取消出库", + }[row[column.property]]; + } return row[column.property] || "--"; }, importExcelData() { diff --git a/vue/src/views/ux/billManage/vwOutOrder/index.vue b/vue/src/views/ux/billManage/vwOutOrder/index.vue index ab32ba22..90727815 100644 --- a/vue/src/views/ux/billManage/vwOutOrder/index.vue +++ b/vue/src/views/ux/billManage/vwOutOrder/index.vue @@ -105,9 +105,10 @@ import Detail from "./detail"; import moment from "moment"; import { formatTimeToTimestamp } from "@/utils/index"; + export default { name: "sendUnsettledDiffReport", - components: { Pagination, Detail }, + components: { Pagination, Detail}, directives: { permission }, data() { return { @@ -216,9 +217,11 @@ export default { handleDrawerOpen(param) { this.drawer = true; var parentId = param.billNum; //单据号 + var version = param.version; //版本 this.customerInfos = [ { ParentId: parentId, + Version: version, }, ]; }, diff --git a/vue/static/tableFieldForSearch.json b/vue/static/tableFieldForSearch.json index 31f598ab..956275ca 100644 --- a/vue/static/tableFieldForSearch.json +++ b/vue/static/tableFieldForSearch.json @@ -2926,6 +2926,24 @@ "fieldType": 1, "fieldName": "materialGroup", "setting": [] + }, + { + "fieldId": 2, + "formType": "select", + "isNull": 0, + "name": "状态", + "options": "", + "type": 3, + "value": "", + "fieldType": 0, + "fieldName": "state", + "setting": [ + "未处理,0", + "申请出库,1", + "确认出库,2", + "不能出库,3", + "取消出库,4" + ] } ] }