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

src/views/houseSelfCollect/weightCheck.vue

@@ -460,7 +460,7 @@
             // console.log("receData",receData);
             var flag = false;
             var flag1 = false;
-            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')) {
+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/outboundManagement/weighing.vue

@@ -213,7 +213,7 @@
 				// else{
 				// 	this.weighingList.tare = parseInt(result) 
 				// }
-				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')){
+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'){
 					for (var i = 0; i < value.length; i++) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '+') {

src/views/warehouse/warehouseManagementGross.vue

@@ -762,7 +762,7 @@ export default {
           //   }
           // }
           console.log('value:',value);
-          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
+          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -703,7 +703,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.tare = parseInt(result)
           // }
-          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
+          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -596,7 +596,7 @@ export default {
           // if(parseInt(result)){
           //     this.dataList.grossWeight = parseInt(result)
           // }
-          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
+          if(this.deptBudgetList1.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {

src/views/warehouse/warehouseManagementTare.vue

@@ -562,7 +562,7 @@ export default {
           //     this.deptBudgetList.tare = parseInt(result)
           //   }
           // }
-          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库')){
+          if(this.deptBudgetList.warehouseName&&(this.deptBudgetList.warehouseName == '山东诸城迈饶库'||this.deptBudgetList.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库')){
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {