Skip to content

T
tl_estate
Commit abdb91a5 authored by clone's avatar clone
Browse files
Options

Merge branch '0225-v3.1.0' of https://gitee.com/zwyjjc/tl_estate into 0225-v3.1.0

parents 66c60ab7 18452de7
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 3 deletions
application/api_broker/controller/Performance.php
View file @ abdb91a5
...@@ -661,14 +661,15 @@ class Performance extends Basic ...@@ -661,14 +661,15 @@ class Performance extends Basic
/** /**
* 收款信息 * 收款信息
* @return \think\Response * @return \think\Response
* http://showdoc.tonglianjituan.com/index.php?s=/1&page_id=815
*/ */
public function collectionListByBargainId() public function collectionListByBargainId()
{ {
header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Origin:*');
$params = $this->params; $params = $this->params;
/* $params = array( /*$params = array(
"bargain_id" => 1, "bargain_id" => 121,
"agent_id" => 80, "agent_id" => 5775,
);*/ );*/
$checkResult = $this->validate($params, "PerformanceValidate.verifyCollectionList"); $checkResult = $this->validate($params, "PerformanceValidate.verifyCollectionList");
......
public/appnew/src/components/priceReport/priceReport.vue
View file @ abdb91a5
...@@ -284,6 +284,7 @@ ...@@ -284,6 +284,7 @@
initAgencyList : function(list){ initAgencyList : function(list){
let that = this ; let that = this ;
console.log(list); console.log(list);
var listArray = [{ var listArray = [{
"msg" : "收款ID" , "msg" : "收款ID" ,
"str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-", "str1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
...@@ -368,6 +369,12 @@ ...@@ -368,6 +369,12 @@
"str2" : list.length > 1 ? (list[1].is_dividend == 1 ? "否" : "是") :"-", "str2" : list.length > 1 ? (list[1].is_dividend == 1 ? "否" : "是") :"-",
"str3" : list.length > 2 ? (list[2].is_dividend == 1 ? "否" : "是") :"-", "str3" : list.length > 2 ? (list[2].is_dividend == 1 ? "否" : "是") :"-",
}, },
{
"msg" : "入账日期" ,
"str1" : list.length > 0 ? (list[0].income_time ? list[0].income_time : "-") :"-",
"str2" : list.length > 1 ? (list[1].income_time ? list[1].income_time : "-") :"-",
"str3" : list.length > 2 ? (list[2].income_time ? list[2].income_time : "-") :"-",
},
{ {
"msg" : "资料" , "msg" : "资料" ,
"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-", "id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
...@@ -465,6 +472,12 @@ ...@@ -465,6 +472,12 @@
"str2" : list.length > 1 ? (list[1].remark ? list[1].remark : "-") :"-", "str2" : list.length > 1 ? (list[1].remark ? list[1].remark : "-") :"-",
"str3" : list.length > 2 ? (list[2].remark ? list[2].remark : "-") :"-", "str3" : list.length > 2 ? (list[2].remark ? list[2].remark : "-") :"-",
}, },
{
"msg" : "入账日期" ,
"str1" : list.length > 0 ? (list[0].income_time != "" ? list[0].income_time : "-") :"-",
"str2" : list.length > 1 ? (list[1].income_time != "" ? list[1].income_time : "-") :"-",
"str3" : list.length > 2 ? (list[2].income_time != "" ? list[2].income_time : "-") :"-",
},
{ {
"msg" : "资料" , "msg" : "资料" ,
"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-", "id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
...@@ -545,6 +558,12 @@ ...@@ -545,6 +558,12 @@
"str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-", "str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-",
"str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-", "str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-",
}, },
{
"msg" : "入账日期" ,
"str1" : list.length > 0 ? (list[0].income_time != "" ? list[0].income_time : "-") :"-",
"str2" : list.length > 1 ? (list[1].income_time != "" ? list[1].income_time : "-") :"-",
"str3" : list.length > 2 ? (list[2].income_time != "" ? list[2].income_time : "-") :"-",
},
{ {
"msg" : "资料" , "msg" : "资料" ,
"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-", "id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
...@@ -619,6 +638,12 @@ ...@@ -619,6 +638,12 @@
"str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-", "str2" : list.length > 1 ? (list[1].receipt_number ? list[1].receipt_number : "-") :"-",
"str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-", "str3" : list.length > 2 ? (list[2].receipt_number ? list[2].receipt_number : "-") :"-",
}, },
{
"msg" : "入账日期" ,
"str1" : list.length > 0 ? (list[0].income_time != "" ? list[0].income_time : "-") :"-",
"str2" : list.length > 1 ? (list[1].income_time != "" ? list[1].income_time : "-") :"-",
"str3" : list.length > 2 ? (list[2].income_time != "" ? list[2].income_time : "-") :"-",
},
{ {
"msg" : "资料" , "msg" : "资料" ,
"id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-", "id1" : list.length > 0 ? (list[0].id ? list[0].id : "-") :"-",
......
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