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
a4e1c5c8
Commit
a4e1c5c8
authored
Jul 24, 2019
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
核对人信息
parent
7f49ce1e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
4 deletions
+42
-4
Cost.php
application/index/controller/Cost.php
+27
-4
FSettingLog.php
application/model/FSettingLog.php
+15
-0
No files found.
application/index/controller/Cost.php
View file @
a4e1c5c8
...
...
@@ -17,6 +17,7 @@ use app\model\AStore;
use
app\model\FApplyForFee
;
use
app\model\FApplyForFeeCheck
;
use
app\model\FImg
;
use
app\model\FSettingLog
;
use
app\model\FStoreCost
;
use
app\model\FStoreCostExt
;
...
...
@@ -290,12 +291,36 @@ class Cost extends Basic
return
$this
->
response
(
$code
,
'无该记录'
);
}
$data
[
'store_cost_data'
]
=
[];
$data
[
'store_cost_data'
]
=
$data
[
'setting_log'
]
=
$data
[
'check_log'
]
=
[];
$data
[
'office_attendance_num'
]
=
0
;
if
(
$this
->
params
[
'is_self'
]
==
1
)
{
$agent_data
=
$redis
->
getRedisCache
(
2
,
$data
[
'agent_id'
]);
$cost_where
[
'b.store_id'
]
=
$ext_where
[
'c.store_id'
]
=
$agent_data
[
'store_id'
];
$m_setting
=
new
FSettingLog
();
$setting_data
=
$m_setting
->
findByAll
(
'type,operator_name'
,
[
'setting_date'
=>
$data
[
'count_time'
]]);
//审核类型, 1考勤审核 2社保审核 3手续费审核 4办公室房租+当月办公门店审核 5费用参数审核
$string
=
''
;
foreach
(
$setting_data
as
$k
=>
$v
)
{
switch
(
$v
[
'type'
])
{
case
1
:
$string
=
'考勤核对人:'
;
break
;
case
2
:
$string
=
'社保核对人:'
;
break
;
case
3
:
$string
=
'手续费核对人'
;
break
;
case
4
:
$string
=
'办公室房租+当月办公门店核对人'
;
break
;
case
5
:
$string
=
'费用参数核对人'
;
break
;
}
$string_array
[]
=
$string
.
$v
[
'operator_name'
];
}
if
(
isset
(
$string_array
))
{
$data
[
'setting_log'
]
=
$string_array
;
}
}
//费用类型 1办公室成本 2上海总部成本 3分部成本 4同联发展基金 5门店单独成本
...
...
@@ -325,11 +350,9 @@ class Cost extends Basic
}
//店长账号提交的 需要总监和财务的三级审核
if
(
$data
[
'type'
]
==
5
)
{
if
(
$data
[
'type'
]
==
5
||
$data
[
'type'
]
==
1
)
{
$check_field
=
'b.name,a.create_time,a.remark'
;
$data
[
'check_log'
]
=
$m_check
->
findByAll
(
$check_field
,
[
'apply_for_id'
=>
$data
[
'id'
]]);
}
else
{
$data
[
'check_log'
]
=
[];
}
$data
[
'images_data'
]
=
$m_img
->
findByAll
(
'id,img_name,img_type'
,
[
'img_id'
=>
$data
[
'id'
]]);
...
...
application/model/FSettingLog.php
View file @
a4e1c5c8
...
...
@@ -40,4 +40,19 @@ class FSettingLog extends BaseModel
->
find
();
return
$result
;
}
/**
* @param $field
* @param $params
* @return false|\PDOStatement|string|\think\Collection
*/
public
function
findByAll
(
$field
,
$params
)
{
$params
[
'is_del'
]
=
0
;
$result
=
$this
->
db_
->
field
(
$field
)
->
where
(
$params
)
->
select
();
return
$result
;
}
}
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