Merge branch 'FoShanPG' of http://dev.ccwin-in.com:3000/PG/Win.Sfs.SmartSettlementSystem.PG into FoShanPG

vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@@ -244,7 +244,7 @@
       <ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
     </el-drawer>
 
-    <div class="l-table" style="margin-top: -10px">
+    <div class="l-table" style="margin-top: -15px">
       <!--表格渲染-->
       <el-table
         ref="multipleTable"
@@ -434,7 +434,7 @@
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
-        style="margin-bottom: -5px; float: right"
+        style="float: right"
         :page.sync="page"
         :limit.sync="listQuery.MaxResultCount"
         @pagination="getList"
@@ -674,13 +674,7 @@ export default {
     };
   },
   mounted() {
-    this.$nextTick(() => {
+    this.setTableHeight()
-      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
-    });
 
     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 {
@@ -1232,7 +1236,6 @@ export default {
     },
 
     valueselectChange(val) {
-		debugger
       this.$forceUpdate();
       this.customerInfosMB = [];
       this.customerInfosZHB = [];
@@ -1258,7 +1261,6 @@ export default {
       }
     },
 	fwStation_selectChange(val) {
-	  debugger
 	  this.$forceUpdate();
       if (this.listQuery.productType === 1) {
         //把产线值传到子组件
@@ -1325,7 +1327,6 @@ export default {
     closeDialog() {},
     /**打印 */
     print() {
-		debugger
       (this.hostPrintQuery = {
         printType: undefined, //0:打印;1:重打;2:补打;
         productLine: undefined,
@@ -1544,7 +1545,6 @@ export default {
     },
     save() {
       this.$refs.form.validate((valid) => {
-        debugger
         if (valid) {
           //this.listLoaddingPrint = true;
           if (this.isShowHostSN === true) {
@@ -1722,7 +1722,6 @@ export default {
 	 */
 	private_printMenBan()
 	{
-		debugger
 		this.$axios
 		  .posts(
 			"/api/newjit/bill-m100/save-menban-report",
@@ -1793,7 +1792,6 @@ export default {
 	 */
 	private_printZhuHuBan(isSelAll = true)
 	{
-		debugger
 		//门板
 		//传递大众顺序号起止
 		this.$axios
@@ -1815,6 +1813,7 @@ export default {
 				let loadInput = {};
 				loadInput.dataResultType = (isSelAll == true) ? "1" : "2";
 				loadInput.reportIdList = response.item;
+        loadInput.productLine = this.hostPrintQuery.productLine
 				//--------------------------------------
 				//门板
 				//传递大众顺序号起止
@@ -1888,7 +1887,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) => {
@@ -1920,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 = "打印门板发货排序单";
@@ -1935,6 +1934,7 @@ export default {
         this.listQuery.state = [];
         this.isShowState = false;
       }
+      
       if (this.listQuery.productType === 2) {
         this.listQueryList.ZHBBillStatus = 2;
       } else {

vue/static/config.js

@@ -2,7 +2,8 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-		//ip: 'http://192.168.0.140',
+    // 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',