Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
8fee2980
Commit
8fee2980
authored
Jun 29, 2020
by
蒋勇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
a80eb7ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
+3
-0
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
+1
-1
No files found.
ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js
View file @
8fee2980
...
...
@@ -46,6 +46,9 @@ class BizOptCtl extends CtlBase {
robj
.
facilitator_name
=
element
.
facilitator_name
;
robj
.
sourceName
=
element
.
source_name
;
//渠道来源
robj
.
salesman_name
=
element
.
salesman_name
robj
.
salesman_phone
=
element
.
salesman_phone
rarr
.
push
(
robj
);
});
rs
.
results
.
rows
=
rarr
;
...
...
ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js
View file @
8fee2980
...
...
@@ -29,7 +29,7 @@ class DeliverybillDao extends Dao {
qw
[
"facilitator_id"
]
=
Number
(
qobj
.
company_id
)
// 为空说明是管理员,不需设置组织结构过滤
if
(
qobj
.
opath
&&
qobj
.
opath
!=
""
)
{
qw
[
"salesman_opcode"
]
=
{
[
this
.
db
.
Op
.
like
]:
'%qobj.opath%'
}
qw
[
"salesman_opcode"
]
=
{
[
this
.
db
.
Op
.
like
]:
`%
${
qobj
.
opath
}
%`
}
}
else
{
//说明是租户管理员,给租户自己核销结算的功能,
if
(
qobj
.
bizpath
.
indexOf
(
"pmxdeliverrequest"
)
>
0
)
{
//说明是结算核销路由过来的
qw
[
"delivery_status"
]
=
"success"
;
...
...
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