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
61f5d76c
Commit
61f5d76c
authored
Apr 08, 2020
by
庄冰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aliDataSync
parent
fc21d465
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
84 additions
and
4 deletions
+84
-4
fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/alltrademark.js
+3
-0
fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/autosubmittminside.js
+2
-2
fqboss/app/front/vues/pages/autosubmittminside/autosubmittminside.html
+3
-2
fqboss/app/front/vues/pages/trademark/trademark.js
+76
-0
No files found.
fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/alltrademark.js
View file @
61f5d76c
...
@@ -87,6 +87,9 @@ module.exports = {
...
@@ -87,6 +87,9 @@ module.exports = {
],
],
"auth"
:
{
"auth"
:
{
"add"
:
[
"add"
:
[
{
"icon"
:
"tool-upload"
,
"title"
:
"阿里数据同步"
,
"type"
:
"default"
,
"key"
:
"aliDataSync"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"阿里数据关闭"
,
"type"
:
"default"
,
"key"
:
"aliDataClose"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"修改状态"
,
"type"
:
"default"
,
"key"
:
"putTMStatus"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"修改状态"
,
"type"
:
"default"
,
"key"
:
"putTMStatus"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"人工审核通过"
,
"type"
:
"default"
,
"key"
:
"awte"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"人工审核通过"
,
"type"
:
"default"
,
"key"
:
"awte"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"人工审核不予通过"
,
"type"
:
"default"
,
"key"
:
"repulses"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"人工审核不予通过"
,
"type"
:
"default"
,
"key"
:
"repulses"
,
"isOnGrid"
:
true
},
...
...
fqboss/app/base/db/metadata/bizs/wx76a324c5d201d1a4/autosubmittminside.js
View file @
61f5d76c
...
@@ -85,8 +85,8 @@ module.exports = {
...
@@ -85,8 +85,8 @@ module.exports = {
{
"icon"
:
"tool-upload"
,
"title"
:
"导出"
,
"type"
:
"default"
,
"key"
:
"myexport"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"导出"
,
"type"
:
"default"
,
"key"
:
"myexport"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-look1"
,
"title"
:
"查看回执"
,
"type"
:
"default"
,
"key"
:
"tmhzlook"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-look1"
,
"title"
:
"查看回执"
,
"type"
:
"default"
,
"key"
:
"tmhzlook"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"方案转移"
,
"type"
:
"default"
,
"key"
:
"tmtransfer"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"方案转移"
,
"type"
:
"default"
,
"key"
:
"tmtransfer"
,
"isOnGrid"
:
true
},
{
"icon"
:
"tool-upload"
,
"title"
:
"阿里数据同步"
,
"type"
:
"default"
,
"key"
:
"aliDataSync"
,
"isOnGrid"
:
true
},
//
{ "icon": "tool-upload", "title": "阿里数据同步", "type": "default", "key": "aliDataSync", "isOnGrid": true },
{
"icon"
:
"tool-upload"
,
"title"
:
"阿里数据关闭"
,
"type"
:
"default"
,
"key"
:
"aliDataClose"
,
"isOnGrid"
:
true
},
//
{ "icon": "tool-upload", "title": "阿里数据关闭", "type": "default", "key": "aliDataClose", "isOnGrid": true },
// { "icon": "el-icon-cancel", "title": "详情", "type": "default", "key": "mydetail", "isInRow": true },
// { "icon": "el-icon-cancel", "title": "详情", "type": "default", "key": "mydetail", "isInRow": true },
{
"icon"
:
"el-icon-cancel"
,
"title"
:
"修改"
,
"type"
:
"default"
,
"key"
:
"mydetail"
,
"isInRow"
:
true
},
{
"icon"
:
"el-icon-cancel"
,
"title"
:
"修改"
,
"type"
:
"default"
,
"key"
:
"mydetail"
,
"isInRow"
:
true
},
...
...
fqboss/app/front/vues/pages/autosubmittminside/autosubmittminside.html
View file @
61f5d76c
...
@@ -321,12 +321,12 @@
...
@@ -321,12 +321,12 @@
<el-button
type=
"primary"
@
click=
"uploadStuffs"
>
确 定
</el-button>
<el-button
type=
"primary"
@
click=
"uploadStuffs"
>
确 定
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<div>
<
!-- <
div>
<el-alert title="" type="warning" style="text-align:left" close-text="我了解了">
<el-alert title="" type="warning" style="text-align:left" close-text="我了解了">
说明:列表中来源要是阿里云,需要操作以下步骤<br>
说明:列表中来源要是阿里云,需要操作以下步骤<br>
1.建立完商标信息,(信息建立时附件需要按要求进行上传,在附件上传界面有对应的图片转换工具可供下载)<br>
1.建立完商标信息,(信息建立时附件需要按要求进行上传,在附件上传界面有对应的图片转换工具可供下载)<br>
2.在此列表中,商标状态不是【已提交阿里(待支付)】需要按照需求ID进行查询,之后全选中查询的结果点击【阿里数据同步】功能<br>
2.在此列表中,商标状态不是【已提交阿里(待支付)】需要按照需求ID进行查询,之后全选中查询的结果点击【阿里数据同步】功能<br>
3.点击完【阿里数据同步】后商标状态变成【已提交阿里(待支付)】则商标信息不能进行再次修改
3.点击完【阿里数据同步】后商标状态变成【已提交阿里(待支付)】则商标信息不能进行再次修改
</el-alert>
</el-alert>
</div>
</div>
-->
</gsb-card>
</gsb-card>
\ No newline at end of file
fqboss/app/front/vues/pages/trademark/trademark.js
View file @
61f5d76c
...
@@ -703,6 +703,82 @@
...
@@ -703,6 +703,82 @@
this
.
dialogFormVisible
=
true
;
this
.
dialogFormVisible
=
true
;
}
}
}
}
else
if
(
key
==
"aliDataSync"
)
{
if
(
!
selectedRows
||
selectedRows
.
length
<
1
)
{
that
.
$message
.
warning
(
`请选择至少一行记录!`
);
return
false
;
}
else
{
that
.
$confirm
(
'商标状态为【资料齐全、已提交阿里(待补全信息)、已补全信息(待确认商标)、阿里云审不通过、已失败退款(阿里)、客户反馈(待修改重新同步)、阿里接口错误(需峰擎系统处理)】才能进行阿里数据同步,同步后数据会推送到阿里让客户付款,是否继续?'
,
'重要提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
var
idList
=
[];
for
(
var
i
=
0
;
i
<
selectedRows
.
length
;
i
++
)
{
if
(
selectedRows
[
i
].
tmSourceType
==
"32"
&&
[
"SUBALITM"
,
"SUBALITMOK"
,
"DOCFINISH"
,
"ALIPAYREFUND"
,
"ALIAUDITNOT"
,
"ALICUSTOMERREJECTED"
,
"REQALIERROR"
].
indexOf
(
selectedRows
[
i
].
tmStatus
)
>=
0
)
{
idList
.
push
(
selectedRows
[
i
].
id
);
}
}
if
(
idList
.
length
==
0
)
{
that
.
$message
.
warning
(
`所选择的数据中必须包含阿里云来源,且商标状态为【资料齐全、已提交阿里(待补全信息)、已补全信息(待确认商标)、阿里云审不通过、已失败退款(阿里)、客户反馈(待修改重新同步)、阿里接口错误(需峰擎系统处理)】才能进行同步`
);
return
false
;
}
/**var env = this.$store.state.env; */
var
env
=
""
;
var
param
=
{
ids
:
idList
,
env
:
env
};
this
.
$root
.
postReq
(
"/web/trademarkCtl/aliDataSync"
,
param
).
then
(
rd
=>
{
if
(
rd
.
code
==
1
)
{
that
.
$refs
.
grid
.
fetchData
();
}
else
{
that
.
$message
.
warning
(
rd
.
msg
);
}
}).
catch
(
function
(
e
)
{
that
.
$message
.
warning
(
`操作失败,请刷新页面后重新操作`
);
});
}).
catch
(()
=>
{
});
}
}
else
if
(
key
==
"aliDataClose"
)
{
if
(
!
selectedRows
||
selectedRows
.
length
<
1
)
{
that
.
$message
.
warning
(
`请选择至少一行记录!`
);
return
false
;
}
else
{
that
.
$confirm
(
'商标状态为【资料齐全、已提交阿里(待补全信息)、已失败退款(阿里)、阿里云审不通过、客户反馈(待修改重新同步)、阿里接口错误(需峰擎系统处理)、已补全信息(待确认商标)】才能进行阿里数据关闭,是否继续?'
,
'重要提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
var
idList
=
[];
for
(
var
i
=
0
;
i
<
selectedRows
.
length
;
i
++
)
{
if
(
selectedRows
[
i
].
tmSourceType
==
"32"
&&
[
"DOCFINISH"
,
"SUBALITM"
,
"ALIPAYREFUND"
,
"ALIAUDITNOT"
,
"ALICUSTOMERREJECTED"
,
"REQALIERROR"
,
"SUBALITMOK"
].
indexOf
(
selectedRows
[
i
].
tmStatus
)
>=
0
)
{
idList
.
push
(
selectedRows
[
i
].
id
);
}
}
if
(
idList
.
length
==
0
)
{
that
.
$message
.
warning
(
`所选择的数据中必须包含阿里云来源,且商标状态为【资料齐全、已提交阿里(待补全信息)、已失败退款(阿里)、阿里云审不通过、客户反馈(待修改重新同步)、阿里接口错误(需峰擎系统处理)、已补全信息(待确认商标)】才能进行关闭`
);
return
false
;
}
/**var env = this.$store.state.env; */
var
env
=
""
;
var
param
=
{
ids
:
idList
,
env
:
env
};
this
.
$root
.
postReq
(
"/web/trademarkCtl/aliDataClose"
,
param
).
then
(
rd
=>
{
if
(
rd
.
code
==
1
)
{
that
.
$refs
.
grid
.
fetchData
();
}
else
{
that
.
$message
.
warning
(
rd
.
msg
);
}
}).
catch
(
function
(
e
)
{
that
.
$message
.
warning
(
`操作失败,请刷新页面后重新操作`
);
});
}).
catch
(()
=>
{
});
}
}
},
},
onDlgFormClick
(
type
,
b
){
onDlgFormClick
(
type
,
b
){
if
(
type
==
"mysave"
)
{
if
(
type
==
"mysave"
)
{
...
...
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