From fd88809b5504a39d197a8689d00c5164adaf146e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 15 Jun 2023 13:52:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?api/newjit/bill-m100/load-zhuhuban-report?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/pg-fis/basedate/m100Online/normalPritIndex.vue | 8 +------- vue/static/config.js | 9 +++++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 8a3fc0fe..16f2cd43 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -1228,7 +1228,6 @@ export default { }, valueselectChange(val) { - debugger this.$forceUpdate(); this.customerInfosMB = []; this.customerInfosZHB = []; @@ -1254,7 +1253,6 @@ export default { } }, fwStation_selectChange(val) { - debugger this.$forceUpdate(); if (this.listQuery.productType === 1) { //把产线值传到子组件 @@ -1321,7 +1319,6 @@ export default { closeDialog() {}, /**打印 */ print() { - debugger (this.hostPrintQuery = { printType: undefined, //0:打印;1:重打;2:补打; productLine: undefined, @@ -1540,7 +1537,6 @@ export default { }, save() { this.$refs.form.validate((valid) => { - debugger if (valid) { //this.listLoaddingPrint = true; if (this.isShowHostSN === true) { @@ -1719,7 +1715,6 @@ export default { */ private_printMenBan() { - debugger this.$axios .posts( "/api/newjit/bill-m100/save-menban-report", @@ -1790,7 +1785,6 @@ export default { */ private_printZhuHuBan(isSelAll = true) { - debugger //门板 //传递大众顺序号起止 this.$axios @@ -1812,6 +1806,7 @@ export default { let loadInput = {}; loadInput.dataResultType = (isSelAll == true) ? "1" : "2"; loadInput.reportIdList = response.item; + loadInput.productLine = this.hostPrintQuery.productLine //-------------------------------------- //门板 //传递大众顺序号起止 @@ -1885,7 +1880,6 @@ export default { .then((response) => { //console.log(response); this.PLList = response.item; - debugger this.PLChildList = this.PLList.filter( (u) => u.productType === parseInt(this.listQuery.productType) ).sort((a, b) => { diff --git a/vue/static/config.js b/vue/static/config.js index f46b6f51..ac242e3a 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -2,12 +2,13 @@ let configJSON if (process.env.NODE_ENV === 'development') { configJSON = { base: { - //ip: 'http://192.168.0.140', - ip: 'http://127.0.0.1', //?? two + ip: 'http://192.168.7.21', + // ip: 'http://192.168.0.140', + // ip: 'http://127.0.0.1', //?? two auth_port: '8066', public_port: '8092', - //backend_port: '8092', - backend_port: '44344', //?? three + backend_port: '8092', + // backend_port: '44344', //?? three }, basic: {}, upload: { From 9551272e62bd3ec106b2a9d1e2644c14095daa93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Thu, 15 Jun 2023 13:54:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?api=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/static/config.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vue/static/config.js b/vue/static/config.js index ac242e3a..7bdc818a 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -2,13 +2,13 @@ let configJSON if (process.env.NODE_ENV === 'development') { configJSON = { base: { - ip: 'http://192.168.7.21', - // ip: 'http://192.168.0.140', - // ip: 'http://127.0.0.1', //?? two + // ip: 'http://192.168.7.21',//new + // ip: 'http://192.168.0.140',//old + ip: 'http://127.0.0.1', //?? two auth_port: '8066', public_port: '8092', - backend_port: '8092', - // backend_port: '44344', //?? three + // backend_port: '8092', + backend_port: '44344', //?? three }, basic: {}, upload: { From 2c5da653b993e05900c251ee9eca206dfca25dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 26 Jun 2023 15:44:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E6=89=93=E5=8D=B0M100?= =?UTF-8?q?=E4=BF=A1=E6=81=AFtable=E8=87=AA=E9=80=82=E5=BA=94=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedate/m100Online/normalPritIndex.vue | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index cbc36b79..746b4c28 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -244,7 +244,7 @@ -
+
{ - var offsetHei = document.documentElement.clientHeight; - //console.log(offsetHei); - let boxH = this.$refs.box.offsetHeight; - this.tableHeight = offsetHei - boxH - 67 - 79; //57为footer高度，79为页面上部标签高度 - //this.tableHeight = offsetHei -260 - }); + this.setTableHeight() let timer = setInterval(() => { this.open(); @@ -766,6 +760,15 @@ export default { ...mapGetters(["userInfo"]), //获取当前用户信息 }, methods: { + setTableHeight(){ + this.$nextTick(() => { + var offsetHei = document.documentElement.clientHeight; + //console.log(offsetHei); + let boxH = this.$refs.box.offsetHeight; + this.tableHeight = offsetHei - boxH - 67 - 79 - 10; //57为footer高度，79为页面上部标签高度 + //this.tableHeight = offsetHei -260 + }); + }, opens() { this.getList(); @@ -820,7 +823,7 @@ export default { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { //写提示信息 console.log( - "222222222222222222222222222222222222222222222222" + "222222222222222222222222222222222222222222222222-1" ); this.$refs.sp01.style.color = "red"; this.$refs.sp01.style.fontWeight = "bold"; @@ -837,8 +840,9 @@ export default { if (JKITEM.timeoutMinutes >= JKITEM.configMinutes) { //写提示信息 console.log( - "222222222222222222222222222222222222222222222222" + "222222222222222222222222222222222222222222222222-2" ); + this.setTableHeight() this.$refs.sp05.style.color = "red"; this.$refs.sp05.style.fontWeight = "bold"; } else { @@ -1914,6 +1918,7 @@ export default { return a.productLineCode - b.productLineCode; }); //console.log(this.PLList) + this.setTableHeight() //变更打印按钮文字 if (this.listQuery.productType === 1) { this.$refs.btn1.$el.innerText = "打印门板发货排序单"; @@ -1929,6 +1934,7 @@ export default { this.listQuery.state = []; this.isShowState = false; } + if (this.listQuery.productType === 2) { this.listQueryList.ZHBBillStatus = 2; } else {