Commit f1f5e02b authored by agping's avatar agping

h5财务日报修改

parent 9de75aec
...@@ -76,10 +76,10 @@ ...@@ -76,10 +76,10 @@
data() { data() {
let _this = this; let _this = this;
let _token = _this.$route.query.token; let _token = _this.$route.query.token;
if(!_token) { // if(!_token) {
layer.tipsX('token获取出错'); // layer.tipsX('token获取出错');
return false; // return false;
}; // };
return { return {
headerData: { headerData: {
'title': '财务日报', 'title': '财务日报',
...@@ -120,6 +120,10 @@ ...@@ -120,6 +120,10 @@
checkList : [] , checkList : [] ,
time : '', time : '',
max : '' , max : '' ,
typeExtLiu0:0,
typeExtLiu1:0,
typeExtLiu2:0,
} }
}, },
created() { created() {
...@@ -209,10 +213,14 @@ ...@@ -209,10 +213,14 @@
initData : function(){ initData : function(){
let that = this ; let that = this ;
var params = { var params = {
'AuthToken': that.urlParams.token, // 'AuthToken': that.urlParams.token,
'store_id': that.urlParams.store_id, // 'store_id': that.urlParams.store_id,
'is_store': that.urlParams.is_store, // 'is_store': that.urlParams.is_store,
'daily_data': that.time // 'daily_data': that.time
'AuthToken': 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJkYXRhIjp7ImlkIjoxLCJuYW1lIjoiXHU3YmExXHU3NDA2XHU1NDU4IiwicGhvbmUiOiJyb290IiwibGV2ZWwiOjQwfSwidGltZVN0YW1wXyI6MTU1MjUyODI3Mn0.kh31IzuM6GEVnJHgH7KcLC6N67Rdm_9aq7GrUWv8bfA',
'store_id': 730,
'is_store': 1,
'daily_data': '2018-12-19'
}; };
that.axios({ that.axios({
method: 'get', method: 'get',
...@@ -286,7 +294,15 @@ ...@@ -286,7 +294,15 @@
//生成中介费数组数据 //生成中介费数组数据
initAgencyList : function(list){ initAgencyList : function(list){
let that = this ; let that = this ;
console.log(list); if(list[0].type_ext == 0){//由中介费类型 判断类型
that.typeExtLiu0 = 0.7;
};
if(list[1].type_ext == 0){
that.typeExtLiu1 = 0.7;
};
if(list[2].type_ext == 0){
that.typeExtLiu2 = 0.7;
};
var listArray = [{ var listArray = [{
"msg" : "收款ID" , "msg" : "收款ID" ,
...@@ -314,9 +330,9 @@ ...@@ -314,9 +330,9 @@
}, },
{ {
"msg" : "应收金额" , "msg" : "应收金额" ,
"str1" : list.length > 0 ? (list[0].price * 0.7 ? (list[0].price * 0.7).toFixed(2) : "-") :"-", "str1" : list.length > 0 ? (list[0].price * that.typeExtLiu0 ? (list[0].price * that.typeExtLiu0).toFixed(2) : "-") :"-",
"str2" : list.length > 1 ? (list[1].price * 0.7 ? (list[1].price * 0.7).toFixed(2) : "-") :"-", "str2" : list.length > 1 ? (list[1].price * that.typeExtLiu1 ? (list[1].price * that.typeExtLiu1).toFixed(2) : "-") :"-",
"str3" : list.length > 2 ? (list[2].price * 0.7 ? (list[2].price * 0.7).toFixed(2) : "-") :"-", "str3" : list.length > 2 ? (list[2].price * that.typeExtLiu2 ? (list[2].price * that.typeExtLiu2).toFixed(2) : "-") :"-",
}, },
{ {
"msg" : "本次收佣" , "msg" : "本次收佣" ,
...@@ -330,11 +346,17 @@ ...@@ -330,11 +346,17 @@
"str2" : list.length > 1 ? (list[1].received_money ? list[1].received_money : "-") :"-", "str2" : list.length > 1 ? (list[1].received_money ? list[1].received_money : "-") :"-",
"str3" : list.length > 2 ? (list[2].received_money ? list[2].received_money : "-") :"-", "str3" : list.length > 2 ? (list[2].received_money ? list[2].received_money : "-") :"-",
}, },
{
"msg" : "手续费" ,
"str1" : list.length > 0 ? (list[0].transaction_fee ? list[0].transaction_fee : "-") :"-",
"str2" : list.length > 1 ? (list[1].transaction_fee ? list[1].transaction_fee : "-") :"-",
"str3" : list.length > 2 ? (list[2].transaction_fee ? list[2].transaction_fee : "-") :"-",
},
{ {
"msg" : "多收金额" , "msg" : "多收金额" ,
"str1" : list.length > 0 ? (list[0].money - list[0].price * 0.7 ? (list[0].money - list[0].price * 0.7).toFixed(2) : "-") :"-", "str1" : list.length > 0 ? (list[0].money - list[0].price * that.typeExtLiu0 ? (list[0].money - list[0].price * that.typeExtLiu0).toFixed(2) : "-") :"-",
"str2" : list.length > 1 ? (list[1].money - list[1].price * 0.7 ? (list[1].money - list[1].price * 0.7).toFixed(2) : "-") :"-", "str2" : list.length > 1 ? (list[1].money - list[1].price * that.typeExtLiu1 ? (list[1].money - list[1].price * that.typeExtLiu1).toFixed(2) : "-") :"-",
"str3" : list.length > 2 ? (list[2].money - list[2].price * 0.7 ? (list[2].money - list[2].price * 0.7).toFixed(2) : "-") :"-", "str3" : list.length > 2 ? (list[2].money - list[2].price * that.typeExtLiu2 ? (list[2].money - list[2].price * that.typeExtLiu2).toFixed(2) : "-") :"-",
}, },
{ {
"msg" : "支付方式" , "msg" : "支付方式" ,
...@@ -427,6 +449,12 @@ ...@@ -427,6 +449,12 @@
"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-", "str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-", "str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
}, },
{
"msg" : "手续费" ,
"str1" : list.length > 0 ? (list[0].transaction_fee ? list[0].transaction_fee : "-") :"-",
"str2" : list.length > 1 ? (list[1].transaction_fee ? list[1].transaction_fee : "-") :"-",
"str3" : list.length > 2 ? (list[2].transaction_fee ? list[2].transaction_fee : "-") :"-",
},
{ {
"msg" : "之前已收佣" , "msg" : "之前已收佣" ,
"str1" : list.length > 0 ? (list[0].received_money ? list[0].received_money : "-") :"-", "str1" : list.length > 0 ? (list[0].received_money ? list[0].received_money : "-") :"-",
...@@ -531,6 +559,12 @@ ...@@ -531,6 +559,12 @@
"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-", "str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-", "str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
}, },
{
"msg" : "手续费" ,
"str1" : list.length > 0 ? (list[0].transaction_fee ? list[0].transaction_fee : "-") :"-",
"str2" : list.length > 1 ? (list[1].transaction_fee ? list[1].transaction_fee : "-") :"-",
"str3" : list.length > 2 ? (list[2].transaction_fee ? list[2].transaction_fee : "-") :"-",
},
{ {
"msg" : "支付方式" , "msg" : "支付方式" ,
"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-", "str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
...@@ -611,6 +645,12 @@ ...@@ -611,6 +645,12 @@
"str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-", "str2" : list.length > 1 ? (list[1].money ? list[1].money : "-") :"-",
"str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-", "str3" : list.length > 2 ? (list[2].money ? list[2].money : "-") :"-",
}, },
{
"msg" : "手续费" ,
"str1" : list.length > 0 ? (list[0].transaction_fee ? list[0].transaction_fee : "-") :"-",
"str2" : list.length > 1 ? (list[1].transaction_fee ? list[1].transaction_fee : "-") :"-",
"str3" : list.length > 2 ? (list[2].transaction_fee ? list[2].transaction_fee : "-") :"-",
},
{ {
"msg" : "支付方式" , "msg" : "支付方式" ,
"str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-", "str1" : list.length > 0 ? (list[0].pay_type ? that.payType(list[0].pay_type) : "-") :"-",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment