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
850feff8
Commit
850feff8
authored
Dec 31, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分用方编辑,显示离职,搜索离职
parent
6eabc384
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
footer_tpl.html
application/index/view/global/footer_tpl.html
+1
-1
OBargainModel.php
application/model/OBargainModel.php
+7
-7
commission.js
public/resource/js/commission.js
+2
-1
No files found.
application/index/view/global/footer_tpl.html
View file @
850feff8
<script
src=
'/resource/lib/js/require.min.js'
data-main=
'/resource/js/main?version=20181201'
charset=
'utf-8'
></script>
<script
src=
'/resource/lib/js/require.min.js'
data-main=
'/resource/js/main?version=20181201
1
'
charset=
'utf-8'
></script>
application/model/OBargainModel.php
View file @
850feff8
...
@@ -1329,13 +1329,13 @@ class OBargainModel extends Model
...
@@ -1329,13 +1329,13 @@ class OBargainModel extends Model
$result
[
'scale_fee'
]
=
empty
(
$result
[
'should_commission'
])
?
$result
[
'scale_fee'
]
:
$result
[
'should_commission'
];
$result
[
'scale_fee'
]
=
empty
(
$result
[
'should_commission'
])
?
$result
[
'scale_fee'
]
:
$result
[
'should_commission'
];
$m_agent
=
new
AAgents
();
$m_agent
=
new
AAgents
();
$filed_agent
=
'a.id,a.name,a.phone,b.store_name,c.district_name,a.store_id,a.district_id'
;
$filed_agent
=
'a.id,a.name,a.phone,b.store_name,c.district_name,a.store_id,a.district_id'
;
$agent_info
=
$m_agent
->
get
AgentsInfoByAgentId
(
$filed_agent
,
[
'agent_
id'
=>
$result
[
'agent_id'
]
]);
$agent_info
=
$m_agent
->
get
StoreDistrict
(
$filed_agent
,
[
'a.
id'
=>
$result
[
'agent_id'
]
]);
$result
[
'district_name'
]
=
$agent_info
[
0
][
'district_name'
];
$result
[
'district_name'
]
=
$agent_info
[
'district_name'
];
$result
[
'store_name'
]
=
$agent_info
[
0
][
'store_name'
];
$result
[
'store_name'
]
=
$agent_info
[
'store_name'
];
$result
[
'name'
]
=
$agent_info
[
0
][
'name'
];
$result
[
'name'
]
=
$agent_info
[
'name'
];
$result
[
'phone'
]
=
$agent_info
[
0
][
'phone'
];
$result
[
'phone'
]
=
$agent_info
[
'phone'
];
$result
[
'store_id'
]
=
$agent_info
[
0
][
'store_id'
];
$result
[
'store_id'
]
=
$agent_info
[
'store_id'
];
$result
[
'district_id'
]
=
$agent_info
[
0
][
'district_id'
];
$result
[
'district_id'
]
=
$agent_info
[
'district_id'
];
}
catch
(
\Exception
$ex
)
{
}
catch
(
\Exception
$ex
)
{
$result
=
$ex
->
getMessage
();
$result
=
$ex
->
getMessage
();
...
...
public/resource/js/commission.js
View file @
850feff8
...
@@ -147,7 +147,8 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
...
@@ -147,7 +147,8 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'css!style/home.css', '
data
:
{
data
:
{
"district_id"
:
$
(
"select[name='district_id'] option:selected"
).
val
(),
//部门
"district_id"
:
$
(
"select[name='district_id'] option:selected"
).
val
(),
//部门
"store_id"
:
$
(
"select[name='store_id'] option:selected"
).
val
(),
//门店
"store_id"
:
$
(
"select[name='store_id'] option:selected"
).
val
(),
//门店
"phone"
:
$
(
"#partical_name"
).
val
()
"phone"
:
$
(
"#partical_name"
).
val
(),
"all"
:
1
},
},
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
...
...
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