财务日报 多收金额 修改

public/appnew/src/components/priceReport/priceReport.vue

@@ -76,10 +76,10 @@
 		data() {
 			let _this = this;
 			let _token = _this.$route.query.token;
-			if(!_token) { 
-				layer.tipsX('token获取出错');
-				return false;
-			};
+//			if(!_token) { 
+//				layer.tipsX('token获取出错');
+//				return false;
+//			};
 			return {
 				headerData: {
 					'title': '财务日报',
@@ -123,6 +123,10 @@
 				typeExtLiu0:0,
 				typeExtLiu1:0,
 				typeExtLiu2:0,
+				receivedMoneyLiu1:0,
+				receivedMoneyLiu2:0,
+				receivedMoneyLiu3:0,
+				
 				
 			}
 		},
@@ -213,10 +217,14 @@
 			initData : function(){
 				let that = this ; 
 				var params = {
-					'AuthToken': that.urlParams.token,
-					'store_id': that.urlParams.store_id,
-					'is_store': that.urlParams.is_store,
-					'daily_data': that.time
+//					'AuthToken': that.urlParams.token,
+//					'store_id': that.urlParams.store_id,
+//					'is_store': that.urlParams.is_store,
+//					'daily_data': that.time
+'AuthToken': 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjoxLCJuYW1lIjoiXHU3YmExXHU3NDA2XHU1NDU4IiwicGhvbmUiOiJyb290IiwibGV2ZWwiOjQwfSwidGltZVN0YW1wXyI6MTU1MjUyODI3Mn0.kh31IzuM6GEVnJHgH7KcLC6N67Rdm_9aq7GrUWv8bfA',
+					'store_id': 730,
+					'is_store': 1,
+					'daily_data': '2018-12-19'
 				};
 				that.axios({
 					method: 'get',
@@ -292,12 +300,17 @@
 				let that = this  ; 
                 if(list[0].type_ext == 0){//由中介费类型 判断类型
                 	that.typeExtLiu0 = 0.7;
+                	that.receivedMoneyLiu0 = list[0].received_money*1;
                 };
                 if(list[1].type_ext == 0){
                 	that.typeExtLiu1 = 0.7;
+                	that.receivedMoneyLiu1 = list[1].received_money*1;
+                	
                 };
                 if(list[2].type_ext == 0){
                 	that.typeExtLiu2 = 0.7;
+                	that.receivedMoneyLiu2 = list[2].received_money*1
+                	
                 };
 
 				var listArray = [{   
@@ -350,9 +363,9 @@
 							},
 							{ 
 								"msg" : "多收金额" ,
-								"str1" : list.length > 0 ? (list[0].money - list[0].price * that.typeExtLiu0 +  list[0].received_money*1? (list[0].money - list[0].price * that.typeExtLiu0 + list[0].received_money*1).toFixed(2) : "-") :"-",
-								"str2" : list.length > 1 ? (list[1].money - list[1].price * that.typeExtLiu1 +  list[1].received_money*1? (list[1].money - list[1].price * that.typeExtLiu1 + list[1].received_money*1).toFixed(2) : "-") :"-",
-								"str3" : list.length > 2 ? (list[2].money - list[2].price * that.typeExtLiu2 +  list[2].received_money*1? (list[2].money - list[2].price * that.typeExtLiu2 + list[2].received_money*1).toFixed(2) : "-") :"-",
+								"str1" : list.length > 0 ? (list[0].money - list[0].price * that.typeExtLiu0 +  that.receivedMoneyLiu0*1? (list[0].money - list[0].price * that.typeExtLiu0 + that.receivedMoneyLiu0*1).toFixed(2) : "-") :"-",
+								"str2" : list.length > 1 ? (list[1].money - list[1].price * that.typeExtLiu1 +  that.receivedMoneyLiu1*1? (list[1].money - list[1].price * that.typeExtLiu1 + that.receivedMoneyLiu1*1).toFixed(2) : "-") :"-",
+								"str3" : list.length > 2 ? (list[2].money - list[2].price * that.typeExtLiu2 +  that.receivedMoneyLiu2*1? (list[2].money - list[2].price * that.typeExtLiu2 + that.receivedMoneyLiu2*1).toFixed(2) : "-") :"-",
 							},
 							{ 
 								"msg" : "支付方式" ,