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
69b82a2a
Commit
69b82a2a
authored
Sep 02, 2019
by
agping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
财务日报
parent
f62041a1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
107 additions
and
5 deletions
+107
-5
daily_details.html
application/index/view/finance/daily_details.html
+42
-1
getCollectionOffice.html
...cation/index/view/officeBuilding/getCollectionOffice.html
+2
-0
financial_manager_daily_list.js
public/resource/js/financial_manager_daily_list.js
+57
-4
financial_manager_daily_list_template_tpl.html
...e/template/financial_manager_daily_list_template_tpl.html
+6
-0
No files found.
application/index/view/finance/daily_details.html
View file @
69b82a2a
...
...
@@ -540,7 +540,10 @@
<th
class=
"text-center shanghai"
>
上海银满谷银行卡
</th>
<th
class=
"text-center shanghai"
>
新同联福居银行卡
</th>
<th
class=
"text-center shanghai"
>
林老师建行卡
</th>
<!--在上海基础上 改北京的-->
<th
class=
"text-center beijing"
>
筠姐支付宝
</th>
<th
class=
"text-center beijing"
>
筠姐微信
</th>
<th
class=
"text-center beijing"
>
筠姐上海银行卡
</th>
<!--杭州 店长 commit-->
...
...
@@ -633,6 +636,18 @@
<td
class=
"text-center shanghai"
>
<span
id=
"pay_lin"
></span>
</td>
<!--在上海的基础上加北京-->
<td
class=
"text-center beijing"
>
<span
id=
"pay_a_bj"
></span>
</td>
<td
class=
"text-center beijing"
>
<span
id=
"pay_b_bj"
></span>
</td>
<td
class=
"text-center beijing"
>
<span
id=
"pay_c_bj"
></span>
</td>
<!--杭州 店长 commit-->
<td
class=
"text-center hangzhou"
>
...
...
@@ -709,6 +724,9 @@
<th
class=
"text-center shenzhen"
>
筠姐上海银行卡
</th>
<th
class=
"text-center shenzhen"
>
POS机
</th>
<th
class=
"text-center shenzhen"
>
世家公账
</th>
<th
class=
"text-center shenzhen"
>
林老师微信
</th>
<th
class=
"text-center shenzhen"
>
深圳银满谷银行卡
</th>
<!--上海 total 财务-->
<th
class=
"text-center shanghai"
>
施总支付宝
</th>
<th
class=
"text-center shanghai"
>
林老师支付宝
</th>
...
...
@@ -724,6 +742,11 @@
<th
class=
"text-center shanghai"
>
新同联福居银行卡
</th>
<th
class=
"text-center shanghai"
>
林老师建行卡
</th>
<!--在上海基础上 改北京的-->
<th
class=
"text-center beijing"
>
筠姐支付宝
</th>
<th
class=
"text-center beijing"
>
筠姐微信
</th>
<th
class=
"text-center beijing"
>
筠姐上海银行卡
</th>
<!--杭州 total 财务-->
<th
class=
"text-center hangzhou"
>
施总支付宝
</th>
<th
class=
"text-center hangzhou"
>
林老师支付宝
</th>
...
...
@@ -772,6 +795,12 @@
<td
class=
"text-center shenzhen"
>
<span
id=
"total_yun_family"
></span>
</td>
<td
class=
"text-center shenzhen"
>
<span
id=
"total_yun_shenzheng_card"
></span>
</td>
<td
class=
"text-center shenzhen"
>
<span
id=
"total_yun_lin"
></span>
</td>
<!--上海-->
...
...
@@ -814,6 +843,18 @@
<td
class=
"text-center shanghai"
>
<span
id=
"total_lin"
></span>
</td>
<!--上海的基础上 加北京-->
<td
class=
"text-center beijing"
>
<span
id=
"total_a_bj"
></span>
</td>
<td
class=
"text-center beijing"
>
<span
id=
"total_b_bj"
></span>
</td>
<td
class=
"text-center beijing"
>
<span
id=
"total_c_bj"
></span>
</td>
<!--杭州-->
<td
class=
"text-center hangzhou"
>
...
...
application/index/view/officeBuilding/getCollectionOffice.html
View file @
69b82a2a
...
...
@@ -915,6 +915,8 @@
<option
value=
"74"
class=
"shenzheng"
>
陈志杰招商银行卡
</option>
<option
value=
"41"
class=
"shenzheng"
>
世家公账
</option>
<option
value=
"30"
class=
"shenzheng"
>
pos机器
</option>
<option
value=
"75"
class=
"shenzheng"
>
深圳银满谷银行卡
</option>
<option
value=
"21"
class=
"shenzheng"
>
林老师微信
</option>
...
...
public/resource/js/financial_manager_daily_list.js
View file @
69b82a2a
...
...
@@ -961,7 +961,6 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
//判断 店长 财务 站点
if
(
bargain
.
isFinancial
==
1
){
bargain
.
caiwu_site_id
=
data
.
data
.
site_id
;
// console.log(bargain.caiwu_site_id);
}
else
{
bargain
.
caiwu_site_id
=
user_info_obj
.
site_id
;
}
...
...
@@ -1000,12 +999,14 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'#pay_yun_bank'
).
html
(
data
.
data
.
commit_info
.
bank_card_yun
);
$
(
'#pay_yun_pos'
).
html
(
data
.
data
.
commit_info
.
pos
);
$
(
'#pay_yun_family'
).
html
(
data
.
data
.
commit_info
.
family_pay
);
$
(
'#pay_yun_
family'
).
html
(
data
.
data
.
commit_info
.
family_pay
);
//深圳银满谷
$
(
'#pay_yun_
family
'
).
html
(
data
.
data
.
commit_info
.
tenpay_2
);
//林老师微信
$
(
'#pay_yun_
shenzheng_card'
).
html
(
data
.
data
.
commit_info
.
bank_card_sz
);
//深圳银满谷
$
(
'#pay_yun_
lin
'
).
html
(
data
.
data
.
commit_info
.
tenpay_2
);
//林老师微信
$
(
'.shenzhen'
).
show
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
// "bank_card_yun" => "2323",
// "bank_card_lin"=>"1213",
// "bank_card_new"=>"123123"
...
...
@@ -1015,6 +1016,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
show
();
$
(
'.beijing'
).
hide
();
$
(
'#pay_a_hangzhou'
).
html
(
data
.
data
.
commit_info
.
alipay
);
$
(
'#pay_a1_hangzhou'
).
html
(
data
.
data
.
commit_info
.
alipay_2
);
$
(
'#pay_b_hangzhou'
).
html
(
data
.
data
.
commit_info
.
tenpay
);
...
...
@@ -1035,6 +1038,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
show
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
$
(
'#pay_a'
).
html
(
data
.
data
.
commit_info
.
alipay
);
$
(
'#pay_a1'
).
html
(
data
.
data
.
commit_info
.
alipay_2
);
$
(
'#pay_b'
).
html
(
data
.
data
.
commit_info
.
tenpay
);
...
...
@@ -1048,6 +1053,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'#pay_k'
).
html
(
data
.
data
.
commit_info
.
bank_card
);
$
(
'#pay_m'
).
html
(
data
.
data
.
commit_info
.
bank_card_new
);
$
(
'#pay_lin'
).
html
(
data
.
data
.
commit_info
.
bank_card_lin
);
if
(
bargain
.
caiwu_site_id
==
10005
){
//北京用的alipay 上海用的也有alipay
$
(
'.beijing'
).
show
();
$
(
'#pay_a_bj'
).
html
(
data
.
data
.
commit_info
.
alipay
);
//筠姐支付宝
$
(
'#pay_b_bj'
).
html
(
data
.
data
.
commit_info
.
tenpay
);
//筠姐微信
$
(
'#pay_c_bj'
).
html
(
data
.
data
.
commit_info
.
bank_card_yun
);
//筠姐上海银行卡
}
}
...
...
@@ -1087,14 +1098,20 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'#pay_yun_bank'
).
html
(
data
.
data
.
total_info
.
bank_card_yun
);
$
(
'#pay_yun_pos'
).
html
(
data
.
data
.
total_info
.
pos
);
$
(
'#pay_yun_family'
).
html
(
data
.
data
.
total_info
.
family_pay
);
$
(
'#pay_yun_shenzheng_card'
).
html
(
data
.
data
.
total_info
.
bank_card_sz
);
//深圳银满谷
$
(
'#pay_yun_lin'
).
html
(
data
.
data
.
total_info
.
tenpay_2
);
//林老师微信
$
(
'.shenzhen'
).
show
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
}
else
if
(
bargain
.
caiwu_site_id
==
10002
){
//杭州
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
show
();
$
(
'.beijing'
).
hide
();
$
(
'#pay_a_hangzhou'
).
html
(
data
.
data
.
total_info
.
alipay
);
$
(
'#pay_a1_hangzhou'
).
html
(
data
.
data
.
total_info
.
alipay_2
);
$
(
'#pay_b_hangzhou'
).
html
(
data
.
data
.
total_info
.
tenpay
);
...
...
@@ -1111,6 +1128,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
show
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
$
(
'#pay_a'
).
html
(
data
.
data
.
total_info
.
alipay
);
$
(
'#pay_a1'
).
html
(
data
.
data
.
total_info
.
alipay_2
);
$
(
'#pay_b'
).
html
(
data
.
data
.
total_info
.
tenpay
);
...
...
@@ -1124,6 +1143,13 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'#pay_k'
).
html
(
data
.
data
.
total_info
.
bank_card
);
$
(
'#pay_m'
).
html
(
data
.
data
.
total_info
.
bank_card_new
);
$
(
'#pay_lin'
).
html
(
data
.
data
.
total_info
.
bank_card_lin
);
if
(
bargain
.
caiwu_site_id
==
10005
){
//北京用的alipay 上海用的也有alipay
$
(
'.beijing'
).
show
();
$
(
'#pay_a_bj'
).
html
(
data
.
data
.
total_info
.
alipay
);
//筠姐支付宝
$
(
'#pay_b_bj'
).
html
(
data
.
data
.
total_info
.
tenpay
);
//筠姐微信
$
(
'#pay_c_bj'
).
html
(
data
.
data
.
total_info
.
bank_card_yun
);
//筠姐上海银行卡
}
}
//陈志杰
$
(
'#pay_i_chen'
).
html
(
data
.
data
.
total_info
.
alipay_3
);
...
...
@@ -1187,16 +1213,22 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'.shenzhen'
).
show
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
$
(
'#total_yun_zhihubao'
).
html
(
data
.
data
.
total_info
.
alipay
);
$
(
'#total_yun_weixin'
).
html
(
data
.
data
.
total_info
.
tenpay
);
$
(
'#total_yun_card'
).
html
(
data
.
data
.
total_info
.
bank_card
);
$
(
'#total_yun_bank'
).
html
(
data
.
data
.
total_info
.
bank_card_yun
);
$
(
'#total_yun_pos'
).
html
(
data
.
data
.
total_info
.
pos
);
$
(
'#total_yun_family'
).
html
(
data
.
data
.
total_info
.
family_pay
);
$
(
'#total_yun_shenzheng_card'
).
html
(
data
.
data
.
total_info
.
bank_card_sz
);
//深圳银满谷
$
(
'#total_yun_lin'
).
html
(
data
.
data
.
total_info
.
tenpay_2
);
//林老师微信
}
else
if
(
bargain
.
caiwu_site_id
==
10002
){
//杭州
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
hide
();
$
(
'.hangzhou'
).
show
();
$
(
'.beijing'
).
hide
();
$
(
'#total_a_hangzhou'
).
html
(
data
.
data
.
total_info
.
alipay
);
$
(
'#total_a1_hangzhou'
).
html
(
data
.
data
.
total_info
.
alipay_2
);
$
(
'#total_b1_hangzhou'
).
html
(
data
.
data
.
total_info
.
tenpay_2
);
...
...
@@ -1213,6 +1245,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'.shenzhen'
).
hide
();
$
(
'.shanghai'
).
show
();
$
(
'.hangzhou'
).
hide
();
$
(
'.beijing'
).
hide
();
$
(
'#total_a'
).
html
(
data
.
data
.
total_info
.
alipay
);
$
(
'#total_a1'
).
html
(
data
.
data
.
total_info
.
alipay_2
);
$
(
'#total_b1'
).
html
(
data
.
data
.
total_info
.
tenpay_2
);
...
...
@@ -1226,7 +1260,12 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
$
(
'#total_m'
).
html
(
data
.
data
.
total_info
.
bank_card
);
$
(
'#total_n'
).
html
(
data
.
data
.
total_info
.
bank_card_new
);
$
(
'#total_lin'
).
html
(
data
.
data
.
total_info
.
bank_card_lin
);
if
(
bargain
.
caiwu_site_id
==
10005
){
//北京用的alipay 上海用的也有alipay
$
(
'.beijing'
).
show
();
$
(
'#total_a_bj'
).
html
(
data
.
data
.
total_info
.
alipay
);
//筠姐支付宝
$
(
'#total_b_bj'
).
html
(
data
.
data
.
total_info
.
tenpay
);
//筠姐微信
$
(
'#total_c_bj'
).
html
(
data
.
data
.
total_info
.
bank_card_yun
);
//筠姐上海银行卡
}
}
//陈志杰
...
...
@@ -1350,6 +1389,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params
.
bank_card_yun
=
$
(
'#pay_yun_bank'
).
html
();
params
.
pos
=
$
(
'#pay_yun_pos'
).
html
();
params
.
family_pay
=
$
(
'#pay_yun_family'
).
html
();
params
.
bank_card_sz
=
$
(
'#pay_yun_shenzheng_card'
).
html
();
params
.
tenpay_2
=
$
(
'#pay_yun_lin'
).
html
();
//深圳店长提交 没有的数据传空
params
.
realty_pay
=
''
;
params
.
other_bank
=
''
;
...
...
@@ -1383,6 +1424,11 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params
.
bank_card
=
$
(
'#pay_k'
).
html
();
params
.
bank_card_new
=
$
(
'#pay_m'
).
html
();
params
.
bank_card_lin
=
$
(
'#pay_lin'
).
html
();
if
(
bargain
.
caiwu_site_id
==
10005
){
//北京用的alipay
params
.
alipay
=
$
(
'#pay_a_bj'
).
html
();
//筠姐支付宝
params
.
tenpay
=
$
(
'#pay_b_bj'
).
html
();
//筠姐微信
params
.
bank_card_yun
=
$
(
'#pay_c_bj'
).
html
();
//筠姐上海银行卡
}
};
params
.
alipay_3
=
$
(
'#pay_i_chen'
).
html
();
...
...
@@ -1479,6 +1525,8 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params
.
bank_card_yun
=
$
(
'#total_yun_bank'
).
html
();
params
.
pos
=
$
(
'#total_yun_pos'
).
html
();
params
.
family_pay
=
$
(
'#total_yun_family'
).
html
();
params
.
bank_card_sz
=
$
(
'#total_yun_shenzheng_card'
).
html
();
params
.
tenpay_2
=
$
(
'#total_yun_lin'
).
html
();
//深圳店长提交 没有的数据传空 财务审核
params
.
realty_pay
=
''
;
params
.
other_bank
=
''
;
...
...
@@ -1513,6 +1561,11 @@ define(['doT','html2canvas','text!temp/financial_manager_daily_list_template_tpl
params
.
bank_card
=
$
(
'#total_m'
).
html
();
params
.
bank_card_new
=
$
(
'#total_n'
).
html
();
params
.
bank_card_lin
=
$
(
'#total_lin'
).
html
();
if
(
bargain
.
caiwu_site_id
==
10005
){
//北京用的alipay
params
.
alipay
=
$
(
'#total_a_bj'
).
html
();
//筠姐支付宝
params
.
tenpay
=
$
(
'#total_b_bj'
).
html
();
//筠姐微信
params
.
bank_card_yun
=
$
(
'#total_c_bj'
).
html
();
//筠姐上海银行卡
}
};
params
.
alipay_3
=
$
(
'#total_i_chen'
).
html
();
...
...
public/resource/template/financial_manager_daily_list_template_tpl.html
View file @
69b82a2a
...
...
@@ -307,6 +307,8 @@
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'bank_card_yun'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'pos'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'family_pay'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'tenpay_2'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'bank_card_sz'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'alipay_3'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'tenpay_3'
]
%
]
<
/td
>
<
td
class
=
"shenzhen"
>
[
%=
it
[
item
][
'bank_card_chen'
]
%
]
<
/td
>
...
...
@@ -329,6 +331,10 @@
<
td
class
=
"shanghai"
>
[
%=
it
[
item
][
'alipay_3'
]
%
]
<
/td
>
<
td
class
=
"shanghai"
>
[
%=
it
[
item
][
'tenpay_3'
]
%
]
<
/td
>
<
td
class
=
"shanghai"
>
[
%=
it
[
item
][
'bank_card_chen'
]
%
]
<
/td
>
<!--
在上海的基础上
加北京审核记录
-->
<
td
class
=
"beijing"
>
[
%=
it
[
item
][
'alipay'
]
%
]
<
/td
>
<
td
class
=
"beijing"
>
[
%=
it
[
item
][
'tenpay'
]
%
]
<
/td
>
<
td
class
=
"beijing"
>
[
%=
it
[
item
][
'bank_card_yun'
]
%
]
<
/td
>
<!--
杭州
-->
<
td
class
=
"hangzhou"
>
[
%=
it
[
item
][
'alipay'
]
%
]
<
/td
>
...
...
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