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
d693ee22
Commit
d693ee22
authored
Sep 09, 2020
by
linboxuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lin
parent
6f9ea804
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js
+3
-0
center-tmtransaction/app/config/platform.js
+2
-1
No files found.
center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js
View file @
d693ee22
...
...
@@ -528,6 +528,9 @@ class TrademarktransactionService extends ServiceBase {
objlist
[
tmIndex
][
"tm_applier"
]
=
tmDetail
.
applicant_cn
||
""
;
objlist
[
tmIndex
][
"tm_group"
]
=
JSON
.
stringify
(
tmDetail
.
ncl_two_codes
)
||
""
;
objlist
[
tmIndex
][
"tm_applier"
]
=
tmDetail
.
applicant_cn
||
""
;
// 2020 0909 lin 新增 execlName 三元
objlist
[
tmIndex
][
"excelName"
]
=
objlist
[
tmIndex
][
"excelName"
]
?
objlist
[
tmIndex
][
"excelName"
]
:
tmDetail
.
tm_name
;
objlist
[
tmIndex
][
"publish_status"
]
=
objlist
[
tmIndex
][
"publish_status"
]
?
objlist
[
tmIndex
][
"publish_status"
]
:
"audit"
if
(
tmDetail
.
original_regist_notice_day
)
{
objlist
[
tmIndex
][
"tm_regist_day"
]
=
new
Date
(
parseInt
(
tmDetail
.
original_regist_notice_day
)
*
1000
).
toISOString
().
split
(
"T"
)[
0
]
||
""
;
}
...
...
center-tmtransaction/app/config/platform.js
View file @
d693ee22
...
...
@@ -30,7 +30,7 @@ module.exports = {
"330"
:
"已作废"
},
need_status
:{
1
:
"已提交"
,
2
:
"待顾问反馈"
,
3
:
"待用户确认"
,
4
:
"已完成"
,
5
:
"已关闭"
},
license_type
:{
"1"
:
"ICP资质"
,
2
:
"EDI资质"
},
publish_status
:
{
audit
:
"审核中"
,
uppershelf
:
"上架"
,
lowershelf
:
"下架"
,
haltsales
:
"停售"
,
oversales
:
"已出售"
,
addbaseinfo
:
"待补充信息"
},
// 剩余几个人是什么?fail,success
publish_status
:
{
"audit"
:
"审核中"
,
"uppershelf"
:
"上架"
,
"lowershelf"
:
"下架"
,
"haltsales"
:
"停售"
,
"oversales"
:
"已出售"
,
"addbaseinfo"
:
"待补充信息"
},
// 剩余几个人是什么?fail,success
trademark_type
:
{
"ordinary"
:
"普通商标"
,
"specialoffer"
:
"特价"
,
"highquality"
:
"精品"
,
"hot"
:
"热门"
,
"recommended"
:
"推荐"
}
}
}
\ No newline at end of file
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