Skip to content

Z
zhichan
Commit 115c5409 by 尹亚亭
Options

modify sekftmreg

parent 1f9fd8c7
Showing with 64 additions and 62 deletions
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
......@@ -35,7 +35,7 @@
</p>
<p>
<strong>商标图样：</strong>
<img
<!-- <img
:src="
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type ==
1 &&
......@@ -45,7 +45,8 @@
: brandIconManual
"
alt
/>
/> -->
<img :src="brandIcon" alt />
</p>
<p>
<strong>商标类别：</strong>
......@@ -224,9 +225,8 @@ export default {
return {
textarea: "",
// 选中的商标种类
checkedKinds: [],
// 商标展示
brandIcon: "",
// 手动上传 或 上传 的商标
brandIconManual: "",
// 自动上传的商标
......@@ -247,14 +247,14 @@ export default {
}
},
created() {
// 获取缓存里面的已经选中的商品/服务项
let checkedKinds = JSON.parse(localStorage.getItem("classDataList"));
this.checkedKinds = checkedKinds;
// 获取缓存里面的商标图片地址
let brandIconManual = localStorage.getItem("manualImgToConfirm");
this.brandIconManual = brandIconManual;
let brandIconAuto = localStorage.getItem("autoImgToConfirm");
this.brandIconAuto = brandIconAuto;
let brandIcon = localStorage.getItem("icon");
this.brandIcon = brandIcon;
}
};
</script>
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
......@@ -183,12 +183,10 @@
ref="tree"
id="classtree"
@check-change="handleCheckChange"
@check="handleCheck"
@node-click="handleNodeClick"
@check="handleCheckedNodes"
></el-tree>
<p v-else>暂无数据</p>
<!-- @node-click="handleNodeClick" -->
<!-- @check-change="handleCheckChange" -->
<!-- @node-click="handleCheckChange" -->
<!-- :default-expand-all="isTreeExpand" -->
</div>
</div>
......@@ -348,7 +346,6 @@ export default {
isIndeterminate: true,
checkAll: false,
checkedNcl: [],
checkedList: [],
// 树是否展开
isTreeExpand: false,
......@@ -408,13 +405,12 @@ export default {
//显示树
showTrees: true,
// 测试的选中的节点
checkedNodes: []
// 是否是搜索过
isSearched: true,
searchedList: []
};
},
created() {
this.checkedList = this.ncldata;
},
created() {},
methods: {
// 抽屉展示
getImgUrl(msg) {
......@@ -480,11 +476,9 @@ export default {
// 清除选中的标签
handleClose(tag) {
this.classDataList.splice(this.classDataList.indexOf(tag), 1);
// console.log(tag, "asdasdasdsad");
// // 清除左边对应的数组的选中状态 !!! 不起作用
// console.log(tag.name + tag.code);
// console.log(this.$refs.tree.children, "tree");
// 清除左边对应的数组的选中状态 !!! 不起作用
this.$refs.tree.setChecked(tag, false, true);
// 清除缓存里面的对应项的标签
},
// 删除所有的分类标签数据
deleteClassData() {
......@@ -504,6 +498,9 @@ export default {
type: "success",
message: "删除成功!"
});
// 清除缓存里面的对应项的标签
// localStorage.removeItem("classDataList");
})
.catch(() => {
this.$message({
......@@ -515,6 +512,8 @@ export default {
// 树形结构的处理节点是否被选中
handleCheckChange(data, checked, indeterminate) {
console.log("check-change", 11111111111);
// 检测第三级节点是否被选中(一级节点两位code，二级节点四位code,三级节点6位或是0位code)
if (data.code.length !== 2 || data.code.length !== 4) {
// 如果第三级节点被选中
......@@ -535,12 +534,6 @@ export default {
});
if (index == -1) {
this.classDataList.push(data);
// 把选中的小类数据保存在localstorage里面
localStorage.setItem(
"classDataList",
JSON.stringify(this.classDataList)
);
}
} else {
// 被选中的数据不属于同一个类别，把此节点设置为不可选中状态
......@@ -573,7 +566,9 @@ export default {
},
// 树形结构的节点数据的装填
loadNode(node, resolve) {
console.log(node);
var hasChild;
if (this.isSearched) {
// 给出了树是否有子节点的判断条件，一级二级有子节点，三级没有
if (node.data !== null) {
hasChild = true;
......@@ -622,23 +617,29 @@ export default {
}, 0);
}
});
} else {
// console.log(node.level);
if (node.level == 1) {
let index = this.searchedList.findIndex(item => {
return item.code == node.data.code;
});
let data = this.searchedList[index];
resolve(data.children);
} else if (node.level == 2) {
console.log(node.data.children, "node");
resolve(node.data.children);
}
}
},
// // 节点点击时的方法
// handleNodeClick(data, node, compnnent) {
// console.log(data, node, compnnent);
// },
handleCheck(node, status) {
// console.log(node, status);
this.checkedNodes = status.checkedNodes;
// // 把选中的小类数据保存在localstorage里面
// localStorage.setItem("classDataList", JSON.stringify(this.classDataList));
// console.log(this.checkedNodes);
// console.log(
// this.classCode,
// this.ncldata[this.classCode * 1 - 1],
// "2111111"
// );
this.classDataList = this.checkedNodes;
// 节点点击时的方法
handleNodeClick(data, node, component) {
// console.log(data, node, component);
console.log(node);
console.log("node-click", 33333);
},
handleCheckedNodes(node, status) {
console.log("check of checkedNodes", 222222);
this.classDataList = status.checkedNodes;
},
// 全部选中
......@@ -649,45 +650,37 @@ export default {
//选中
handleCheckedCitiesChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.checkedList.length;
this.checkAll = checkedCount === this.nclOptions.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.checkedList.length;
checkedCount > 0 && checkedCount < this.nclOptions.length;
},
// 点击确定,隐藏类别选择框
confirmClass() {
this.typeListShow = false;
// 确定好分类之后也触发搜索
// 确定好分类之后,当搜索关键字为空时，不触发搜索，因为查询接口返回的数据为[]
if (this.keyZi != "") {
this.filterKeyZi();
}
},
// 过滤关键字 绑定.native回车事件 用户按下回车keyCode=13时触发
filterKeyZi() {
var _that = this;
this.isSearched = false;
// 从 checkedNcl ？ 里面截取类别码
// 从 checkedNcl 里面截取类别码
let classCodes = this.checkedNcl.map(item => {
return item.substring(0, 2);
});
// 根据输入的关键字和选择的分类类别进行尼斯查询过滤
getNiceQueryFilter(this.keyZi, classCodes).then(res => {
// console.log(
// res.data == null,
// res.data != null,
// "过滤之后的尼斯数据:",
// res.data
// );
console.log("过滤之后的尼斯数据:", res.data);
// this.ncldata = [];
if (res.data != null) {
// console.log(res.data.length);
if (res.data.length) {
_that.showTrees = true;
// 默认展开不了？？
// _that.$refs.tree["default-expand-all"] = true;
// console.log(_that.$refs.tree["default-expand-all"]);
// _that.isTreeExpand = true;
// document
// .getElementById("classtree")
// .setAttribute("default-expand-all", "true");
_that.searchedList = res.data;
_that.ncldata = res.data;
} else {
_that.showTrees = false;
......@@ -699,7 +692,7 @@ export default {
// 取消搜索
cancelSearch() {
this.keyZi = "";
this.checkedNcl = [];
// this.checkedNcl = [];
// 显示树形结构
}
......@@ -723,6 +716,14 @@ export default {
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML;
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
}
// 商标图样
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.icon = this.imgUrl;
localStorage.removeItem("icon");
localStorage.setItem(
"icon",
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.icon
);
});
}
};
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
......@@ -357,6 +357,7 @@ export default {
}
},
mounted() {
localStorage.removeItem("icon");
// 页面初始挂载成功之后先清除之前的缓存的图片信息
localStorage.removeItem("manualImgToConfirm");
localStorage.removeItem("autoImgToConfirm");
......
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