Skip to content

Z
zhichan
Commit 0cc9a986 by 任建
Options

Merge branch 'channel-access' of gitlab.gongsibao.com:jiangyong/zhichan into channel-access

parents dfb0a519 df9ebe9f
Showing with 145 additions and 58 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 />
...@@ -254,20 +259,32 @@ import imgUrl2 from "@/assets/imgs/sbzc/wtsD.png"; ...@@ -254,20 +259,32 @@ import imgUrl2 from "@/assets/imgs/sbzc/wtsD.png";
import imgUrl3 from "@/assets/imgs/sbzc/yxqD.png"; import imgUrl3 from "@/assets/imgs/sbzc/yxqD.png";
import { getCompanyInfoByLikeName } from "@/api/tmTools.js"; import { getCompanyInfoByLikeName } from "@/api/tmTools.js";
export default { export default {
// 接收父组件传过来的参数
// props: ["stepsParams"],
data() { data() {
return { return {
// 申请人信息表格 及 验证 // 申请人信息表格 及 验证
aruleForm: { aruleForm: {
name: "中", // 申请人类型：企业 个体户
resource: 1, resource: 1,
xinyongma: "",
// 企业
// 公司名称
name: "中",
// 执照详细地址
address: "", address: "",
// 邮政编码（企业和个体户）
postal: "", postal: "",
username: "", // 统一社会信用代码（企业和个体户）
idCard: "", xinyongma: "",
zhuAddress: "",
// 个体户
// 姓名
uname: "", uname: "",
// 身份证号
uid: "", uid: "",
// 身份证住址
uaddress: "" uaddress: ""
}, },
arules: { arules: {
...@@ -323,6 +340,7 @@ export default { ...@@ -323,6 +340,7 @@ export default {
toViewImgSrc: "" toViewImgSrc: ""
}; };
}, },
mounted() {},
methods: { methods: {
// 资料上传 // 资料上传
enter(index) { enter(index) {
...@@ -353,13 +371,10 @@ export default { ...@@ -353,13 +371,10 @@ export default {
cb(res.data); cb(res.data);
}); });
}, },
// 统一社会信用代码 和 执照详细地址 的自动装填
handleSelect(item) { handleSelect(item) {
this.aruleForm.xinyongma = item.creditCode; this.aruleForm.xinyongma = item.creditCode;
this.aruleForm.address = item.regLocation; this.aruleForm.address = item.regLocation;
},
addMessage() {
console.log(this.ruleForm);
} }
}, },
updated() { updated() {
......
channel-access/src/views/pages/selftmreg/ConfirmOrder.vue
...@@ -223,33 +223,34 @@ export default { ...@@ -223,33 +223,34 @@ export default {
data() { data() {
return { return {
textarea: "", textarea: "",
// 选中的商标种类 // 选中的商标种类
checkedKinds: [], checkedKinds: [],
// 商标展示 // 商标展示
// 手动上传 或 上传 的商标
brandIconManual: "", brandIconManual: "",
// 自动上传的商标
brandIconAuto: "" brandIconAuto: ""
}; };
}, },
methods: { methods: {
// 子向父传参 this.$emit(eventName,params)
// 编辑 商标信息 // 编辑 商标信息
goStepOne() { goStepOne() {
console.log(111);
// 去第一步骤的页面 // 去第一步骤的页面
this.$emit("getIndex", 0); this.$emit("getIndex", 0);
}, },
// 编辑 申请人及联系人信息 // 编辑 申请人及联系人信息
goStepTwo() { goStepTwo() {
console.log(222);
// 去第二步骤的页面 // 去第二步骤的页面
this.$emit("getIndex", 1); this.$emit("getIndex", 1);
} }
}, },
created() { created() {
// 获取缓存里面的已经选中的商品/服务项
let checkedKinds = JSON.parse(localStorage.getItem("classDataList")); let checkedKinds = JSON.parse(localStorage.getItem("classDataList"));
this.checkedKinds = checkedKinds; this.checkedKinds = checkedKinds;
// 获取缓存里面的商标图片地址
let brandIconManual = localStorage.getItem("manualImgToConfirm"); let brandIconManual = localStorage.getItem("manualImgToConfirm");
this.brandIconManual = brandIconManual; this.brandIconManual = brandIconManual;
let brandIconAuto = localStorage.getItem("autoImgToConfirm"); let brandIconAuto = localStorage.getItem("autoImgToConfirm");
......
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,9 +190,12 @@ ...@@ -184,9 +190,12 @@
@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>
<!-- 右侧选中呈现与清除选择 --> <!-- 右侧选中呈现与清除选择 -->
<div class="classTrademark-right"> <div class="classTrademark-right">
<div class="classTrademark-right-top"> <div class="classTrademark-right-top">
<p>已选择的商品/服务项</p> <p>已选择的商品/服务项</p>
...@@ -229,6 +238,7 @@ ...@@ -229,6 +238,7 @@
</template> </template>
<script> <script>
// 导入获取接口数据的方法
import { import {
getNiceQueryCategory, getNiceQueryCategory,
getNiceQueryFilter, getNiceQueryFilter,
...@@ -236,9 +246,11 @@ import { ...@@ -236,9 +246,11 @@ import {
getOss, getOss,
uploadStandardTm uploadStandardTm
} from "@/api/tmTools.js"; } from "@/api/tmTools.js";
// 导入图片上传的公共组件
import UploadImg from "@/components/uploadImg"; import UploadImg from "@/components/uploadImg";
export default { export default {
// props: ["stepsParams"],
components: { components: {
UploadImg UploadImg
}, },
...@@ -345,7 +357,58 @@ export default { ...@@ -345,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() {
...@@ -468,6 +531,7 @@ export default { ...@@ -468,6 +531,7 @@ export default {
}); });
if (index == -1) { if (index == -1) {
this.classDataList.push(data); this.classDataList.push(data);
// 把选中的小类数据保存在localstorage里面 // 把选中的小类数据保存在localstorage里面
localStorage.setItem( localStorage.setItem(
"classDataList", "classDataList",
...@@ -489,6 +553,7 @@ export default { ...@@ -489,6 +553,7 @@ export default {
message: "最多选择10项", message: "最多选择10项",
type: "warning" type: "warning"
}); });
// 把此节点设置为不可选中状态
this.$refs.tree.setChecked(data, false); this.$refs.tree.setChecked(data, false);
} }
} else { } else {
...@@ -510,8 +575,6 @@ export default { ...@@ -510,8 +575,6 @@ export default {
hasChild = true; hasChild = true;
} }
// console.log(node);
// 初始的一级45个类别的静态数据的装填 // 初始的一级45个类别的静态数据的装填
if (node.level === 0) { if (node.level === 0) {
return resolve(this.ncldata); return resolve(this.ncldata);
...@@ -526,7 +589,6 @@ export default { ...@@ -526,7 +589,6 @@ export default {
let index = this.ncldata.findIndex((item, index) => { let index = this.ncldata.findIndex((item, index) => {
return item.code == node.data.code; return item.code == node.data.code;
}); });
// console.log(index);
this.ncldata[index].children = res.data.rows; this.ncldata[index].children = res.data.rows;
setTimeout(() => { setTimeout(() => {
var data; var data;
...@@ -560,43 +622,56 @@ export default { ...@@ -560,43 +622,56 @@ 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 =
checkedCount > 0 && checkedCount < this.checkedList.length; checkedCount > 0 && checkedCount < this.checkedList.length;
this.keyZi = ""; // this.keyZi = "";
}, },
// 点击确定,隐藏类别选择框 // 点击确定,隐藏类别选择框
confirmClass() { confirmClass() {
this.typeListShow = false; this.typeListShow = false;
}, },
// 过滤关键字 绑定el-input的change事件,使得在输入框失去焦点或用户按下回车keyCode=13时触发 // 过滤关键字 绑定.native回车事件 用户按下回车keyCode=13时触发
filterKeyZi() { filterKeyZi() {
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;
}
}
}); });
}, },
...@@ -614,9 +689,10 @@ export default { ...@@ -614,9 +689,10 @@ export default {
this.action = res.data.url; this.action = res.data.url;
}); });
// 获取并更改最外层父组件的数据 // // 去编辑之后的信息装填
this.$parent.$parent.abc = 456; // this.ruleForm.resource = this.stepsParams.stepOneThreeParams.type;
console.log("11111", this.$parent.$parent.abc); // this.ruleForm.name = this.stepsParams.stepOneThreeParams.tname;
// this.imgUrl = this.stepsParams.stepOneThreeParams.icon;
}, },
updated() { updated() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -629,9 +705,6 @@ export default { ...@@ -629,9 +705,6 @@ export default {
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.bigKind = this.$refs.bigKind.innerHTML;
this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList; this.$parent.$parent.confirmStepsParams.stepOneThreeParams.smallKinds = this.classDataList;
} }
// 手动上传按钮的改变
// this.manualupload();
}); });
} }
}; };
...@@ -666,12 +739,6 @@ export default { ...@@ -666,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;
...@@ -746,6 +813,11 @@ export default { ...@@ -746,6 +813,11 @@ export default {
} }
} }
} }
// 类型是 文字及图形时 及图 字样的显示
> .demo-ruleForm > .el-form-item > .el-form-item__content > div.el-input {
display: inline-block;
width: 350px;
}
} }
// 分类信息选择 // 分类信息选择
...@@ -847,6 +919,11 @@ export default { ...@@ -847,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/PayOrder.vue deleted 100644 → 0
<!-- 第四步：支付订单页面 -->
<template>
<div>支付订单页面</div>
</template>
\ No newline at end of file
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