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
3150fd2d
Commit
3150fd2d
authored
Jan 09, 2020
by
尹亚亭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
selftmreg classCode
parent
f981899e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
162 additions
and
81 deletions
+162
-81
channel-access/src/api/tmOrder.js
+2
-2
channel-access/src/api/tmTools.js
+9
-7
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
+1
-1
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
+130
-41
channel-access/vue.config.js
+20
-30
No files found.
channel-access/src/api/tmOrder.js
View file @
3150fd2d
import
http
from
"@/http/http.js"
;
let
baseUrl
2
=
"/a
/web/action/tmOrder/springBoard"
;
let
baseUrl
=
"/api
/web/action/tmOrder/springBoard"
;
// 获取jdtrademark商标注册卡片信息
// 产品列表-根据产品大类获取-应用中心
export
function
getRegInfo
()
{
return
http
.
post
(
baseUrl
2
,
{
return
http
.
post
(
baseUrl
,
{
actionBody
:
{
typeOneCode
:
"sbfu"
},
...
...
channel-access/src/api/tmTools.js
View file @
3150fd2d
import
http
from
"@/http/http.js"
;
let
baseUrl
3
=
"/api/web/action/tmTools/springBoard"
;
let
baseUrl
=
"/api/web/action/tmTools/springBoard"
;
// 获取selftmreg的尼斯查询 一级查询得到二级树
export
function
getNiceQueryLevelOne
()
{
return
http
.
post
(
baseUrl3
,
{
// 获取selftmreg的尼斯查询 二级查询得到三级树
export
function
getNiceQueryLevelOne
(
nclcodeSCode
)
{
return
http
.
post
(
baseUrl
,
{
actionBody
:
{
nclcode
:
"01"
nclcode
:
nclcodeSCode
},
actionType
:
"getNcl"
,
requrl
:
"/action/tmTools/springBoard"
});
}
// 获取selftmreg的尼斯查询 二级查询得到三级树
// 分类过滤接口
export
function
getNiceQueryLevelTwo
()
{
return
http
.
post
(
baseUrl
3
,
{
return
http
.
post
(
baseUrl
,
{
actionBody
:
{
name
:
"生物化学"
,
//Y strin 尼斯名称
ncls
:
[
"01"
]
//N List 尼斯大类编码列表
},
actionType
:
"getNcl"
actionType
:
"getNcl
ByLikeNameAndNcl
"
});
}
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
View file @
3150fd2d
...
...
@@ -50,7 +50,7 @@
>
<div>
<div>
<img
:src=
"item.
productLogo
"
alt
/>
<img
:src=
"item.
icon_url
"
alt
/>
</div>
<div>
{{
item
.
item_name
}}
</div>
</div>
...
...
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
View file @
3150fd2d
<!-- 第一步:填写基本信息 商标信息 分类选择-->
<
template
>
<div>
<!--
<div>
{{
stepsParams
.
steponeChoose
.
type
}}
</div>
-->
<!--
<button
@
click=
"handleClick"
>
click me
</button>
-->
<!-- 基本信息填写 -->
<div
class=
"modifyTrademark"
>
<div
class=
"modifyTrademark-main"
>
...
...
@@ -134,17 +131,20 @@
<!-- 树形控件 -->
<div
class=
"classTrademark-left-tree"
>
<el-tree
:props=
"props"
:data=
"ncldata"
show-checkbox
empty-text=
"暂无数据"
node-key=
"
id
"
default-expand-all
node-key=
"
name
"
show-checkbox
:expand-on-click-node=
"false"
:props=
"props"
lazy
:load=
"loadNode"
@
check-change=
"handleCheckChange"
ref=
"tree"
></el-tree>
</div>
</div>
<!-- -->
<!--
右侧选中呈现与清除选择
-->
<div
class=
"classTrademark-right"
>
<div
class=
"classTrademark-right-top"
>
<p>
已选择的商品/服务项
</p>
...
...
@@ -159,21 +159,22 @@
</div>
<div
class=
"classData"
v-else
>
<div
class=
"classData-top"
>
<h4>
第
02类 颜料油漆
</h4>
<h4>
第
{{
classCode
}}
类
{{
ncldata
[
classCode
*
1
-
1
].
name
}}
</h4>
<p>
已选择
<span>
1
</span>
项
<span>
{{
classDataList
.
length
}}
</span
>
项
</p>
<i
class=
"el-icon-delete"
></i>
<i
class=
"el-icon-delete"
@
click=
"deleteClassData"
></i>
</div>
<div
class=
"classData-main"
>
<el-tag
:key=
"tag"
:key=
"tag
.fullname
"
v-for=
"tag in classDataList"
closable
:disable-transitions=
"false"
@
close=
"handleClose(tag)"
>
{{
tag
}}
</el-tag
>
{{
tag
.
fullname
}}
</el-tag
>
</div>
</div>
...
...
@@ -184,12 +185,9 @@
</
template
>
<
script
>
// import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/api.js";
import
{
getNiceQueryLevelOne
,
getNiceQueryLevelTwo
}
from
"@/api/tmTools.js"
;
export
default
{
// props: ["stepsParams"],
data
()
{
return
{
// 基本信息填写
...
...
@@ -266,20 +264,8 @@ export default {
{
code
:
"44"
,
name
:
"医疗园艺"
,
type
:
1
},
{
code
:
"45"
,
name
:
"社会服务"
,
type
:
1
}
],
classDataList
:
[
"121233"
,
"1qwe23"
,
"12qwe3"
,
"12weqwe3"
,
"123"
,
"12adsa3"
,
"12qweq3"
,
"12dad3"
,
"1asd23"
,
"12asd3"
,
"12adqwe3"
]
// classdata:
classDataList
:
[],
classCode
:
""
};
},
methods
:
{
...
...
@@ -291,8 +277,9 @@ export default {
},
// 分类信息选择
handleClose
(
tag
)
{
// console.log(tag);
this
.
classDataList
.
splice
(
this
.
classDataList
.
indexOf
(
tag
),
1
);
// 清除左边对应的数组的选中状态
this
.
$refs
.
tree
.
setChecked
(
tag
,
false
);
},
deleteClassData
()
{
this
.
$confirm
(
"确定清空所有已选商品/服务项吗?"
,
"提示"
,
{
...
...
@@ -301,6 +288,12 @@ export default {
type
:
"warning"
})
.
then
(()
=>
{
// 把左边的样式取消
this
.
classDataList
.
map
(
item
=>
{
this
.
$refs
.
tree
.
setChecked
(
item
,
false
);
});
// 数组置为空
this
.
classDataList
=
[];
this
.
$message
({
type
:
"success"
,
...
...
@@ -322,18 +315,100 @@ export default {
// 输入名字 参数传递
handleInputBrandnameBlur
()
{
this
.
$bus
.
emit
(
"on-input-brandname-blur"
,
this
.
ruleForm
.
name
);
},
// 树形结构的处理节点是否被选中
handleCheckChange
(
data
,
checked
,
indeterminate
)
{
if
(
data
.
code
.
length
!==
2
||
data
.
code
.
length
!==
4
)
{
if
(
checked
)
{
// 判断是否是同一类别
if
(
!
this
.
classDataList
.
length
)
{
this
.
classCode
=
data
.
pcode
.
substring
(
0
,
2
);
}
let
datacode
=
data
.
pcode
.
substring
(
0
,
2
);
if
(
this
.
classDataList
.
length
<
10
)
{
if
(
datacode
==
this
.
classCode
)
{
this
.
classDataList
.
push
(
data
);
}
else
{
this
.
$message
({
message
:
"只能选择同一个类别"
,
type
:
"warning"
});
this
.
$refs
.
tree
.
setChecked
(
data
,
false
);
}
}
else
{
// 大于10之后勾选时,直接把Checked设置为false
this
.
$message
({
message
:
"最多选择10项"
,
type
:
"warning"
});
this
.
$refs
.
tree
.
setChecked
(
data
,
false
);
}
}
else
{
// 没被选中
let
index
=
this
.
classDataList
.
findIndex
((
item
,
index
)
=>
{
return
data
.
code
==
item
.
code
;
});
if
(
index
!=
-
1
)
{
this
.
classDataList
.
splice
(
index
,
1
);
}
}
}
},
// 树形结构的节点数据的装填
loadNode
(
node
,
resolve
)
{
var
hasChild
;
// 给出了树是否有子节点的判断条件,一级二级有子节点,三级没有
if
(
node
.
data
!==
null
)
{
hasChild
=
true
;
}
// 初始的一级45个类别的静态数据的装填
if
(
node
.
level
===
0
)
{
return
resolve
(
this
.
ncldata
);
}
// 只有两级数据可以加载,一级和二级需要加载数据,大于三级的数据不加载置为空
if
(
node
.
level
>
2
)
return
resolve
([]);
// 根据node.data.code得到对应的尼斯查询(一)接口 nclcode 的一级二级查询
getNiceQueryLevelOne
(
node
.
data
.
code
).
then
(
res
=>
{
// 尼斯码为两位,给ncldata添加一级children
if
(
node
.
data
.
code
.
length
==
2
)
{
this
.
ncldata
[
node
.
data
.
code
*
1
-
1
].
children
=
res
.
data
.
rows
;
setTimeout
(()
=>
{
var
data
;
if
(
hasChild
)
{
data
=
this
.
ncldata
[
node
.
data
.
code
*
1
-
1
].
children
;
}
resolve
(
data
);
},
0
);
}
// 尼斯码为四位,给ncldata添加二级children
if
(
node
.
data
.
code
.
length
==
4
)
{
// 四位代码的(前两位代码*1-1)是第一级children的数据数组对象的装填,(后两位代码*1-1)是第二级children的数据数组对象的装填
this
.
ncldata
[
node
.
data
.
code
.
substring
(
0
,
2
)
*
1
-
1
].
children
[
node
.
data
.
code
.
substring
(
2
,
4
)
*
1
-
1
].
children
=
res
.
data
.
rows
;
setTimeout
(()
=>
{
var
data
;
if
(
hasChild
)
{
data
=
this
.
ncldata
[
node
.
data
.
code
.
substring
(
0
,
2
)
*
1
-
1
]
.
children
[
node
.
data
.
code
.
substring
(
2
,
4
)
*
1
-
1
].
children
;
}
resolve
(
data
);
},
0
);
}
});
}
},
mounted
()
{
console
.
log
(
0
);
getNiceQueryLevelOne
().
then
(
res
=>
{
console
.
log
(
res
);
});
getNiceQueryLevelTwo
().
then
(
res
=>
{
console
.
log
(
res
);
});
}
created
()
{
// 获取分类数据查询
// getNiceQueryLevelTwo().then(res => {
// console.log(res);
// });
},
mounted
()
{}
};
</
script
>
...
...
@@ -497,6 +572,20 @@ export default {
border
:
1px
solid
#dee0eb
;
border-top
:
none
;
overflow
:
auto
;
div.el-tree
{
margin-left
:
15px
;
}
.el-tree
>
.el-tree-node
>
.el-tree-node__content
>
.el-checkbox
{
display
:
none
;
}
.el-tree
>
.el-tree-node
>
.el-tree-node__children
>
.el-tree-node
>
.el-tree-node__content
>
.el-checkbox
{
display
:
none
;
}
}
.classTrademark-right-top
{
width
:
100%
;
...
...
channel-access/vue.config.js
View file @
3150fd2d
module
.
exports
=
{
outputDir
:
"dist"
,
//build输出目录
assetsDir
:
"assets"
,
//静态资源目录(js, css, img)
lintOnSave
:
false
,
//是否开启eslint
devServer
:
{
open
:
true
,
//是否自动弹出浏览器页面
host
:
"localhost"
,
port
:
"8080"
,
https
:
false
,
hotOnly
:
false
,
proxy
:
{
"/api"
:
{
target
:
"http://zcchannel.gongsibao.com:4003"
,
//API服务器的地址
ws
:
true
,
//代理websockets
changeOrigin
:
true
,
// 虚拟的站点需要更管origin
pathRewrite
:
{
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/api"
:
""
}
},
"/a"
:
{
target
:
"http://tm.plus.jdcloud.com:4003"
,
//API服务器的地址
ws
:
true
,
//代理websockets
changeOrigin
:
true
,
// 虚拟的站点需要更管origin
pathRewrite
:
{
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/a"
:
""
}
}
outputDir
:
"dist"
,
//build输出目录
assetsDir
:
"assets"
,
//静态资源目录(js, css, img)
lintOnSave
:
false
,
//是否开启eslint
devServer
:
{
open
:
true
,
//是否自动弹出浏览器页面
host
:
"gsbweb.qifu.gongsibao.com"
,
port
:
"8080"
,
https
:
false
,
hotOnly
:
false
,
proxy
:
{
"/api"
:
{
target
:
"http://gsb.qifu.gongsibao.com:4011"
,
//API服务器的地址
ws
:
true
,
//代理websockets
changeOrigin
:
true
,
// 虚拟的站点需要更管origin
pathRewrite
:
{
//重写路径 比如'/api/aaa/ccc'重写为'/aaa/ccc'
"^/api"
:
""
}
}
}
};
\ 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