| 
					
				 | 
			
			
				@@ -3476,7 +3476,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fOriginalbilldate: e.fOriginalbilldate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fOriginalbillno: e.fOriginalbillno, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fPackagespecs: e.fPackagespecs, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fGrossweight: e.fGrossweightblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          fGrossweight: e.fGrossweightblc2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fNetweight: e.fNetweightblc2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fQty: e.fQtyblc2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fCntqty: 1, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -3491,7 +3491,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fDriverName: this.whgenlegList.fDriverName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fDriverTel: this.whgenlegList.fDriverTel, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fDriverIdCar: this.whgenlegList.fDriverIdCar, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          fBusinessType: e.fBusinessType + "", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          fBusinessType: e.fBusinessType ? e.fBusinessType.toString() : null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           fWarehouseInformation: e.fWarehouseids, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -4452,24 +4452,12 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.whgenlegParams.fWarehouseid = this.form.fWarehouseid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       listWhgenleg(this.whgenlegParams).then((response) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        response.rows.map((e) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          e.fQtyblc2 = e.fQtyblc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          e.fGrossweightblc2 = e.fGrossweightblc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          e.fNetweightblc2 = e.fNetweightblc; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.whgenlegList = response.rows; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        this.whgenlegList = this.whgenlegList.reduce((res, e) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          res.push({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fMblno: e.fMblno, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fOriginalbilldate: e.fOriginalbilldate, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fGoodsids: e.fGoodsids, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fCntrno: e.fCntrno, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fQtyblc: e.fQtyblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fGrossweightblc: e.fGrossweightblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fNetweightblc: e.fNetweightblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fWarehouseids: e.fWarehouseids, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fMarks: e.fMarks, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fQtyblc2: e.fQtyblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fGrossweightblc2: e.fGrossweightblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            fNetweightblc2: e.fNetweightblc, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          return res; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }, []); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.whgenlegTotal = response.total; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 |