diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue index f05fe1c..76eaaa4 100644 --- a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue +++ b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue @@ -499,7 +499,13 @@ export default { label: "顺序号", prop: "hostSN2", width: 120, + }); + tempsTabs.push({ + label: "打印类型", + prop: "printType", + width: 120, }); + // tempsTabs.push({ // label: "柱护板状态", // prop: "printBillNum", @@ -693,6 +699,10 @@ export default { } return moment(date).format("YYYY-MM-DD HH:mm:ss"); } + + if (column.property === "printType") { + return { 1: "顺序打印", 2: "补账打印" }[row[column.property]]; + } // if (column.property === "canNotPrint") { // return { true: "是", false: "否" }[row[column.property]]; // } @@ -739,7 +749,7 @@ export default { } else { this.listQuery.BusinessType = 1 } - this.listQuery.PrintType = 1; + this.listQuery.PrintType = null; } console.log("M100查询条件:" + JSON.stringify(this.listQuery)); diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue index 7f88079..2f628a9 100644 --- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue +++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue @@ -811,7 +811,7 @@ export default { }); return; } else { - console.log("超时提醒-接口传过来的值:" + JSON.stringify(response.item)); + //console.log("超时提醒-接口传过来的值:" + JSON.stringify(response.item)); if (response.item !== null) { this.tipper = "" @@ -975,6 +975,7 @@ export default { }, //抽屉 handleDrawerOpen(param) { + debugger this.drawer = true; var parentId = param.assemblyID; //主键id this.customerInfos = [ @@ -1167,6 +1168,7 @@ export default { .then((response) => { this.list = response.items; this.totalCount = response.totalCount; + debugger setTimeout(() => { //大数据量加载时 this.listLoading = false; diff --git a/vue/static/config.js b/vue/static/config.js index 0b4783c..ebf7976 100644 --- a/vue/static/config.js +++ b/vue/static/config.js @@ -35,11 +35,11 @@ if (process.env.NODE_ENV === "development") { // 发布环境 configJSON = { base: { - //ip: "http://192.168.0.140", + // ip: "http://192.168.0.140", // auth_port: "8066", // public_port: "8092", // backend_port: "8092", - ip: "http://222.169.228.163", + ip: "http://222.169.228.163", auth_port: "7696", public_port: "7692", backend_port: "7692",