Skip to content

Z
zhichan
Commit 4efacb9c by 任建
Options

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

parents 1ff4efd8 1f9fd8c7
Showing with 421 additions and 219 deletions
channel-access/src/router/index.js
......@@ -5,119 +5,104 @@ import VueRouter from "vue-router";
Vue.use(VueRouter);
const routes = [{
path: "/home",
name: "home",
component: () =>
import ("@/views/pages/home")
},
{
path: "/companyinformation",
name: "companyinformation",
component: () =>
import ("@/views/pages/companyinformation")
},
{
path: "/",
redirect: "/home"
},
{
path: "/user",
name: "user",
redirect: "/user/login",
component: () =>
import ("@/views/pages/user"),
children: [{
path: "login",
name: "login",
component: () =>
import ("@/views/pages/user/login")
},
{
path: "register",
name: "register",
component: () =>
import ("@/views/pages/user/register")
},
{
path: "forgetpassword",
name: "forgetpassword",
component: () =>
import ("@/views/pages/user/forgetPassword")
}
]
},
{
path: "/cashier",
name: "cashier",
component: () =>
import ("@/views/pages/cashier")
},
{
path: "/productdetails",
name: "productdetails",
component: () =>
import ("@/views/pages/productdetails")
},
{
path: "/successfulpayment",
name: "successfulpayment",
component: () =>
import ("@/views/pages/successfulpayment")
},
{
path: "/placeorder",
name: "placeorder",
component: () =>
import ("@/views/pages/placeorder")
},
{
path: "/jdbycdetailtm",
name: "jdbycdetailtm",
component: () =>
import ("@/views/pages/jdbycdetailtm")
},
{
path: "/companydetail",
name: "companydetail",
component: () =>
import ("@/views/pages/companydetail")
},
{
path: "/jdindentlist",
name: "jdindentdetail",
component: () =>
import ("@/views/pages/jdindentlist")
},
{
path: "/jdindentdetail",
name: "jdindentdetail",
component: () =>
import ("@/views/pages/jdindentdetail")
},
/////////
{
path: "/jdtrademark",
name: "jdtrademark",
component: () =>
import ("@/views/pages/jdtrademark/Jdtrademark")
},
{
path: "/selftmreg",
name: "selftmreg",
component: () =>
import ("@/views/pages/selftmreg/Selftmreg")
},
{
// path: "/bycnoticeindex",
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () =>
import ("@/views/pages/bycnoticeindex/Bycnoticeindex")
}
const routes = [
{
path: "/home",
name: "home",
component: () => import("@/views/pages/home")
},
{
path: "/companyinformation",
name: "companyinformation",
component: () => import("@/views/pages/companyinformation")
},
{
path: "/",
redirect: "/home"
},
{
path: "/user",
name: "user",
redirect: "/user/login",
component: () => import("@/views/pages/user"),
children: [
{
path: "login",
name: "login",
component: () => import("@/views/pages/user/login")
},
{
path: "register",
name: "register",
component: () => import("@/views/pages/user/register")
},
{
path: "forgetpassword",
name: "forgetpassword",
component: () => import("@/views/pages/user/forgetPassword")
}
]
},
{
path: "/cashier",
name: "cashier",
component: () => import("@/views/pages/cashier")
},
{
path: "/productdetails",
name: "productdetails",
component: () => import("@/views/pages/productdetails")
},
{
path: "/successfulpayment",
name: "successfulpayment",
component: () => import("@/views/pages/successfulpayment")
},
{
path: "/placeorder",
name: "placeorder",
component: () => import("@/views/pages/placeorder")
},
{
path: "/jdbycdetailtm",
name: "jdbycdetailtm",
component: () => import("@/views/pages/jdbycdetailtm")
},
{
path: "/companydetail",
name: "companydetail",
component: () => import("@/views/pages/companydetail")
},
{
path: "/jdindentlist",
name: "jdindentlist",
component: () => import("@/views/pages/jdindentlist")
},
{
path: "/jdindentdetail",
name: "jdindentdetail",
component: () => import("@/views/pages/jdindentdetail")
},
/////////
{
path: "/jdtrademark",
name: "jdtrademark",
component: () => import("@/views/pages/jdtrademark/Jdtrademark")
},
{
path: "/selftmreg",
name: "selftmreg",
component: () => import("@/views/pages/selftmreg/Selftmreg")
},
{
// path: "/bycnoticeindex",
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () => import("@/views/pages/bycnoticeindex/Bycnoticeindex")
}
];
const router = new VueRouter({
routes
routes
});
// router.beforeEach((to, from, next) => {
......@@ -138,4 +123,4 @@ const router = new VueRouter({
// }
// });
export default router;
\ No newline at end of file
export default router;
channel-access/src/views/pages/selftmreg/ApplicationInfo.vue
......@@ -155,6 +155,7 @@
</el-form-item>
</el-form>
</div>
<!-- 资料上传 -->
<div class="info-title">
<i class="selftmreg_shuxian"></i>
......@@ -168,8 +169,21 @@
<!-- 上传营业执照 -->
<div class="from-items">
<div class="from-item-title"><span>*</span>上传材料：营业执照</div>
<div class="upload-box">
<!-- 1 -->
<div class="upload-box" v-loading="loading1">
<img v-if="imgUrl1" :src="imgUrl1" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 1 上传营业执照 -->
<UploadImg
:action="action"
:data="dataone"
ref="upImg"
flag="picUrl"
:num="1"
@getsuccess="getImgUrl"
/>
</div>
<div class="upload-box-next">
<img src="@/assets/imgs/sbzc/yyzz1.png" alt />
......@@ -193,12 +207,25 @@
"
>
<div class="from-item-title"><span>*</span>上传材料：身份证明</div>
<div class="upload-box">
<img src="" alt />
<div class="upload-box" v-loading="loading4">
<img v-if="imgUrl4" :src="imgUrl4" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 2 身份证 -->
<UploadImg
:action="action"
:data="datatwo"
ref="upImg"
flag="picUrl"
:num="4"
@getsuccess="getImgUrl"
/>
</div>
<div class="upload-box-next">
<img src="@/assets/imgs/sbzc/sfz.png" alt />
<div class="chakan" @click="lookImage(1)">查看大图</div>
<div class="chakan" @click="lookImage(4)">查看大图</div>
</div>
<div class="text">
......@@ -217,8 +244,21 @@
>下载委托书模板</a
>
</div>
<div class="upload-box">
<div class="upload-box" v-loading="loading2">
<img v-if="imgUrl2" :src="imgUrl2" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 2 -->
<UploadImg
:action="action"
:data="datatwo"
ref="upImg"
flag="picUrl"
:num="2"
@getsuccess="getImgUrl"
/>
</div>
<div class="upload-box-next">
<img src="@/assets/imgs/sbzc/wts1.png" alt />
......@@ -241,24 +281,70 @@
>下载优先权证明</a
>
</div>
<div class="upload-box">
<div class="upload-box" v-loading="loading3">
<img v-if="imgUrl3" :src="imgUrl3" alt="" />
<div v-else class="imgs">
<i class="el-icon-plus"></i>
<span>(需盖公章)</span>
</div>
<!-- 3 -->
<UploadImg
:action="action"
:data="datathree"
ref="upImg"
flag="picUrl"
:num="3"
@getsuccess="getImgUrl"
/>
</div>
<div class="upload-box-next">
<img src="@/assets/imgs/sbzc/yxq.png" alt />
<div class="chakan" @click="lookImage(3)">查看大图</div>
</div>
<div class="text">
<i class="el-icon-warning"></i>
（非必填）如果申请人在提交申请前6个月内在政府主办的国内或国际的展会进行使用的，<br />请上传由申请人盖章或签字的中文代理委托书彩色扫描件，格式为宽高的大小为<br />
可以提交使用证明，则商标局实质审查时，按使用日开始审查。
</div>
</div>
</div>
</div>
<!-- dialog -->
<el-dialog
style="z-index:99999;background:rgba(0,0,0,.3)"
title=""
:visible.sync="toViewImgType"
center
width="72%"
append-to-body
>
<img
:src="toViewImgSrc"
style="max-width:100%;display:block;margin: 0 auto;"
alt=""
/>
</el-dialog>
</div>
</template>
<script>
// 导入资料上传的查看大图的图片
import imgUrl1 from "@/assets/imgs/sbzc/yyzzD.png";
import imgUrl2 from "@/assets/imgs/sbzc/wtsD.png";
import imgUrl3 from "@/assets/imgs/sbzc/yxqD.png";
import { getCompanyInfoByLikeName } from "@/api/tmTools.js";
import imgUrl4 from "@/assets/imgs/sbzc/sfzD.png";
// 导入公司模糊查询 和 上传材料部分的的上传
import {
getCompanyInfoByLikeName,
getOss,
uploadStandardTm,
pic2pdf
} from "@/api/tmTools.js";
//
import UploadImg from "@/components/uploadImg";
export default {
components: {
UploadImg
},
// 接收父组件传过来的参数
// props: ["stepsParams"],
data() {
......@@ -337,12 +423,97 @@ export default {
// 资料上传
chakanKey: null,
toViewImgType: false,
toViewImgSrc: ""
toViewImgSrc: "",
action: "",
dataone: {},
datatwo: {},
datathree: {},
loading1: false,
loading2: false,
loading3: false,
loading4: false,
imgUrl: "",
imgUrl1: "",
imgUrl2: "",
imgUrl3: "",
imgUrl4: ""
};
},
mounted() {},
mounted() {
//
this.getOss();
},
methods: {
// 资料上传
getImgUrl(msg, num) {
this.imgUrl = msg;
if (num == 1) {
this.loading1 = true;
this.imgUrl1 = msg;
}
if (num == 2) {
this.loading2 = true;
this.imgUrl2 = msg;
}
if (num == 3) {
this.loading3 = true;
this.imgUrl3 = msg;
}
// 身份证
if (num == 4) {
this.loading4 = true;
this.imgUrl4 = msg;
}
uploadStandardTm(this.imgUrl).then(res => {
if (res.status == 0) {
//图片转pdf
pic2pdf(res.data.url).then(re => {
this.loading1 = false;
this.loading2 = false;
this.loading3 = false;
this.loading4 = false;
if (re.status == 0) {
this.$message({
type: "success",
message: "上传成功"
});
} else {
this.$message.error("上传失败，请重新上传！");
}
});
} else {
this.$message.error("上传失败，请重新上传！");
}
//上传后重新获取偶oss
this.getOss();
});
},
getOss() {
getOss().then(re => {
this.dataone = re.data;
this.datatwo = re.data;
this.datathree = re.data;
this.dataone.key = this.setKey();
this.datatwo.key = this.setKey();
this.datathree.key = this.setKey();
this.action = re.data.url;
});
},
setKey(name, flag) {
// name = name.substring(name.length - 5);
var myDate = new Date();
var key =
"zc_" +
flag +
Math.round(Math.random() * 10000) +
myDate.getTime() +
myDate.getFullYear() +
myDate.getMonth() +
myDate.getDate() +
".jpg";
return key;
},
//
enter(index) {
this.chakanKey = index;
},
......@@ -358,6 +529,9 @@ export default {
case 3:
this.toViewImgSrc = imgUrl3;
break;
case 4:
this.toViewImgSrc = imgUrl4;
break;
}
},
......@@ -596,6 +770,27 @@ export default {
position: relative;
border: 3px dashed #ccc;
margin-left: 20px;
img {
width: 100%;
height: 100%;
}
.imgs {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
i {
font-size: 30px;
color: #b8b8b8;
}
span {
color: #0f8ee9;
font-size: 12px;
margin-top: 20px;
}
}
}
.upload-box-next {
width: 98px;
......
channel-access/src/views/pages/selftmreg/ModifyTrademark.vue
......@@ -159,15 +159,9 @@
<el-button type="text" @click="confirmClass">确定</el-button>
</div>
<el-checkbox-group
v-model="checkedType"
v-model="checkedNcl"
@change="handleCheckedCitiesChange"
>
<!-- <el-checkbox
v-for="(item, index) in checkedList"
:label="item.code + item.name"
:key="index + '-' + item.code"
>{{ item.code }}</el-checkbox
> -->
<el-checkbox v-for="n in nclOptions" :label="n" :key="n">{{
n
}}</el-checkbox>
......@@ -180,18 +174,22 @@
:props="props"
:data="ncldata"
empty-text="暂无数据"
node-key="name+code"
node-key="fullname"
show-checkbox
:expand-on-click-node="false"
:default-expand-all="isTreeExpand"
:render-after-expand="false"
lazy
:load="loadNode"
@check-change="handleCheckChange"
ref="tree"
id="classtree"
@check-change="handleCheckChange"
@check="handleCheck"
></el-tree>
<p v-else>暂无数据</p>
<!-- @node-click="handleNodeClick" -->
<!-- @check-change="handleCheckChange" -->
<!-- @node-click="handleCheckChange" -->
<!-- :default-expand-all="isTreeExpand" -->
</div>
</div>
<!-- 右侧选中呈现与清除选择 -->
......@@ -292,53 +290,53 @@ export default {
},
children: "children"
},
// 初始静态分类数据 和全部分类 typeList 的复用数据
// 初始静态分类数据 和 全部分类 typeList 的复用数据
ncldata: [
{ code: "01", name: "化学原料", type: 1 },
{ code: "02", name: "颜料油漆", type: 1 },
{ code: "03", name: "日化用品", type: 1 },
{ code: "04", name: "燃料油脂", type: 1 },
{ code: "05", name: "医药", type: 1 },
{ code: "06", name: "金属材料", type: 1 },
{ code: "07", name: "机械设备", type: 1 },
{ code: "08", name: "手工器械", type: 1 },
{ code: "09", name: "科学仪器", type: 1 },
{ code: "10", name: "医疗器械", type: 1 },
{ code: "11", name: "灯具空调", type: 1 },
{ code: "12", name: "运输工具", type: 1 },
{ code: "13", name: "军火烟火", type: 1 },
{ code: "14", name: "珠宝钟表", type: 1 },
{ code: "15", name: "乐器", type: 1 },
{ code: "16", name: "办公用品", type: 1 },
{ code: "17", name: "橡胶制品", type: 1 },
{ code: "18", name: "皮革皮具", type: 1 },
{ code: "19", name: "建筑材料", type: 1 },
{ code: "20", name: "家具", type: 1 },
{ code: "21", name: "厨房洁具", type: 1 },
{ code: "22", name: "绳网袋篷", type: 1 },
{ code: "23", name: "纱线丝", type: 1 },
{ code: "24", name: "布料床单", type: 1 },
{ code: "25", name: "服装鞋帽", type: 1 },
{ code: "26", name: "纽扣拉链", type: 1 },
{ code: "27", name: "地毯席垫", type: 1 },
{ code: "28", name: "健身器材", type: 1 },
{ code: "29", name: "食品", type: 1 },
{ code: "30", name: "方便食品", type: 1 },
{ code: "31", name: "饲料种籽", type: 1 },
{ code: "32", name: "啤酒饮料", type: 1 },
{ code: "33", name: "酒", type: 1 },
{ code: "34", name: "烟草烟具", type: 1 },
{ code: "35", name: "广告销售", type: 1 },
{ code: "36", name: "金融物管", type: 1 },
{ code: "37", name: "建筑修理", type: 1 },
{ code: "38", name: "通讯服务", type: 1 },
{ code: "39", name: "运输贮藏", type: 1 },
{ code: "40", name: "材料加工", type: 1 },
{ code: "41", name: "教育娱乐", type: 1 },
{ code: "42", name: "网站服务", type: 1 },
{ code: "43", name: "餐饮住宿", type: 1 },
{ code: "44", name: "医疗园艺", type: 1 },
{ code: "45", name: "社会服务", type: 1 }
{ code: "01", name: "化学原料" },
{ code: "02", name: "颜料油漆" },
{ code: "03", name: "日化用品" },
{ code: "04", name: "燃料油脂" },
{ code: "05", name: "医药" },
{ code: "06", name: "金属材料" },
{ code: "07", name: "机械设备" },
{ code: "08", name: "手工器械" },
{ code: "09", name: "科学仪器" },
{ code: "10", name: "医疗器械" },
{ code: "11", name: "灯具空调" },
{ code: "12", name: "运输工具" },
{ code: "13", name: "军火烟火" },
{ code: "14", name: "珠宝钟表" },
{ code: "15", name: "乐器" },
{ code: "16", name: "办公用品" },
{ code: "17", name: "橡胶制品" },
{ code: "18", name: "皮革皮具" },
{ code: "19", name: "建筑材料" },
{ code: "20", name: "家具" },
{ code: "21", name: "厨房洁具" },
{ code: "22", name: "绳网袋篷" },
{ code: "23", name: "纱线丝" },
{ code: "24", name: "布料床单" },
{ code: "25", name: "服装鞋帽" },
{ code: "26", name: "纽扣拉链" },
{ code: "27", name: "地毯席垫" },
{ code: "28", name: "健身器材" },
{ code: "29", name: "食品" },
{ code: "30", name: "方便食品" },
{ code: "31", name: "饲料种籽" },
{ code: "32", name: "啤酒饮料" },
{ code: "33", name: "酒" },
{ code: "34", name: "烟草烟具" },
{ code: "35", name: "广告销售" },
{ code: "36", name: "金融物管" },
{ code: "37", name: "建筑修理" },
{ code: "38", name: "通讯服务" },
{ code: "39", name: "运输贮藏" },
{ code: "40", name: "材料加工" },
{ code: "41", name: "教育娱乐" },
{ code: "42", name: "网站服务" },
{ code: "43", name: "餐饮住宿" },
{ code: "44", name: "医疗园艺" },
{ code: "45", name: "社会服务" }
],
// 被选中分类数据，最多十条
classDataList: [],
......@@ -349,7 +347,7 @@ export default {
typeListShow: false,
isIndeterminate: true,
checkAll: false,
checkedType: [],
checkedNcl: [],
checkedList: [],
// 树是否展开
......@@ -359,7 +357,7 @@ export default {
autoImgToConfirm: "",
manualImgToConfirm: "",
//
// 尼斯数据分类选择
nclOptions: [
"01",
"02",
......@@ -408,7 +406,10 @@ export default {
"45"
],
//显示树
showTrees: true
showTrees: true,
// 测试的选中的节点
checkedNodes: []
};
},
created() {
......@@ -479,8 +480,11 @@ export default {
// 清除选中的标签
handleClose(tag) {
this.classDataList.splice(this.classDataList.indexOf(tag), 1);
// 清除左边对应的数组的选中状态
this.$refs.tree.setChecked(tag, false);
// 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() {
......@@ -492,7 +496,7 @@ export default {
.then(() => {
// 把左边的复选框的选中样式取消
this.classDataList.map(item => {
this.$refs.tree.setChecked(item, false);
this.$refs.tree.setChecked(item, false, true);
});
// 数组置为空
this.classDataList = [];
......@@ -539,13 +543,13 @@ export default {
);
}
} else {
// 被选中的数据不属于同一个类别，把此节点设置为不可选中状态
this.$refs.tree.setChecked(data, false, true);
// 被选中的数据不属于同一个类别，给出相应的提示信息
this.$message({
message: "只能选择同一个类别",
type: "warning"
});
// 被选中的数据不属于同一个类别，把此节点设置为不可选中状态
this.$refs.tree.setChecked(data, false);
}
} else {
// 被选中的数据大于10条，给出相应提示，并把Checked设置为false
......@@ -554,7 +558,7 @@ export default {
type: "warning"
});
// 把此节点设置为不可选中状态
this.$refs.tree.setChecked(data, false);
this.$refs.tree.setChecked(data, false, true);
}
} else {
// 如果第三级节点没被选中，找出没被选中的数据的下标，把其从数组中清除，以此实现左边勾选取消右侧的选中的标签数据的对应清除
......@@ -619,57 +623,74 @@ export default {
}
});
},
// // 节点点击时的方法
// 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;
},
// 全部选中
handleCheckAllChange(val) {
// if (val) {
// let data = [];
// console.log(this.checkedList, ",,,,children,,,,");
// this.checkedList.map((item, index) => {
// data.push(`${item.code}${item.name}`);
// });
// this.checkedType = data;
// this.isIndeterminate = false;
// } else {
// this.checkedType = [];
// }
this.checkedType = val ? this.nclOptions : [];
this.checkedNcl = val ? this.nclOptions : [];
this.isIndeterminate = false;
},
//选中
handleCheckedCitiesChange(value) {
console.log(value);
// this.checkedType = value;
let checkedCount = value.length;
this.checkAll = checkedCount === this.checkedList.length;
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.checkedList.length;
// this.keyZi = "";
},
// 点击确定,隐藏类别选择框
confirmClass() {
this.typeListShow = false;
// 确定好分类之后也触发搜索
this.filterKeyZi();
},
// 过滤关键字 绑定.native回车事件 用户按下回车keyCode=13时触发
filterKeyZi() {
let classCodes = this.checkedType.map(item => {
var _that = this;
// 从 checkedNcl ？ 里面截取类别码
let classCodes = this.checkedNcl.map(item => {
return item.substring(0, 2);
});
console.log(this);
// 根据输入的关键字和选择的分类类别进行尼斯查询过滤
getNiceQueryFilter(this.keyZi, classCodes).then(res => {
console.log(this, "过滤之后的尼斯数据:", res.data);
// console.log(
// res.data == null,
// res.data != null,
// "过滤之后的尼斯数据:",
// res.data
// );
// this.ncldata = [];
if (res.data != null) {
// console.log(res.data.length);
if (res.data.length) {
this.showTrees = true;
this.ncldata = res.data;
_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.ncldata = res.data;
} else {
this.showTrees = false;
_that.showTrees = false;
}
}
});
......@@ -678,7 +699,9 @@ export default {
// 取消搜索
cancelSearch() {
this.keyZi = "";
this.checkedType = [];
this.checkedNcl = [];
// 显示树形结构
}
},
mounted() {
......@@ -688,11 +711,6 @@ export default {
this.data.key = this.setKey();
this.action = res.data.url;
});
// // 去编辑之后的信息装填
// this.ruleForm.resource = this.stepsParams.stepOneThreeParams.type;
// this.ruleForm.name = this.stepsParams.stepOneThreeParams.tname;
// this.imgUrl = this.stepsParams.stepOneThreeParams.icon;
},
updated() {
this.$nextTick(() => {
......
channel-access/src/views/pages/selftmreg/Selftmreg.vue
......@@ -81,7 +81,7 @@
</label>
<el-button
type="primary"
@click="next"
@click="goCashier"
v-if="index == 2"
:disabled="!checked"
:class="{ disabled: !checked }"
......@@ -164,6 +164,11 @@ export default {
},
created() {},
methods: {
// 去支付页面
goCashier() {
console.log("go cashier !!!!");
this.$router.push("/cashier");
},
// 商品/服务项目不足10项 对话框 点击确定按钮 进入第二步 填写申请人信息
intoStepTwo() {
this.dialogVisible = false;
......
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