Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
3cc480d1
Commit
3cc480d1
authored
Nov 09, 2018
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
b952de97
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
7 deletions
+11
-7
account_statement.html
application/index/view/finance/account_statement.html
+2
-2
commission.html
application/index/view/finance/commission.html
+1
-0
public.js
public/appnew/src/assets/js/public.js
+1
-0
reportList.js
public/resource/js/reportList.js
+2
-1
commission_template_tpl.html
public/resource/template/commission_template_tpl.html
+1
-0
real_time_performance_template_tpl.html
...resource/template/real_time_performance_template_tpl.html
+4
-4
No files found.
application/index/view/finance/account_statement.html
View file @
3cc480d1
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
font-size
:
16px
;
font-size
:
16px
;
font-weight
:
600
;
font-weight
:
600
;
float
:
left
;
float
:
left
;
margin-left
:
3
2px
;
margin-left
:
1
2px
;
}
}
#maintable_form_search
>
span
.total-commission
{
#maintable_form_search
>
span
.total-commission
{
margin-top
:
16px
;
margin-top
:
16px
;
...
@@ -130,11 +130,11 @@
...
@@ -130,11 +130,11 @@
<ul
class=
"user-ul"
></ul>
<ul
class=
"user-ul"
></ul>
</div>
</div>
<input
class=
"form-control btn2"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"bargain_id"
placeholder=
"成交报告id"
type=
"text"
value=
""
>
<input
class=
"form-control btn2"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"bargain_id"
placeholder=
"成交报告id"
type=
"text"
value=
""
>
<input
class=
"form-control btn2"
data-rule-phoneus=
"false"
data-rule-required=
"false"
id=
"maintable_user_ID"
placeholder=
"客户ID"
type=
"text"
value=
""
>
<span
class=
"total-commission"
>
应收佣金总计:
<span
class=
"total-commission-should"
></span>
元
</span>
<span
class=
"total-commission"
>
应收佣金总计:
<span
class=
"total-commission-should"
></span>
元
</span>
<span
class=
"total-commission"
>
已收佣金总计:
<span
class=
"total-commission-real"
></span>
元
</span>
<span
class=
"total-commission"
>
已收佣金总计:
<span
class=
"total-commission-real"
></span>
元
</span>
<span
class=
"total-commission"
>
未收佣金总计:
<span
class=
"total-commission-no"
></span>
元
</span>
<span
class=
"total-commission"
>
未收佣金总计:
<span
class=
"total-commission-no"
></span>
元
</span>
<div
class=
"clear"
>
<div
class=
"clear"
>
</div>
</div>
<span
class=
"btn btn-info btn3 search"
id=
"maintable_search"
>
搜索
</span>
<span
class=
"btn btn-info btn3 search"
id=
"maintable_search"
>
搜索
</span>
<span
class=
"btn btn-info btn3"
id=
"maintable_reset"
>
重置
</span>
<span
class=
"btn btn-info btn3"
id=
"maintable_reset"
>
重置
</span>
...
...
application/index/view/finance/commission.html
View file @
3cc480d1
...
@@ -129,6 +129,7 @@
...
@@ -129,6 +129,7 @@
<th
class=
"text-center"
>
业务员
</th>
<th
class=
"text-center"
>
业务员
</th>
<th
class=
"text-center"
>
商铺地址
</th>
<th
class=
"text-center"
>
商铺地址
</th>
<th
class=
"text-center"
>
商铺号
</th>
<th
class=
"text-center"
>
商铺号
</th>
<th
class=
"text-center"
>
分佣比例
</th>
<th
class=
"text-center"
>
应分佣金(元)
</th>
<th
class=
"text-center"
>
应分佣金(元)
</th>
<th
class=
"text-center"
>
实收佣金(元)
</th>
<th
class=
"text-center"
>
实收佣金(元)
</th>
<th
class=
"text-center"
>
操作
</th>
<th
class=
"text-center"
>
操作
</th>
...
...
public/appnew/src/assets/js/public.js
View file @
3cc480d1
...
@@ -137,6 +137,7 @@ export default {
...
@@ -137,6 +137,7 @@ export default {
duringRequest
(){
duringRequest
(){
//请求发送状态判断
//请求发送状态判断
let
arr
=
[...
arguments
];
//arguments本身不是数组,是一个特殊的对象,后面的调用会使arguments发生变化,所以需要缓存起来
let
arr
=
[...
arguments
];
//arguments本身不是数组,是一个特殊的对象,后面的调用会使arguments发生变化,所以需要缓存起来
console
.
log
(
arr
)
axios
.
interceptors
.
request
.
use
((
config
)
=>
{
axios
.
interceptors
.
request
.
use
((
config
)
=>
{
arr
.
forEach
((
a
,
i
)
=>
{
arr
.
forEach
((
a
,
i
)
=>
{
if
(
~
config
.
url
.
indexOf
(
a
.
urlStr
)){
if
(
~
config
.
url
.
indexOf
(
a
.
urlStr
)){
...
...
public/resource/js/reportList.js
View file @
3cc480d1
...
@@ -1617,7 +1617,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
...
@@ -1617,7 +1617,8 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
//添加 佣金总计
//添加 佣金总计
$
(
'.total-commission-should'
).
html
(
data
.
data
.
total_commission
);
$
(
'.total-commission-should'
).
html
(
data
.
data
.
total_commission
);
$
(
'.total-commission-real'
).
html
(
data
.
data
.
total_income_money
);
$
(
'.total-commission-real'
).
html
(
data
.
data
.
total_income_money
);
$
(
'.total-commission-no'
).
html
(
data
.
data
.
total_commission
*
1
-
data
.
data
.
total_income_money
*
1
);
$
(
'.total-commission-no'
).
html
((
data
.
data
.
total_commission
*
1
-
data
.
data
.
total_income_money
*
1
).
toFixed
(
2
));
// $('.total-commission-no').html((data.data.total_commission*1-data.data.total_income_money*1).toFixed(2));
// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
// var user_info_obj = JSON.parse(decodeURIComponent(localStorage.getItem('pcUserInfo')));
/*分页代码*/
/*分页代码*/
add_page
(
data
.
data
.
total
,
pageNo
,
bargain
.
pageSize
,
bargain
.
getList
);
add_page
(
data
.
data
.
total
,
pageNo
,
bargain
.
pageSize
,
bargain
.
getList
);
...
...
public/resource/template/commission_template_tpl.html
View file @
3cc480d1
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
<
td
>
[
%=
it
[
item
][
'internal_address'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'internal_address'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'house_number'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'house_number'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'scale_fee'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'scale_fee'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'scale_fee'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'practical_fee'
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
'practical_fee'
]
%
]
<
/td
>
<
td
>
<
td
>
...
...
public/resource/template/real_time_performance_template_tpl.html
View file @
3cc480d1
...
@@ -290,8 +290,8 @@
...
@@ -290,8 +290,8 @@
<
th
class
=
"text-center"
>
成交报告
ID
<
/th
>
<
th
class
=
"text-center"
>
成交报告
ID
<
/th
>
<
th
class
=
"text-center"
>
提交时间
<
/th
>
<
th
class
=
"text-center"
>
提交时间
<
/th
>
<
th
class
=
"text-center"
>
商铺地址
<
/th
>
<
th
class
=
"text-center"
>
商铺地址
<
/th
>
<
th
class
=
"text-center"
>
成交
客户
<
/th
>
<
th
class
=
"text-center"
>
成交
业务员
<
/th
>
<
th
class
=
"text-center"
>
客户电话
<
/th
>
<
!--<
th
class
=
"text-center"
>
客户电话
<
/th>--
>
<
th
class
=
"text-center"
>
成交类型
<
/th
>
<
th
class
=
"text-center"
>
成交类型
<
/th
>
<
th
class
=
"text-center"
>
应收佣金
<
/th
>
<
th
class
=
"text-center"
>
应收佣金
<
/th
>
<
th
class
=
"text-center"
>
操作
<
/th
>
<
th
class
=
"text-center"
>
操作
<
/th
>
...
@@ -303,7 +303,7 @@
...
@@ -303,7 +303,7 @@
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/a></
td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'create_time'
]
%
]
<
/a></
td
>
<
td
class
=
"text-left"
>
[
%=
hideStr
(
it
[
item
][
'internal_address'
])
%
]
<
/td
>
<
td
class
=
"text-left"
>
[
%=
hideStr
(
it
[
item
][
'internal_address'
])
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'user_name'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'user_name'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
hideTel
(
it
[
item
][
'user_phone'
])
%
]
<
/td
>
<
!--<
td
class
=
"text-center"
>
[
%=
hideTel
(
it
[
item
][
'user_phone'
])
%
]
<
/td>--
>
<
td
class
=
"text-center"
>
[
%=
sw
(
it
[
item
][
'trade_type'
])
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
sw
(
it
[
item
][
'trade_type'
])
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'scale_fee'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
[
%=
it
[
item
][
'scale_fee'
]
%
]
<
/td
>
<
td
class
=
"text-center"
>
<
td
class
=
"text-center"
>
...
@@ -511,7 +511,7 @@
...
@@ -511,7 +511,7 @@
<
th
class
=
"text-center"
>
客户状态
<
/th
>
<
th
class
=
"text-center"
>
客户状态
<
/th
>
<
th
class
=
"text-center"
>
业态
<
/th
>
<
th
class
=
"text-center"
>
业态
<
/th
>
<
th
class
=
"text-center"
>
面积
<
/th
>
<
th
class
=
"text-center"
>
面积
<
/th
>
<
th
class
=
"text-center"
>
产生类型
<
/th
>
<
th
class
=
"text-center"
>
客方
<
/th
>
<
/tr
>
<
/tr
>
[
%
for
(
var
item
in
it
){
%
]
[
%
for
(
var
item
in
it
){
%
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment