Skip to content

Z
zhichan
Commit df9ebe9f by 尹亚亭
Options

class filter of selftmreg

parent ac091c86
Showing with 116 additions and 59 deletions
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -186,10 +186,15 @@ ...@@ -186,10 +186,15 @@
</div> </div>
</div> </div>
<!-- 如果是个体户，上传身份证明 --> <!-- 如果是个体户，上传身份证明 -->
<div class="from-items"> <div
class="from-items"
v-if="
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype == 2
"
>
<div class="from-item-title"><span>*</span>上传材料：身份证明</div> <div class="from-item-title"><span>*</span>上传材料：身份证明</div>
<div class="upload-box"> <div class="upload-box">
<img src="@/assets/imgs/sbzc/sfz.png" alt /> <img src="" alt />
</div> </div>
<div class="upload-box-next"> <div class="upload-box-next">
<img src="@/assets/imgs/sbzc/sfz.png" alt /> <img src="@/assets/imgs/sbzc/sfz.png" alt />
...@@ -335,30 +340,7 @@ export default { ...@@ -335,30 +340,7 @@ export default {
toViewImgSrc: "" toViewImgSrc: ""
}; };
}, },
mounted() { mounted() {},
// // 去编辑之后的第二步页面信息的装填
// // 填写申请人信息部分
// this.aruleForm.resource = this.stepsParams.stepTwoNineParams.atype;
// // 企业
// this.aruleForm.name = this.stepsParams.stepTwoNineParams.companyName;
// this.aruleForm.address = this.stepsParams.stepTwoNineParams.licenseAddress;
// if (this.stepsParams.stepTwoNineParams.atype == 1) {
// this.aruleForm.xinyongma = this.stepsParams.stepTwoNineParams.creditCode;
// this.aruleForm.postal = this.stepsParams.stepTwoNineParams.postalCode;
// }
// // 个体户
// this.aruleForm.uname = this.stepsParams.stepTwoNineParams.username;
// this.aruleForm.uid = this.stepsParams.stepTwoNineParams.idCard;
// this.aruleForm.uaddress = this.stepsParams.stepTwoNineParams.idAddress;
// if (this.stepsParams.stepTwoNineParams.atype == 2) {
// this.aruleForm.xinyongma = this.stepsParams.stepTwoNineParams.ucreditCode;
// this.aruleForm.postal = this.stepsParams.stepTwoNineParams.upostalCode;
// }
// // 订单联系人部分
// this.ruleForm.contanct = this.stepsParams.stepTwoNineParams.customer;
// this.ruleForm.phone = this.stepsParams.stepTwoNineParams.telNum;
// this.ruleForm.email = this.stepsParams.stepTwoNineParams.email;
},
methods: { methods: {
// 资料上传 // 资料上传
enter(index) { enter(index) {
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
v-model="ruleForm.name" v-model="ruleForm.name"
placeholder="请输入商标名称" placeholder="请输入商标名称"
></el-input> ></el-input>
<span v-if="ruleForm.resource == 3">及图</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="商标图样：" label="商标图样："
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
<img v-if="!imgUrl" src="@/assets/imgs/zwtp.png" alt /> <img v-if="!imgUrl" src="@/assets/imgs/zwtp.png" alt />
<img v-else :src="imgUrl" alt="" /> <img v-else :src="imgUrl" alt="" />
</div> </div>
<p> <p class="vertical-bottom">
<i class="el-icon-warning"></i <i class="el-icon-warning"></i
>自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。 >自动生成的商标图样默认以“宋体”字样自左向右排列递交官方。
</p> </p>
...@@ -137,6 +138,7 @@ ...@@ -137,6 +138,7 @@
<!-- 分类过滤搜索 --> <!-- 分类过滤搜索 -->
<div class="classTrademark-left-top"> <div class="classTrademark-left-top">
<el-button @click="typeListShow = true">分类</el-button> <el-button @click="typeListShow = true">分类</el-button>
<el-input style="display:none"></el-input>
<el-input <el-input
placeholder="请输入关键字进行过滤" placeholder="请输入关键字进行过滤"
suffix-icon="el-icon-search" suffix-icon="el-icon-search"
...@@ -160,21 +162,25 @@ ...@@ -160,21 +162,25 @@
v-model="checkedType" v-model="checkedType"
@change="handleCheckedCitiesChange" @change="handleCheckedCitiesChange"
> >
<el-checkbox <!-- <el-checkbox
v-for="(item, index) in checkedList" v-for="(item, index) in checkedList"
:label="item.code + item.name" :label="item.code + item.name"
:key="index + '-' + item.code" :key="index + '-' + item.code"
>{{ item.code }}</el-checkbox >{{ item.code }}</el-checkbox
> > -->
<el-checkbox v-for="n in nclOptions" :label="n" :key="n">{{
n
}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<!-- 树形控件 --> <!-- 树形控件 -->
<div class="classTrademark-left-tree"> <div class="classTrademark-left-tree">
<el-tree <el-tree
v-if="showTrees"
:props="props" :props="props"
:data="ncldata" :data="ncldata"
empty-text="暂无数据" empty-text="暂无数据"
node-key="name" node-key="name+code"
show-checkbox show-checkbox
:expand-on-click-node="false" :expand-on-click-node="false"
:default-expand-all="isTreeExpand" :default-expand-all="isTreeExpand"
...@@ -184,6 +190,8 @@ ...@@ -184,6 +190,8 @@
@check-change="handleCheckChange" @check-change="handleCheckChange"
ref="tree" ref="tree"
></el-tree> ></el-tree>
<p v-else>暂无数据</p>
<!-- @node-click="handleCheckChange" -->
</div> </div>
</div> </div>
<!-- 右侧选中呈现与清除选择 --> <!-- 右侧选中呈现与清除选择 -->
...@@ -349,7 +357,58 @@ export default { ...@@ -349,7 +357,58 @@ export default {
// 自动生成 和 手动上传的图片 的保存 // 自动生成 和 手动上传的图片 的保存
autoImgToConfirm: "", autoImgToConfirm: "",
manualImgToConfirm: "" manualImgToConfirm: "",
//
nclOptions: [
"01",
"02",
"03",
"04",
"05",
"06",
"07",
"08",
"09",
"10",
"11",
"12",
"13",
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
"38",
"39",
"40",
"41",
"42",
"43",
"44",
"45"
],
//显示树
showTrees: true
}; };
}, },
created() { created() {
...@@ -473,13 +532,6 @@ export default { ...@@ -473,13 +532,6 @@ export default {
if (index == -1) { if (index == -1) {
this.classDataList.push(data); this.classDataList.push(data);
// // 选择的商品种类的数据更新存储在父组件的数据里面
// this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepOneThreeParams
// .smallKinds
// );
// 把选中的小类数据保存在localstorage里面 // 把选中的小类数据保存在localstorage里面
localStorage.setItem( localStorage.setItem(
"classDataList", "classDataList",
...@@ -570,20 +622,26 @@ export default { ...@@ -570,20 +622,26 @@ export default {
// 全部选中 // 全部选中
handleCheckAllChange(val) { handleCheckAllChange(val) {
if (val) { // if (val) {
let data = []; // let data = [];
this.checkedList.map((item, index) => { // console.log(this.checkedList, ",,,,children,,,,");
data.push(`${item.code}${item.name}`); // this.checkedList.map((item, index) => {
}); // data.push(`${item.code}${item.name}`);
this.checkedType = data; // });
this.isIndeterminate = false; // this.checkedType = data;
} else { // this.isIndeterminate = false;
this.checkedType = []; // } else {
} // this.checkedType = [];
// }
this.checkedType = val ? this.nclOptions : [];
this.isIndeterminate = false;
}, },
//选中 //选中
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
this.checkedType = value; console.log(value);
// this.checkedType = value;
let checkedCount = value.length; let checkedCount = value.length;
this.checkAll = checkedCount === this.checkedList.length; this.checkAll = checkedCount === this.checkedList.length;
this.isIndeterminate = this.isIndeterminate =
...@@ -601,12 +659,19 @@ export default { ...@@ -601,12 +659,19 @@ export default {
let classCodes = this.checkedType.map(item => { let classCodes = this.checkedType.map(item => {
return item.substring(0, 2); return item.substring(0, 2);
}); });
console.log(this);
// 根据输入的关键字和选择的分类类别进行尼斯查询过滤 // 根据输入的关键字和选择的分类类别进行尼斯查询过滤
getNiceQueryFilter(this.keyZi, classCodes).then(res => { getNiceQueryFilter(this.keyZi, classCodes).then(res => {
console.log("过滤之后的尼斯数据:", res.data); console.log(this, "过滤之后的尼斯数据:", res.data);
// this.ncldata = []; // this.ncldata = [];
this.ncldata = res.data; if (res.data != null) {
if (res.data.length) {
this.showTrees = true;
this.ncldata = res.data;
} else {
this.showTrees = false;
}
}
}); });
}, },
...@@ -674,12 +739,6 @@ export default { ...@@ -674,12 +739,6 @@ export default {
} }
} }
.a-span { .a-span {
font-family: PingFangSC-Regular;
font-size: 12px;
color: #409eff;
cursor: pointer;
margin-left: 30px;
width: 108px; width: 108px;
height: 17px; height: 17px;
font-size: 12px; font-size: 12px;
...@@ -754,6 +813,11 @@ export default { ...@@ -754,6 +813,11 @@ export default {
} }
} }
} }
// 类型是 文字及图形时 及图 字样的显示
> .demo-ruleForm > .el-form-item > .el-form-item__content > div.el-input {
display: inline-block;
width: 350px;
}
} }
// 分类信息选择 // 分类信息选择
...@@ -855,6 +919,11 @@ export default { ...@@ -855,6 +919,11 @@ export default {
border: 1px solid #dee0eb; border: 1px solid #dee0eb;
border-top: none; border-top: none;
overflow: auto; overflow: auto;
p {
text-align: center;
color: #666;
padding: 20px 0;
}
div.el-tree { div.el-tree {
margin-left: 15px; margin-left: 15px;
} }
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
...@@ -63,7 +63,13 @@ ...@@ -63,7 +63,13 @@
<div class="tabButtomPrcie"> <div class="tabButtomPrcie">
<span v-if="index == 0"> <span v-if="index == 0">
应付总额： 应付总额：
<i>￥0.00</i> <i
>￥{{
this.confirmStepsParams.stepOneThreeParams.smallKinds.length == 0
? "0.00"
: "300.00"
}}</i
>
</span> </span>
<el-button plain @click="prev" v-if="index == 1">上一步</el-button> <el-button plain @click="prev" v-if="index == 1">上一步</el-button>
<el-button type="primary" @click="next" v-if="index == 0 || index == 1" <el-button type="primary" @click="next" v-if="index == 0 || index == 1"
......
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