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
caeabb00
Commit
caeabb00
authored
Sep 21, 2020
by
Sxy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 返回订单主编号
parent
c71b0a63
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
+5
-4
No files found.
ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js
View file @
caeabb00
...
...
@@ -31,11 +31,11 @@ class DeliverybillCtl extends CtlBase {
delete
pobj
.
search
.
dateType
}
if
(
pobj
.
search
&&
pobj
.
search
.
businessType
)
{
pobj
.
search
.
product_code
=
pobj
.
search
.
businessType
pobj
.
search
.
product_code
=
pobj
.
search
.
businessType
delete
pobj
.
search
.
businessType
}
if
(
pobj
.
search
&&
pobj
.
search
.
sourceName
)
{
pobj
.
search
.
source_name
=
pobj
.
search
.
sourceName
pobj
.
search
.
source_name
=
pobj
.
search
.
sourceName
delete
pobj
.
search
.
sourceName
}
...
...
@@ -48,6 +48,7 @@ class DeliverybillCtl extends CtlBase {
robj
.
id
=
element
.
id
;
//数据的id
robj
.
deliverNumber
=
element
.
delivery_code
;
//交付单编号
robj
.
delivery_code
=
element
.
delivery_code
;
//交付单编号-shousuo
robj
.
master_source_number
=
element
.
master_source_number
;
//交付单主编号-shousuo
robj
.
businessName
=
element
.
product_name
;
//产品名称
robj
.
businessType
=
element
.
product_code
;
//产品编码
robj
.
product_name
=
element
.
product_name
;
//产品名称-shousuo
...
...
@@ -1088,7 +1089,7 @@ class DeliverybillCtl extends CtlBase {
var
xx
=
time
.
setDate
(
date
);
return
moment
(
new
Date
(
xx
)).
format
(
'yyyy-MM-DD'
);
}
catch
{
catch
{
return
""
;
}
...
...
@@ -1101,7 +1102,7 @@ class DeliverybillCtl extends CtlBase {
var
m2
=
moment
(
time2
);
return
m2
.
diff
(
m1
,
'day'
);
}
catch
{
catch
{
return
""
;
}
...
...
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