Skip to content

Z
zhichan
Commit 68414eee by 尹亚亭
Options

yyt

parent 30cd869e
Showing with 165 additions and 27 deletions
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
</el-form-item> </el-form-item>
<div v-if="aruleForm.resource == 1"> <div v-if="aruleForm.resource == 1">
<el-form-item label="公司名称：" prop="name"> <el-form-item label="公司名称：" prop="name">
<!-- @blur.native="handleInputCompanyNameBlur" -->
<el-autocomplete <el-autocomplete
v-model="aruleForm.name" v-model="aruleForm.name"
:fetch-suggestions="querySearchAsync" :fetch-suggestions="querySearchAsync"
...@@ -36,14 +37,13 @@ ...@@ -36,14 +37,13 @@
:trigger-on-focus="false" :trigger-on-focus="false"
clearable clearable
:debounce="700" :debounce="700"
@blur.native="handleInputCompanyNameBlur"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码：" prop="xinyongma"> <el-form-item label="统一社会信用代码：" prop="xinyongma">
<!-- @blur="handleInputCreditCodeBlur" -->
<el-input <el-input
v-model="aruleForm.xinyongma" v-model="aruleForm.xinyongma"
placeholder="请输入统一社会信用代码" placeholder="请输入统一社会信用代码"
@blur="handleInputCreditCodeBlur"
></el-input> ></el-input>
<el-popover <el-popover
placement="right-end" placement="right-end"
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
</el-popover> </el-popover>
</el-form-item> </el-form-item>
<el-form-item label="执照详细地址：" prop="address"> <el-form-item label="执照详细地址：" prop="address">
<!-- @blur="handleInputLicenseAddressBlur" -->
<el-input <el-input
v-model="aruleForm.address" v-model="aruleForm.address"
placeholder="请输入执照详细地址" placeholder="请输入执照详细地址"
@blur="handleInputLicenseAddressBlur"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="邮政编码：" prop="postal"> <el-form-item label="邮政编码：" prop="postal">
...@@ -344,7 +344,6 @@ export default { ...@@ -344,7 +344,6 @@ export default {
this.chakanKey = index; this.chakanKey = index;
}, },
lookImage(index) { lookImage(index) {
// console.log(123123);
this.toViewImgType = true; this.toViewImgType = true;
switch (index) { switch (index) {
case 1: case 1:
...@@ -362,16 +361,17 @@ export default { ...@@ -362,16 +361,17 @@ export default {
// 申请人模糊查询 // 申请人模糊查询
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
//企业近似查询 //企业近似查询
getCompanyInfoByLikeName(this.ruleForm.name).then(res => { getCompanyInfoByLikeName(this.aruleForm.name).then(res => {
res.data.map(item => { res.data.map(item => {
item.value = item.domainEntName; item.value = item.domainEntName;
}); });
cb(res.data); cb(res.data);
}); });
}, },
handleSelect(item) { handleSelect(item) {
this.ruleForm.xinyongma = item.creditCode; this.aruleForm.xinyongma = item.creditCode;
this.ruleForm.address = item.regLocation; this.aruleForm.address = item.regLocation;
}, },
addMessage() { addMessage() {
console.log(this.ruleForm); console.log(this.ruleForm);
...@@ -425,6 +425,51 @@ export default { ...@@ -425,6 +425,51 @@ export default {
handleInputEmailBlur() { handleInputEmailBlur() {
this.$bus.emit("on-input-email-blur", this.ruleForm.email); this.$bus.emit("on-input-email-blur", this.ruleForm.email);
} }
},
updated() {
this.$nextTick(() => {
//
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype = this.aruleForm.resource;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.atype
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName = this.aruleForm.name;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.companyName
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode = this.aruleForm.xinyongma;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.creditCode
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress = this.aruleForm.address;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.licenseAddress
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode = this.aruleForm.postal;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.postalCode
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username = this.aruleForm.uname;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.username
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard = this.aruleForm.uid;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idCard
);
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress = this.aruleForm.uaddress;
console.log(
this.$parent.$parent.confirmStepsParams.stepTwoNineParams.idAddress
);
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode = this.aruleForm.xinyongma;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.ucreditCode
// );
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode = this.aruleForm.postal;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepTwoNineParams.upostalCode
// );
});
} }
}; };
</script> </script>
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
...@@ -23,19 +23,16 @@ ...@@ -23,19 +23,16 @@
</p> </p>
<p> <p>
<strong>商标图样：</strong> <strong>商标图样：</strong>
<img src="http://temp.im/104x104/ff5a5f/fff" alt /> <img :src="brandIcon" alt />
</p> </p>
<p> <p>
<strong>商标类别：</strong> <strong>商标类别：</strong>
<span class="detail-type"> <span class="detail-type">
<i>15 类 乐器</i> <i>15 类 乐器</i>
<br /> <br />
<b>150001 手风琴</b> <b v-for="item in checkedKinds" :key="item.fullname">{{
<b>150008 钢琴</b> item.fullname
<b>150011 小六角手风琴</b> }}</b>
<b>150013 低音提琴（乐器）</b>
<b>150016 大号（号）</b>
<b>150019 小铃帽（乐器）</b>
</span> </span>
</p> </p>
</div> </div>
...@@ -130,7 +127,13 @@ export default { ...@@ -130,7 +127,13 @@ export default {
data() { data() {
return { return {
textarea: "" textarea: "",
// 选中的商标种类
checkedKinds: [],
// 商标展示
brandIcon: "",
brandIcon1: "",
brandIcon2: ""
}; };
}, },
methods: { methods: {
...@@ -140,7 +143,18 @@ export default { ...@@ -140,7 +143,18 @@ export default {
// 去第二步骤的页面 // 去第二步骤的页面
} }
}, },
mounted() {} created() {
let checkedKinds = JSON.parse(localStorage.getItem("classDataList"));
this.checkedKinds = checkedKinds;
let brandIcon1 = localStorage.getItem("manualImgToConfirm");
this.brandIcon1 = brandIcon1;
let brandIcon2 = localStorage.getItem("autoImgToConfirm");
this.brandIcon2 = brandIcon2;
this.brandIcon = this.brandIcon1;
console.log(this.brandIcon);
}
}; };
</script> </script>
...@@ -203,6 +217,8 @@ export default { ...@@ -203,6 +217,8 @@ export default {
} }
img { img {
display: inline-block; display: inline-block;
width: 140px;
height: 140px;
border: 2px dashed rgb(233, 233, 233); border: 2px dashed rgb(233, 233, 233);
vertical-align: top; vertical-align: top;
} }
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
...@@ -205,7 +205,9 @@ ...@@ -205,7 +205,9 @@
</div> </div>
<div class="classData" v-else> <div class="classData" v-else>
<div class="classData-top"> <div class="classData-top">
<h4>第{{ classCode }}类 {{ ncldata[classCode * 1 - 1].name }}</h4> <h4 ref="bigKind">
第{{ classCode }}类 {{ ncldata[classCode * 1 - 1].name }}
</h4>
<p> <p>
已选择 已选择
<span>{{ classDataList.length }}</span <span>{{ classDataList.length }}</span
...@@ -350,13 +352,15 @@ export default { ...@@ -350,13 +352,15 @@ export default {
checkedList: [], checkedList: [],
// 树是否展开 // 树是否展开
isTreeExpand: false isTreeExpand: false,
// 自动生成 和 手动上传的图片 的保存
autoImgToConfirm: "",
manualImgToConfirm: ""
}; };
}, },
created() { created() {
this.checkedList = this.ncldata; this.checkedList = this.ncldata;
// 测试数据
}, },
methods: { methods: {
// 抽屉展示 // 抽屉展示
...@@ -364,7 +368,10 @@ export default { ...@@ -364,7 +368,10 @@ export default {
this.loading = true; this.loading = true;
this.imgUrl = msg; this.imgUrl = msg;
uploadStandardTm(this.imgUrl).then(res => { uploadStandardTm(this.imgUrl).then(res => {
console.log(res); // 手动上传图片的保存
this.manualImgToConfirm = res.data.url;
localStorage.setItem("manualImgToConfirm", this.manualImgToConfirm);
// console.log(this.manualImgToConfirm);
this.loading = false; this.loading = false;
if (res.status == 0) { if (res.status == 0) {
this.$message({ this.$message({
...@@ -377,7 +384,6 @@ export default { ...@@ -377,7 +384,6 @@ export default {
}); });
}, },
setKey(name, flag) { setKey(name, flag) {
// name = name.substring(name.length - 5);
var myDate = new Date(); var myDate = new Date();
var key = var key =
"zc_" + "zc_" +
...@@ -388,7 +394,6 @@ export default { ...@@ -388,7 +394,6 @@ export default {
myDate.getMonth() + myDate.getMonth() +
myDate.getDate() + myDate.getDate() +
".jpg"; ".jpg";
// this.$refs[flag].data.key = key;
return key; return key;
}, },
lookImg(title, index) { lookImg(title, index) {
...@@ -396,14 +401,19 @@ export default { ...@@ -396,14 +401,19 @@ export default {
this.lookIndex = index; this.lookIndex = index;
this.drawerRight = true; this.drawerRight = true;
}, },
// 自动生成
automatic() { automatic() {
if (this.ruleForm.name) { if (this.ruleForm.name) {
this.loading = true; this.loading = true;
word2pic(this.ruleForm.name).then(res => { word2pic(this.ruleForm.name).then(res => {
console.log(res);
this.loading = false; this.loading = false;
if (res.status == 0) { if (res.status == 0) {
this.imgUrl = res.data.url; this.imgUrl = res.data.url;
// 自动生成的图片
this.autoImgToConfirm = res.data.url;
localStorage.setItem("autoImgToConfirm", this.autoImgToConfirm);
// console.log(this.autoImgToConfirm);
} }
}); });
} }
...@@ -446,11 +456,14 @@ export default { ...@@ -446,11 +456,14 @@ export default {
// 类型选择 参数传递 // 类型选择 参数传递
handleRadiosChooseClick() { handleRadiosChooseClick() {
this.$bus.emit("on-radioschoose-click", this.ruleForm.resource); // this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
// console.log(
// this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
// );
// this.$bus.emit("on-radioschoose-click", this.ruleForm.resource);
}, },
// 输入名字 参数传递 // 输入名字 参数传递
handleInputBrandnameBlur() { handleInputBrandnameBlur() {
console.log(1, this.ruleForm.name);
this.$bus.emit("on-input-brandname-blur", this.ruleForm.name); this.$bus.emit("on-input-brandname-blur", this.ruleForm.name);
}, },
...@@ -475,8 +488,12 @@ export default { ...@@ -475,8 +488,12 @@ export default {
return data.code == item.code; return data.code == item.code;
}); });
if (index == -1) { if (index == -1) {
// this.classDataList.splice(index, 1);
this.classDataList.push(data); this.classDataList.push(data);
// 把选中的小类数据保存在localstorage里面
localStorage.setItem(
"classDataList",
JSON.stringify(this.classDataList)
);
} }
} else { } else {
// 被选中的数据不属于同一个类别，给出相应的提示信息 // 被选中的数据不属于同一个类别，给出相应的提示信息
...@@ -617,6 +634,32 @@ export default { ...@@ -617,6 +634,32 @@ export default {
this.data.key = this.setKey(); this.data.key = this.setKey();
this.action = res.data.url; this.action = res.data.url;
}); });
// 获取并更改最外层父组件的数据
this.$parent.$parent.abc = 456;
console.log("11111", this.$parent.$parent.abc);
},
updated() {
this.$nextTick(() => {
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type = this.ruleForm.resource;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.type
);
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname = this.ruleForm.name;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.tname
);
if (this.$refs.bigKind) {
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind
);
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
console.log(
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds
);
}
});
} }
}; };
</script> </script>
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
...@@ -79,6 +79,40 @@ export default { ...@@ -79,6 +79,40 @@ export default {
// 是否已经勾选同意协议 // 是否已经勾选同意协议
checked: false, checked: false,
abc: 1243,
// 验证参数
confirmStepsParams: {
stepOneThreeParams: {
// 商标选择
type: 1,
tname: "",
icon: "",
// 分类选择
bigKind: "",
smallKinds: []
},
stepTwoNineParams: {
// 申请人类别
atype: 1,
// 申请人类型：企业
companyName: "",
creditCode: "",
licenseAddress: "",
postalCode: "",
// 申请人类型：个体户
username: "",
idCard: "",
idAddress: "",
ucreditCode: "",
upostalCode: "",
// 联系人类别
customer: "",
telNum: "",
email: ""
}
},
shareParams: { shareParams: {
steponeChoose: { steponeChoose: {
type: 1, type: 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