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
500e2e17
Commit
500e2e17
authored
Nov 21, 2019
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
340795cd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
igirl-channel/app/base/service/impl/dbtrademark/trademarkSve.js
+8
-9
No files found.
igirl-channel/app/base/service/impl/dbtrademark/trademarkSve.js
View file @
500e2e17
...
@@ -318,15 +318,6 @@ class TradeMarkService extends ServiceBase {
...
@@ -318,15 +318,6 @@ class TradeMarkService extends ServiceBase {
if
(
tmObj
.
officialType
&&
",dqrfa,dsccl,dsh,ddj,ydj,ywc,"
.
indexOf
(
tmObj
.
officialType
)
>=
0
)
{
if
(
tmObj
.
officialType
&&
",dqrfa,dsccl,dsh,ddj,ydj,ywc,"
.
indexOf
(
tmObj
.
officialType
)
>=
0
)
{
otp
[
"deliveryStatus"
]
=
tmObj
.
officialType
;
otp
[
"deliveryStatus"
]
=
tmObj
.
officialType
;
await
self
.
ordertmproductSve
.
update
(
otp
,
t
);
await
self
.
ordertmproductSve
.
update
(
otp
,
t
);
var
deliveryStatusName
=
uiconfig
.
config
.
pdict
.
official_type
[
tmObj
.
officialType
];
var
flowObj
=
{
app_id
:
ordertmproduct
.
app_id
,
createuser_id
:
ordertmproduct
.
createuser_id
,
sourceOrderNo
:
deliveryOrderNo
,
opContent
:
"交付状态更新为【"
+
deliveryStatusName
+
"】"
+
obj
.
opNotes
};
await
self
.
orderflowDao
.
create
(
flowObj
,
t
);
//创建订单流程
}
}
// {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
// {"dqrfa":"待确认方案", "dsccl": "待上传材料", "dsh": "待审核", "ddj": "待递交", "ydj": "已递交", "ywc": "已完成" },
}
}
...
@@ -336,6 +327,14 @@ class TradeMarkService extends ServiceBase {
...
@@ -336,6 +327,14 @@ class TradeMarkService extends ServiceBase {
if
(
obj
.
submitTime
)
{
if
(
obj
.
submitTime
)
{
tmObj
[
"submitTime"
]
=
obj
.
submitTime
;
tmObj
[
"submitTime"
]
=
obj
.
submitTime
;
}
}
var
deliveryStatusName
=
uiconfig
.
config
.
pdict
.
official_type
[
tmObj
.
officialType
];
var
flowObj
=
{
app_id
:
ordertmproduct
.
app_id
,
createuser_id
:
ordertmproduct
.
createuser_id
,
sourceOrderNo
:
deliveryOrderNo
,
opContent
:
"第"
+
tm
.
nclOneCodes
+
"类商标状态更新为【"
+
deliveryStatusName
+
"】"
+
obj
.
opNotes
};
await
self
.
orderflowDao
.
create
(
flowObj
,
t
);
//创建交付流程
await
self
.
dao
.
update
(
tmObj
,
t
);
//修改商标状态信息
await
self
.
dao
.
update
(
tmObj
,
t
);
//修改商标状态信息
return
system
.
getResultSuccess
();
return
system
.
getResultSuccess
();
})
})
...
...
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