diff --git a/vue/src/router/modules/fisprint.js b/vue/src/router/modules/fisprint.js new file mode 100644 index 00000000..888a6399 --- /dev/null +++ b/vue/src/router/modules/fisprint.js @@ -0,0 +1,53 @@ +/** 派格fis路由 */ +//import Layout from '@/layout/firstLayout' +import Layout from '@/layout' + +const pgfisPrint = { + path: '/pg-fis-print', + component: Layout, + redirect: 'fisprint', + name: 'pgfis', + meta: { + //requiresAuth: true, + title: '排序单打印', + index: 0, + type: 'crm', + icon: '业务', + keepAlive: false, + }, + children: [ + { + path: '/pg-m100normal-print', + component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), + name: 'pg-M100Online',//命名路由 + meta: { + title: '日常打印M100信息', + //roles: ['SettleAccount.Reports'], + icon: '客户零件' + } + }, + { + path: '/select', + component: () => import('@/views/pg-fis/basedate/select'), + name: 'select',//命名路由 + meta: { + title: 'M100查询', + //roles: ['SettleAccount.Reports'], + icon: '结算对比' + } + }, + { + path: '/pg-M100Online', + component: () => import('@/views/pg-fis/basedate/m100Online'), + name: 'pg-M100Online',//命名路由 + meta: { + title: 'M100上线信息', + //roles: ['SettleAccount.Reports'], + icon: '售后' + } + } + ] +} + +export default pgfisPrint + diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue new file mode 100644 index 00000000..8933b981 --- /dev/null +++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue @@ -0,0 +1,749 @@ + + + + + + + + + + diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/index.vue index 542659d9..7212991d 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/index.vue @@ -47,10 +47,10 @@ - - - - + - - - + - - - - + + - - - - + + - - - + { diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index ed353a88..b6db8ffd 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -126,7 +126,7 @@ > - + @@ -373,10 +376,10 @@ import MBDetail from "./detailMB.vue"; import ZHBDetail from "./detailZHB.vue"; import { downloadFile } from "@/utils/crmindex.js"; import qs from "qs"; -import RepetitionMB from './RepetitionMB.vue' -import RepetitionZHB from './RepetitionZHB.vue' -import ScrapMB from './ScrapMB.vue' -import ScrapZHB from './ScrapZHB.vue' +import RepetitionMB from "./RepetitionMB.vue"; +import RepetitionZHB from "./RepetitionZHB.vue"; +import ScrapMB from "./ScrapMB.vue"; +import ScrapZHB from "./ScrapZHB.vue"; export default { name: "M100Online", @@ -390,7 +393,7 @@ export default { RepetitionMB, RepetitionZHB, ScrapMB, - ScrapZHB + ScrapZHB, }, directives: { permission }, filters: { @@ -425,6 +428,9 @@ export default { erpAssemblyName: [ { required: true, message: "必须输入！", trigger: "blur" }, ], + beginHostSN: [ + { required: true, message: "必须输入数字！", trigger: "number" }, + ], }, billState: [ { id: 2, name: "已匹配" }, @@ -444,6 +450,7 @@ export default { list: null, totalCount: 0, listLoading: true, + listLoaddingPrint: true, customerInfo: { bomId: "", }, @@ -477,6 +484,13 @@ export default { billStatus: undefined, state: [], }, + listQueryList: { + SkipCount: 0, + MaxResultCount: 15, + ProductLine: undefined, + BillStatus: undefined, + CanNotPrint: false, + }, listExportQuery: { erpAssemblyCode: undefined, erpAssemblyName: undefined, @@ -623,52 +637,113 @@ export default { ...mapGetters(["userInfo"]), //获取当前用户信息 }, methods: { + //大众顺序号起止事件改变 + beginHostSNChange(val) { + if (this.listQuery.productType === 1) { + this.form.endHostSN = + parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1; + } else if (this.listQuery.productType === 2) { + this.form.endHostSN = + parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1; + } + }, //门板打印数量更改 valueNumChange(val) { this.printNum = val; - this.$axios - .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery) - .then((response) => { - if (response.item !== null) { - this.form.beginHostSN = parseInt(response.item); - if (val == 12) { + if (val == 12) { + //默认值是12 + this.$axios + .gets( + "/api/newjit/bill-m100/get-print-start-hostsn2", + this.hostSNQuery + ) + .then((response) => { + if (response.item !== null) { + this.form.beginHostSN = parseInt(response.item); //门板 this.form.endHostSN = parseInt(response.item) + 11; } else { - this.form.endHostSN = parseInt(response.item) + this.printNum - 1; + this.$message({ + message: "获取不到大众顺序号", + type: "warning", + }); + return; } - } else { - this.$message({ - message: "获取不到大众顺序号", - type: "warning", - }); - return; - } - }); + }); + } else { + //起止顺序号默认数量不为12 + this.form.endHostSN = + parseInt(this.printNum) + parseInt(this.form.beginHostSN) - 1; + } + // this.$axios + // .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery) + // .then((response) => { + // if (response.item !== null) { + // this.form.beginHostSN = parseInt(response.item); + // if (val == 12) { + // //门板 + // this.form.endHostSN = parseInt(response.item) + 11; + // } else { + // this.form.endHostSN = + // parseInt(response.item) + parseInt(this.printNum) - 1; + // } + // } else { + // this.$message({ + // message: "获取不到大众顺序号", + // type: "warning", + // }); + // return; + // } + // }); }, //柱护板打印更改 valueNumChangeZHB(val) { this.printNumZHB = val; - this.$axios - .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery) - .then((response) => { - if (response.item !== null) { - this.form.beginHostSN = parseInt(response.item); - if (val == 24) { - //柱护板 - this.form.endHostSN = parseInt(response.item) + 23; + if (val == 12) { + //默认值是12 + this.$axios + .gets( + "/api/newjit/bill-m100/get-print-start-hostsn2", + this.hostSNQuery + ) + .then((response) => { + if (response.item !== null) { + this.form.beginHostSN = parseInt(response.item); + //门板 + this.form.endHostSN = parseInt(response.item) + 11; } else { - this.form.endHostSN = - parseInt(response.item) + this.printNumZHB - 1; + this.$message({ + message: "获取不到大众顺序号", + type: "warning", + }); + return; } - } else { - this.$message({ - message: "获取不到大众顺序号", - type: "warning", - }); - return; - } - }); + }); + } else { + //起止顺序号默认数量不为12 + this.form.endHostSN = + parseInt(this.printNumZHB) + parseInt(this.form.beginHostSN) - 1; + } + // this.$axios + // .gets("/api/newjit/bill-m100/get-print-start-hostsn2", this.hostSNQuery) + // .then((response) => { + // if (response.item !== null) { + // this.form.beginHostSN = parseInt(response.item); + // if (val == 24) { + // //柱护板 + // this.form.endHostSN = parseInt(response.item) + 23; + // } else { + // this.form.endHostSN = + // parseInt(response.item) + this.printNumZHB - 1; + // } + // } else { + // this.$message({ + // message: "获取不到大众顺序号", + // type: "warning", + // }); + // return; + // } + // }); }, //抽屉 handleDrawerOpen(param) { @@ -811,23 +886,18 @@ export default { getList(data) { this.listLoading = true; if (data != undefined) { - this.listQuery.SkipCount = (this.page - 1) * data.limit; + this.listQueryList.SkipCount = (this.page - 1) * data.limit; } else { - this.listQuery.SkipCount = (this.page - 1) * 15; - } - if (this.listQuery.OnlineTimeValue !== undefined) { - this.listQuery.OnlineTimeBegin = this.listQuery.OnlineTimeValue[0]; - this.listQuery.OnlineTimeEnd = this.listQuery.OnlineTimeValue[1]; - } - if (this.listQuery.ReceiveTimeValue !== undefined) { - this.listQuery.ReceiveTimeBegin = this.listQuery.ReceiveTimeValue[0]; - this.listQuery.ReceiveTimeEnd = this.listQuery.ReceiveTimeValue[1]; - } - if (this.listQuery.state !== undefined) { - this.listQuery.billStatus = this.listQuery.state[0]; + this.listQueryList.SkipCount = (this.page - 1) * 15; } + this.listQueryList.BillStatus = 2; //状态 + this.listQueryList.ProductLine = this.listQuery.productLine; //产线 + this.listQueryList.CanNotPrint = false; //不可打印 + console.log( + "日常打印M100查询条件：" + JSON.stringify(this.listQueryList) + ); this.$axios - .gets("/api/newjit/bill-m100/list", this.listQuery) + .gets("/api/newjit/bill-m100/list", this.listQueryList) .then((response) => { this.list = response.items; this.totalCount = response.totalCount; @@ -954,7 +1024,9 @@ export default { }); return; } - this.hostSNQuery.productLine = this.listQuery.productLine; + (this.printNum = "12"), + (this.printNumZHB = "24"), + (this.hostSNQuery.productLine = this.listQuery.productLine); this.hostPrintQuery.productLine = this.listQuery.productLine; //后端服务更改了 前端跟着更改成以下方式 if (this.listQuery.productType === 1) { @@ -1117,8 +1189,395 @@ export default { this.isShowHostSN = false; this.isShowVin = true; }, - /**保存*/ save() { + this.$refs.form.validate((valid) => { + if (valid) { + //this.listLoaddingPrint = true; + if (this.isShowHostSN === true) { + if (this.form.beginHostSN === "" || this.form.endHostSN === "") { + this.$message({ + message: "请输入完整的顺序号起始范围", + type: "error", + }); + return; + } else { + if (this.listQuery.productType === 1) { + //门板 + if ( + parseInt(this.form.endHostSN) - + parseInt(this.form.beginHostSN) <= + 0 + ) { + this.$message({ + message: "起止大众顺序号相减不能为零！", + type: "error", + }); + return; + } + } else if (this.listQuery.productType === 2) { + //柱护板 + if ( + parseInt(this.form.endHostSN) - + parseInt(this.form.beginHostSN) > + 23 + ) { + this.$message({ + message: + "最多只能打印24个顺序号，终止顺序号不能大于" + + (parseInt(this.form.beginHostSN) + 23), + type: "error", + }); + return; + } + } + } + } + if (this.isShowVin === true) { + if (this.form.beginVin === "" || this.form.endVin === "") { + this.$message({ + message: "请输入完整的底盘号起始范围", + type: "error", + }); + return; + } + } + /**打印时传递大众顺序号范围，接口1获取大众顺序号，接口2验证是否断号，接口3获取打印数据，接口4获得grid++模板的base64编码 */ + if ( + this.formTitle === "打印-门板发货排序单" || + this.formTitle === "打印-柱护板发货排序单" + ) { + this.hostPrintQuery.beginHostSN = parseInt(this.form.beginHostSN); + this.hostPrintQuery.endHostSN = parseInt(this.form.endHostSN); + + if (this.listQuery.productType === 1) { + //门板-打印 + this.$axios + .posts( + "/api/newjit/bill-m100/check-mb-hostsn-break-num", + this.hostCheckQuery + ) + .then((response) => { + console.log("检查门板-大众顺序号是否断号"); + if (response.item.length > 0) { + //有断号 + this.$confirm( + "本次打印存在断号是否继续?" + response.item, + "提示", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ) + .then(() => { + //门板 + //传递大众顺序号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-menban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log("打印门板装箱单"); + console.log(response); + console.log(response.status); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "menban"; + this.fileQuery.dataname = JSON.stringify( + response.item + ); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=menban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.formLoading = false; + this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; + }); + } + }); + }) + .catch(() => {}); + } else { + //无断号 + //门板 + //传递大众顺序号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-menban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log("打印门板装箱单"); + console.log(response); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "menban"; + this.fileQuery.dataname = JSON.stringify( + response.item + ); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=menban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.formLoading = false; + this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; + }); + } + }) + .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; + }); + } + }); + } else if (this.listQuery.productType === 2) { + //柱护板 + this.$axios + .posts( + "/api/newjit/bill-m100/check-zhb-hostsn-break-num", + this.hostCheckQuery + ) + .then((response) => { + console.log("检查柱护板-大众顺序号是否断号"); + if (response.item.length > 0) { + //有断号 + this.$confirm( + "本次打印存在断号是否继续?" + response.item, + "提示", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ) + .then(() => { + //门板 + //传递大众顺序号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-zhuhuban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log("打印门板装箱单"); + console.log(response); + console.log(response.status); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "menban"; + this.fileQuery.dataname = JSON.stringify( + response.item + ); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=menban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response); //打印我文件流 + }); + } + }); + }) + .catch(() => {}); + } //无断号 + else { + //门板 + //传递大众顺序号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-zhuhuban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log("打印门板装箱单"); + console.log(response); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "menban"; + this.fileQuery.dataname = JSON.stringify( + response.item + ); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=menban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response); //打印我文件流 + }); + } + }) + .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; + }); + } + }); + } + } else { + /**接口1获取打印数据，接口2获得grid++模板的base64编码 */ + this.hostPrintQuery.beginVin = this.form.beginVin; + this.hostPrintQuery.endVin = this.form.endVin; + //判断productType类型 + if (this.listQuery.productType === 1) { + //门板 + //传递底盘号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-menban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log( + "重新或补打打印门板装箱单" + + JSON.stringify(this.hostPrintQuery) + ); + console.log(response); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "menban"; + this.fileQuery.dataname = JSON.stringify(response.item); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=menban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response); //打印我文件流 + }); + } + }) + .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; + }); + } else if (this.listQuery.productType === 2) { + //柱护板 + //传递底盘号起止 + this.$axios + .posts( + "/api/newjit/bill-m100/print-zhuhuban-packing-list", + this.hostPrintQuery + ) + .then((response) => { + console.log("打印柱护板装箱单"); + console.log(response); + if (response.status === false) { + this.$message({ + message: response.message, + type: "error", + }); + return; + } else { + //传给grid++接口json数据，得到返回的文件base64 + //this.fileQuery.report = "zhuhuban"; + this.fileQuery.dataname = JSON.stringify(response.item); + //this.fileQuery.dataname = ""; + console.log("打印json"); + console.log(this.fileQuery.dataname); + this.$axios + .posts( + "/Handlers/Handler1.ashx?report=zhuhuban", + qs.stringify(this.fileQuery) + ) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response); //打印我文件流 + }); + } + }) + .catch(() => { + this.$message({ + message: response.message, + type: "error", + }); + return; + }); + } + } + } + }); + }, + /**保存*/ + save1() { + //this.listLoaddingPrint = true; if (this.isShowHostSN === true) { if (this.form.beginHostSN === "" || this.form.endHostSN === "") { this.$message({ @@ -1182,7 +1641,6 @@ export default { ) .then((response) => { console.log("检查门板-大众顺序号是否断号"); - response.item = ["断号1", "断号2"]; if (response.item.length > 0) { //有断号 this.$confirm( @@ -1229,14 +1687,18 @@ export default { .then((response) => { console.log("获取文件base64编码"); console.log(response); + this.formLoading = false; this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; }); } }); }) .catch(() => {}); - } //无断号 - else { + } else { + //无断号 //门板 //传递大众顺序号起止 this.$axios @@ -1268,7 +1730,11 @@ export default { .then((response) => { console.log("获取文件base64编码"); console.log(response); + this.formLoading = false; this.printpdf(response); //打印我文件流 + }) + .catch((error) => { + this.formLoading = false; }); } }) @@ -1290,7 +1756,6 @@ export default { ) .then((response) => { console.log("检查柱护板-大众顺序号是否断号"); - response.item = ["断号1", "断号2"]; if (response.item.length > 0) { //有断号 this.$confirm( diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue index a7b2e2b3..ab0dd54d 100644 --- a/vue/src/views/pg-fis/basedate/select/index.vue +++ b/vue/src/views/pg-fis/basedate/select/index.vue @@ -9,16 +9,13 @@ v-show="showSearch" :inline="true" > - - - @@ -29,7 +26,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -39,7 +36,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -50,7 +47,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -60,7 +57,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -71,7 +68,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -81,7 +78,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -93,7 +90,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -103,7 +100,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" @keyup.enter.native="handleQuery" /> @@ -147,7 +144,7 @@ - + @@ -297,7 +294,7 @@ placeholder="" clearable size="small" - style="width: 240px" + style="width: 200px" /> @@ -636,7 +633,6 @@ export default { handleDrawerClose(done) { done(); }, - fetchData(id) { //循环动态 this.$axios diff --git a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue index d5ca59b3..e23369c3 100644 --- a/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue +++ b/vue/src/views/pg-fis/basedate/unknownAssembly/index.vue @@ -1031,7 +1031,7 @@ export default { } }, handleRowClick(row, column, event) { - this.$refs.multipleTable.clearSelection(); + //this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.toggleRowSelection(row); }, /* 获取车型数据源 */