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

src/views/contractManagement/purchaseContract.vue

@@ -498,7 +498,7 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if(response.records[i].completedQuantity){
-              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+              response.records[i].completedQuantity=response.records[i].completedQuantity.toFixed(3)
             }
             
             if (response.records[i].addressUrl != null) {

src/views/contractManagement/salesContract.vue

@@ -514,7 +514,7 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if(response.records[i].completedQuantity){
-              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+              response.records[i].completedQuantity=response.records[i].completedQuantity.toFixed(3)
             }
             if (response.records[i].addressUrl != null) {
               if (response.records[i].addressUrl != '') {

src/views/houseSelfCollect/weightCheck.vue

@@ -500,13 +500,13 @@
               }
             }
             else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
-              console.log(value)
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/outboundManagement/weighing.vue

@@ -236,11 +236,12 @@
 				else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
 					for (var i = value.length - 1; i >= 0; i--) {
 						var tmp = String.fromCharCode(value[i])
-						if (tmp == '=') {
-							flag = true
+						console.log(tmp)
+						if (String.fromCharCode(value[0]) == '.') {
+						flag = true
 						}
-						if (flag && result.length < 9 && tmp != '=') {
-							result += tmp
+						if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
+						result += tmp
 						}
 					}
 					if (this.tpyeNo != 2) {

src/views/warehouse/warehouseManagementGross.vue

@@ -504,10 +504,11 @@
             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])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -527,10 +527,11 @@
             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])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -463,10 +463,11 @@
             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])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }

src/views/warehouse/warehouseManagementTare.vue

@@ -441,10 +441,11 @@
             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])
-                if (tmp == '=') {
+                console.log(tmp)
+                if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '=') {
+                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
                   result += tmp
                 }
               }