Skip to content

Z
zhichan
Commit b2700f58 by 任建
Options

rj

parents 0df1f3e8 3150fd2d
Showing with 197 additions and 81 deletions
channel-access/package-lock.json
...@@ -2920,6 +2920,16 @@ ...@@ -2920,6 +2920,16 @@
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
"dev": true "dev": true
}, },
"clipboard": {
"version": "2.0.4",
"resolved": "https://registry.npm.taobao.org/clipboard/download/clipboard-2.0.4.tgz",
"integrity": "sha1-g22v1mzw/qXXHOXVsL9ulYAJES0=",
"requires": {
"good-listener": "^1.2.2",
"select": "^1.1.2",
"tiny-emitter": "^2.0.0"
}
},
"clipboardy": { "clipboardy": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/clipboardy/download/clipboardy-2.1.0.tgz", "resolved": "https://registry.npm.taobao.org/clipboardy/download/clipboardy-2.1.0.tgz",
...@@ -3911,6 +3921,11 @@ ...@@ -3911,6 +3921,11 @@
"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
"dev": true "dev": true
}, },
"delegate": {
"version": "3.2.0",
"resolved": "https://registry.npm.taobao.org/delegate/download/delegate-3.2.0.tgz",
"integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
},
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz", "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
...@@ -5799,6 +5814,14 @@ ...@@ -5799,6 +5814,14 @@
"minimatch": "~3.0.2" "minimatch": "~3.0.2"
} }
}, },
"good-listener": {
"version": "1.2.2",
"resolved": "https://registry.npm.taobao.org/good-listener/download/good-listener-1.2.2.tgz",
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
"requires": {
"delegate": "^3.1.2"
}
},
"graceful-fs": { "graceful-fs": {
"version": "4.2.3", "version": "4.2.3",
"resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz?cache=0&sync_timestamp=1571871306808&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgraceful-fs%2Fdownload%2Fgraceful-fs-4.2.3.tgz", "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz?cache=0&sync_timestamp=1571871306808&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgraceful-fs%2Fdownload%2Fgraceful-fs-4.2.3.tgz",
...@@ -9999,6 +10022,11 @@ ...@@ -9999,6 +10022,11 @@
} }
} }
}, },
"select": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/select/download/select-1.1.2.tgz",
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
},
"select-hose": { "select-hose": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz",
...@@ -11058,6 +11086,11 @@ ...@@ -11058,6 +11086,11 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true "dev": true
}, },
"tiny-emitter": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/tiny-emitter/download/tiny-emitter-2.1.0.tgz",
"integrity": "sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM="
},
"tmp": { "tmp": {
"version": "0.0.33", "version": "0.0.33",
"resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz", "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
...@@ -11550,6 +11583,14 @@ ...@@ -11550,6 +11583,14 @@
"resolved": "https://registry.npm.taobao.org/vue-bus/download/vue-bus-1.2.1.tgz", "resolved": "https://registry.npm.taobao.org/vue-bus/download/vue-bus-1.2.1.tgz",
"integrity": "sha1-UFd7C3P8GvnNqKR1/vL38P2tcEU=" "integrity": "sha1-UFd7C3P8GvnNqKR1/vL38P2tcEU="
}, },
"vue-clipboard2": {
"version": "0.3.1",
"resolved": "https://registry.npm.taobao.org/vue-clipboard2/download/vue-clipboard2-0.3.1.tgz",
"integrity": "sha1-blUft704SImyiw2jsSKJ7WvKSJQ=",
"requires": {
"clipboard": "^2.0.0"
}
},
"vue-eslint-parser": { "vue-eslint-parser": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz", "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-5.0.0.tgz",
......
channel-access/package.json
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
"sass-loader": "^8.0.0", "sass-loader": "^8.0.0",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
} }
} }
\ No newline at end of file
channel-access/src/api/api.js
...@@ -2,8 +2,8 @@ import axios from "axios"; ...@@ -2,8 +2,8 @@ import axios from "axios";
let baseUrl = "/api/web/auth/accessAuth/getAppTokenByHosts"; let baseUrl = "/api/web/auth/accessAuth/getAppTokenByHosts";
//获取token //获取token
export function getTokens() { export function getTokens() {
return axios.post(baseUrl, { return axios.post(baseUrl, {
actionType: "getAppTokenByHosts", //固定写法就行 actionType: "getAppTokenByHosts", //固定写法就行
actionBody: {} actionBody: {}
}); });
} }
\ No newline at end of file
channel-access/src/api/tmOrder.js
import http from "@/http/http.js"; import http from "@/http/http.js";
let baseUrl2 = "/a/web/action/tmOrder/springBoard"; let baseUrl = "/api/web/action/tmOrder/springBoard";
// 获取jdtrademark商标注册卡片信息
// 产品详情-应用中心
// export function getRegInfo() {
// return http.post(baseUrl2, {
// actionBody: {
// channelItemCode: "FW_GOODS-581976-1"
// },
// actionType: "getCAProductDetail",
// actionProcess: "jd"
// });
// }
// 获取jdtrademark商标注册卡片信息 // 获取jdtrademark商标注册卡片信息
// 产品列表-根据产品大类获取-应用中心 // 产品列表-根据产品大类获取-应用中心
export function getRegInfo() { export function getRegInfo() {
return http.post(baseUrl2, { return http.post(baseUrl, {
actionBody: { actionBody: {
typeOneCode: "sbfu" typeOneCode: "sbfu"
}, },
......
channel-access/src/api/tmTools.js
import http from "@/http/http.js"; import http from "@/http/http.js";
let baseUrl3 = "/api/web/action/tmTools/springBoard"; let baseUrl = "/api/web/action/tmTools/springBoard";
// 获取selftmreg的尼斯查询 一级查询得到二级树 // 获取selftmreg的尼斯查询 一级查询得到二级树
export function getNiceQueryLevelOne() { export function getNiceQueryLevelOne(nclcodeSCode) {
return http.post(baseUrl3, { return http.post(baseUrl, {
actionBody: { actionBody: {
nclcode: "01" nclcode: nclcodeSCode
}, },
actionType: "getNcl", actionType: "getNcl",
requrl: "/action/tmTools/springBoard" requrl: "/action/tmTools/springBoard"
}); });
} }
// 获取selftmreg的尼斯查询 二级查询得到三级树
// 分类过滤接口
export function getNiceQueryLevelTwo() { export function getNiceQueryLevelTwo() {
return http.post(baseUrl3, { return http.post(baseUrl, {
actionBody: { actionBody: {
name: "生物化学", //Y strin 尼斯名称 name: "生物化学", //Y strin 尼斯名称
ncls: ["01"] //N List 尼斯大类编码列表 ncls: ["01"] //N List 尼斯大类编码列表
}, },
actionType: "getNcl" actionType: "getNclByLikeNameAndNcl"
}); });
} }
//文字转图片 //文字转图片
export function word2pic(word) { export function word2pic(word) {
return http.post(baseUrl3, { return http.post(baseUrl, {
actionBody: { actionBody: {
word: word word: word
}, },
......
channel-access/src/views/pages/jdindentdetail/classTrademark.vue
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
<div class="classTrademark-left"> <div class="classTrademark-left">
<div class="classTrademark-left-top"> <div class="classTrademark-left-top">
<el-button>分类</el-button> <el-button>分类</el-button>
<el-input placeholder="请输入关键字进行过滤" suffix-icon="el-icon-search" v-model="keyZi"></el-input> <el-input
placeholder="请输入关键字进行过滤"
suffix-icon="el-icon-search"
v-model="keyZi"
></el-input>
<span class="quxiao">取消</span> <span class="quxiao">取消</span>
</div> </div>
<!-- 树形控件 --> <!-- 树形控件 -->
...@@ -46,7 +50,8 @@ ...@@ -46,7 +50,8 @@
closable closable
:disable-transitions="false" :disable-transitions="false"
@close="handleClose(tag)" @close="handleClose(tag)"
>{{ tag }}</el-tag> >{{ tag }}</el-tag
>
</div> </div>
</div> </div>
</div> </div>
...@@ -61,7 +66,6 @@ ...@@ -61,7 +66,6 @@
</template> </template>
<script> <script>
import { getJdbycdetailtmData } from "@/api/api.js";
export default { export default {
data() { data() {
return { return {
...@@ -164,11 +168,7 @@ export default { ...@@ -164,11 +168,7 @@ export default {
}); });
} }
}, },
mounted() { mounted() {}
getJdbycdetailtmData().then(res => {
console.log(res.data);
});
}
}; };
</script> </script>
......
channel-access/src/views/pages/jdtrademark/Jdtmbrandreg.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
> >
<div> <div>
<div> <div>
<img :src="item.productLogo" alt /> <img :src="item.icon_url" alt />
</div> </div>
<div>{{ item.item_name }}</div> <div>{{ item.item_name }}</div>
</div> </div>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
<!-- 第一步：填写基本信息 商标信息 分类选择--> <!-- 第一步：填写基本信息 商标信息 分类选择-->
<template> <template>
<div> <div>
<!-- <div>{{ stepsParams.steponeChoose.type }}</div> -->
<!-- <button @click="handleClick">click me</button> -->
<!-- 基本信息填写 --> <!-- 基本信息填写 -->
<div class="modifyTrademark"> <div class="modifyTrademark">
<div class="modifyTrademark-main"> <div class="modifyTrademark-main">
...@@ -134,17 +131,20 @@ ...@@ -134,17 +131,20 @@
<!-- 树形控件 --> <!-- 树形控件 -->
<div class="classTrademark-left-tree"> <div class="classTrademark-left-tree">
<el-tree <el-tree
:props="props"
:data="ncldata" :data="ncldata"
show-checkbox
empty-text="暂无数据" empty-text="暂无数据"
node-key="id" node-key="name"
default-expand-all show-checkbox
:expand-on-click-node="false" :expand-on-click-node="false"
:props="props" lazy
:load="loadNode"
@check-change="handleCheckChange"
ref="tree"
></el-tree> ></el-tree>
</div> </div>
</div> </div>
<!-- --> <!-- 右侧选中呈现与清除选择 -->
<div class="classTrademark-right"> <div class="classTrademark-right">
<div class="classTrademark-right-top"> <div class="classTrademark-right-top">
<p>已选择的商品/服务项</p> <p>已选择的商品/服务项</p>
...@@ -159,21 +159,22 @@ ...@@ -159,21 +159,22 @@
</div> </div>
<div class="classData" v-else> <div class="classData" v-else>
<div class="classData-top"> <div class="classData-top">
<h4>第02类 颜料油漆</h4> <h4>第{{ classCode }}类 {{ ncldata[classCode * 1 - 1].name }}</h4>
<p> <p>
已选择 已选择
<span>1</span>项 <span>{{ classDataList.length }}</span
>项
</p> </p>
<i class="el-icon-delete"></i> <i class="el-icon-delete" @click="deleteClassData"></i>
</div> </div>
<div class="classData-main"> <div class="classData-main">
<el-tag <el-tag
:key="tag" :key="tag.fullname"
v-for="tag in classDataList" v-for="tag in classDataList"
closable closable
:disable-transitions="false" :disable-transitions="false"
@close="handleClose(tag)" @close="handleClose(tag)"
>{{ tag }}</el-tag >{{ tag.fullname }}</el-tag
> >
</div> </div>
</div> </div>
...@@ -184,12 +185,9 @@ ...@@ -184,12 +185,9 @@
</template> </template>
<script> <script>
// import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/api.js";
import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/tmTools.js"; import { getNiceQueryLevelOne, getNiceQueryLevelTwo } from "@/api/tmTools.js";
export default { export default {
// props: ["stepsParams"],
data() { data() {
return { return {
// 基本信息填写 // 基本信息填写
...@@ -266,20 +264,8 @@ export default { ...@@ -266,20 +264,8 @@ export default {
{ code: "44", name: "医疗园艺", type: 1 }, { code: "44", name: "医疗园艺", type: 1 },
{ code: "45", name: "社会服务", type: 1 } { code: "45", name: "社会服务", type: 1 }
], ],
classDataList: [ classDataList: [],
"121233", classCode: ""
"1qwe23",
"12qwe3",
"12weqwe3",
"123",
"12adsa3",
"12qweq3",
"12dad3",
"1asd23",
"12asd3",
"12adqwe3"
]
// classdata:
}; };
}, },
methods: { methods: {
...@@ -291,8 +277,9 @@ export default { ...@@ -291,8 +277,9 @@ export default {
}, },
// 分类信息选择 // 分类信息选择
handleClose(tag) { handleClose(tag) {
// console.log(tag);
this.classDataList.splice(this.classDataList.indexOf(tag), 1); this.classDataList.splice(this.classDataList.indexOf(tag), 1);
// 清除左边对应的数组的选中状态
this.$refs.tree.setChecked(tag, false);
}, },
deleteClassData() { deleteClassData() {
this.$confirm("确定清空所有已选商品/服务项吗？", "提示", { this.$confirm("确定清空所有已选商品/服务项吗？", "提示", {
...@@ -301,6 +288,12 @@ export default { ...@@ -301,6 +288,12 @@ export default {
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
// 把左边的样式取消
this.classDataList.map(item => {
this.$refs.tree.setChecked(item, false);
});
// 数组置为空
this.classDataList = []; this.classDataList = [];
this.$message({ this.$message({
type: "success", type: "success",
...@@ -322,18 +315,100 @@ export default { ...@@ -322,18 +315,100 @@ export default {
// 输入名字 参数传递 // 输入名字 参数传递
handleInputBrandnameBlur() { handleInputBrandnameBlur() {
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name); 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() { created() {
console.log(0); // 获取分类数据查询
getNiceQueryLevelOne().then(res => { // getNiceQueryLevelTwo().then(res => {
console.log(res); // console.log(res);
}); // });
},
getNiceQueryLevelTwo().then(res => { mounted() {}
console.log(res);
});
}
}; };
</script> </script>
...@@ -497,6 +572,20 @@ export default { ...@@ -497,6 +572,20 @@ export default {
border: 1px solid #dee0eb; border: 1px solid #dee0eb;
border-top: none; border-top: none;
overflow: auto; 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 { .classTrademark-right-top {
width: 100%; width: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment