Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/weightCheck.html

@@ -440,7 +440,7 @@
           console.log(this.tableData)
         }
         // sessionStorage.setItem('record_print', JSON.stringify(response))
-        this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
+        // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
 
         document.title = "粮食检斤单"
         window.print()

src/views/home/index.vue

@@ -360,7 +360,9 @@
       //    }, 2000);
       //获取新闻列表
       // this.getNewList()
-      gChartsData().toPromise().then(res => {
+      gChartsData({
+        compId:localStorage.getItem('ws-pf_compId')
+      }).toPromise().then(res => {
         console.log(res)
         this.chartsData = res
         this.carCount1 = res[6].biViewInfoList[0].count

src/views/houseSelfCollect/weightCheck.vue

@@ -499,7 +499,7 @@
                 }
               }
             }
-            else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
+            else if (this.warehouseName && (this.warehouseName == '顺诚粮库'||this.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)

src/views/outboundManagement/weighing.vue

@@ -233,7 +233,7 @@
 						}
 					}
 				}
-				else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
+				else if (this.warehouseName && (this.warehouseName == '顺诚粮库'||this.warehouseName == '鲅鱼圈金信库')) {
 					for (var i = value.length - 1; i >= 0; i--) {
 						var tmp = String.fromCharCode(value[i])
 						console.log(tmp)

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -524,7 +524,7 @@
                 this.dataList.tare = parseInt(result)
               }
             }
-            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺诚粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -460,7 +460,7 @@
                 this.dataList.grossWeight = parseInt(result)
               }
             }
-            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺城粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
+            else if (this.deptBudgetList1.warehouseName && (this.deptBudgetList1.warehouseName == '顺诚粮库'||this.deptBudgetList1.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)

src/views/warehouse/warehouseManagementTare.vue

@@ -446,7 +446,7 @@
                 }
               }
             }
-            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺城粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
+            else if (this.deptBudgetList.warehouseName && (this.deptBudgetList.warehouseName == '顺诚粮库'||this.deptBudgetList.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)