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

public/static/weightCheck.html

@@ -20,7 +20,7 @@
 
       .content {
         width: 1000px;
-        padding: 70px 20px 20px 20px;
+        padding: 30px 20px 20px 20px;
         font-size: 18px;
         position: absolute;
         top: 0;

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -10,7 +10,7 @@
       <div>No.</div>
     </div>
     <div class="header-top">
-      <div>开票日期：{{printData.currentTime}}</div>
+      <div>开票日期：{{printData.createDate}}</div>
       <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
       <div class="number">{{dealNo(printData.paymentNo)}}</div>
     </div>

src/views/houseSelfCollect/weightCheck.vue

@@ -282,7 +282,7 @@
         getweighingList({
             compId: sessionStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
-            pageSize: this.pageSize,
+            pageSize: 100,
             searchKeyWord: '',
             warehouseName: sessionStorage.getItem('ck'),
             managementType: 1
@@ -453,7 +453,7 @@
             // console.log("receData",receData);
             var flag = false;
             var flag1 = false;
-            if (this.warehouseName && this.warehouseName == '山东诸城迈饶库') {
+            if (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 == '山东诸城迈饶库'){
+				if(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

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

src/views/warehouse/warehouseManagementNoWeightIn.vue

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

src/views/warehouse/warehouseManagementNoWeightOut.vue

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

src/views/warehouse/warehouseManagementTare.vue

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

vue.config.js

@@ -141,7 +141,6 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        // target: 'http://192.168.1.107/:8090/',
         target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址