diff --git a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue index f7670b83..c20ce7db 100644 --- a/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue +++ b/vue/src/views/pg-fis/basedate/assemblyCfg/index.vue @@ -10,7 +10,7 @@ :inline="true" > - + - + - - - + + + @@ -329,9 +329,9 @@ export default { } if (column.property === "logType") { return { - 1: "报文传输异常", - 2: "报文转换异常", - 3: "报文解析、校验异常", + 0: "", + 1: "R100", + 2: "M100", }[row[column.property]]; } if (column.property == "creationTime") { @@ -349,6 +349,7 @@ export default { getList() { this.listLoading = true; this.listQuery.SkipCount = (this.page - 1) * 10; + this.listQuery.LogStatus = 0;//不要状态为已忽略和已处理的数据 //this.listQuery.LogType = 1;//1: R100 2: M100） this.$axios .gets("/api/newjit/log-remind/list", this.listQuery) diff --git a/vue/src/views/pg-fis/basedate/m100BIll/index.vue b/vue/src/views/pg-fis/basedate/m100BIll/index.vue index 6af416e2..5a901123 100644 --- a/vue/src/views/pg-fis/basedate/m100BIll/index.vue +++ b/vue/src/views/pg-fis/basedate/m100BIll/index.vue @@ -108,7 +108,7 @@ @keyup.enter.native="handleQuery" /> - + - + { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response);//打印我文件流 + }) } }) } @@ -1274,105 +1172,6 @@ export default { //传给grid++接口json数据，得到返回的文件base64 //this.fileQuery.report = "menban"; this.fileQuery.dataname = JSON.stringify(response.item); - this.fileQuery.dataname = `[{ -"masters": [{ - "id": "1", - "billNum": " 10000000009", - "billSerialNum": "04", - "billLocation": "左", - "providerCode": "0709FAW-VW7XH", - "partType": "C8 DP", - "capacity": "12", - "printDate": "2021-11-27 10:12:04", - "printType": 0, - "productLine": "01", - "beginVin": "LFV2A24K2M3303677", - "endVin": "LFV2A24K2M3303792" - }, - { - "id": "2", - "billNum": " 10000000010", - "billSerialNum": "04", - "billLocation": "右", - "providerCode": "0709FAW-VW7XH", - "partType": "C8 DP", - "capacity": "12", - "printDate": "2021-11-27 10:12:04", - "printType": 0, - "productLine": "01", - "beginVin": "LFV2A24K2M3303677", - "endVin": "LFV2A24K2M3303792" - } - ] - "details": [{ - "id": "1", - "billNum": " 10000000009", - "knr": " 21321501481001", - "vin": "LFV2A24K2M3303677", - "hostSN": 85, - "vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020", - "topBoxPositionNum": "01", - "topSAPMaterialNum": "30052525", - "topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）", - "belowSAPMaterialNum": "30052524", - "belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）" - }, - { - "id": "1", - "billNum": " 10000000009", - "knr": " 21321501481001", - "vin": "LFV2A24K2M3303680", - "hostSN": 86, - "vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020", - "topBoxPositionNum": "02", - "topSAPMaterialNum": "30052525", - "topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）", - "belowSAPMaterialNum": "30052524", - "belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）" - }, - { - "id": "1", - "billNum": " 10000000009", - "knr": " 21321501481001", - "vin": "LFV2A24K2M3303694", - "hostSN": 87, - "vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020", - "topBoxPositionNum": "03", - "topSAPMaterialNum": "30052525", - "topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）", - "belowSAPMaterialNum": "30052524", - "belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）" - }, - { - "id": "2", - "billNum": " 10000000010", - "knr": " 21321501481001", - "vin": "LFV2A24K2M3303713", - "hostSN": 88, - "vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020", - "topBoxPositionNum": "04", - "topSAPMaterialNum": "30052525", - "topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）", - "belowSAPMaterialNum": "30052524", - "belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）" - }, - { - "id": "2", - "billNum": " 10000000010", - "knr": " 21321502851001", - "vin": "LFV2A24K2M3303727", - "hostSN": 89, - "vehicleModel_DoorPlankCode": "PHEFZ_N5W_7HB_7Y0_3Y0 9VD GS0 0K3 3L5 QQ2 3FU4V020", - "topBoxPositionNum": "05", - "topSAPMaterialNum": "30052525", - "topMaterialDescription": "C8-PHEV.黑4024-左后 FZ（黑PVC多孔低扬无电镀）", - "belowSAPMaterialNum": "30052524", - "belowMaterialDescription": "C8-PHEV.黑4024-右前 FZ（黑PVC多孔低扬无电镀）" - } - - ] - -}]` //this.fileQuery.dataname = ""; console.log("打印json"); console.log(this.fileQuery.dataname); @@ -1410,8 +1209,20 @@ export default { } else { - //传给grid++接口json数据，得到返回的文件流pdfstream - this.printpdf(pdfstream);//打印我文件流 + //传给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=zhuhuban",qs.stringify(this.fileQuery)) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response);//打印我文件流 + }) } }) .catch(() => { @@ -1422,6 +1233,7 @@ export default { }) } + /**接口1获取打印数据，接口2获得grid++模板的base64编码 */ else { this.hostPrintQuery.beginVin = this.form.beginVin; @@ -1447,8 +1259,20 @@ export default { } else { - //传给grid++接口json数据，得到返回的文件流pdfstream - this.printpdf(pdfstream);//打印我文件流 + //传给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);//打印我文件流 + }) } }) @@ -1475,8 +1299,20 @@ export default { } else { - //传给grid++接口json数据，得到返回的文件流pdfstream - this.printpdf(pdfstream);//打印我文件流 + //传给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=zhuhuban",qs.stringify(this.fileQuery)) + .then((response) => { + console.log("获取文件base64编码"); + console.log(response); + this.printpdf(response);//打印我文件流 + }) } }) .catch(() => { diff --git a/vue/src/views/pg-fis/basedate/productLine/index.vue b/vue/src/views/pg-fis/basedate/productLine/index.vue index 7410942b..0bf39866 100644 --- a/vue/src/views/pg-fis/basedate/productLine/index.vue +++ b/vue/src/views/pg-fis/basedate/productLine/index.vue @@ -788,11 +788,7 @@ export default { }, /** 重置按钮操作 */ resetQuery(refName) { - this.listQuery.userName = ""; - this.listQuery.name = ""; - this.listQuery.dep = ""; - this.listQuery.productLineCode = ""; - //this.$refs[refName].resetFields(); + this.$refs[refName].resetFields(); this.handleFilter(); this.getProductLine(); }, diff --git a/vue/src/views/pg-fis/basedate/r100Online/index.vue b/vue/src/views/pg-fis/basedate/r100Online/index.vue index a0076ab5..9175b1db 100644 --- a/vue/src/views/pg-fis/basedate/r100Online/index.vue +++ b/vue/src/views/pg-fis/basedate/r100Online/index.vue @@ -108,7 +108,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + + + + + + + + + - + > + + @@ -421,7 +447,7 @@ export default { ], }, valueSelect: "", - OnlineTimeVale: [],//上线时间 + OnlineTimeValue: [],//上线时间 customerInfos: [], dialogOptions: [], versionValue: "", @@ -528,6 +554,7 @@ export default { dicTypeName:"派格车型", }, vehicleModelList:[],//车型list + ScanPointList:[{id:"0",label:" "},{id:"R100",label:"R100"},{id:"M100",label:"M100"}] }; }, mounted() { @@ -723,7 +750,7 @@ export default { }, /** 重置按钮操作 */ resetQuery(refName) { - this.OnlineTimeVale = []; + this.OnlineTimeValue = []; this.$refs[refName].resetFields(); this.handleQuery(); }, @@ -794,12 +821,12 @@ export default { getList() { this.listLoading = true; this.listQuery.SkipCount = (this.page - 1) * 10; - if (this.OnlineTimeVale != []) { - this.listQuery.OnlineTimeBegin = this.OnlineTimeVale[0]//this.OnlineTimeVale - // ? this.OnlineTimeVale[0] || "" + if (this.OnlineTimeValue != []) { + this.listQuery.OnlineTimeBegin = this.OnlineTimeValue[0]//this.OnlineTimeValue + // ? this.OnlineTimeValue[0] || "" // : ""; - this.listQuery.OnlineTimeEnd = this.OnlineTimeVale[1]//this.OnlineTimeVale - // ? this.OnlineTimeVale[1] || "" + this.listQuery.OnlineTimeEnd = this.OnlineTimeValue[1]//this.OnlineTimeValue + // ? this.OnlineTimeValue[1] || "" // : ""; } this.$axios