Skip to content

Z
zhichan
Commit ea5b2d15 by 尹亚亭
Options

bycnotice

parent 8c6fa6b7
Showing with 438 additions and 109 deletions
channel-access/src/api/tmQuery.js
......@@ -48,22 +48,36 @@ export function noticequeryTMZCSQ() {
}
// 公告列表检索接口
export function noticequery() {
export function noticequery(params) {
return http.post(baseUrl, {
actionType: "noticequery",
actionBody: {
noticenumber: "1656",
applynumber: "",
tmname: "大爱城控股",
applier: "",
noticetype: "TMZCSQ",
nclNum: "all",
// 公告列表检索接口
pageSize: 20,
currentPage: 1
}
// actionBody: {
// noticenumber: "1656",
// applynumber: "",
// tmname: "大爱城控股",
// applier: "",
// noticetype: "TMZCSQ",
// nclNum: "all",
// // 公告列表检索接口
// pageSize: 20,
// currentPage: 1
// }
actionBody: params
});
}
// 初审公告详情查询接口
export function noticeSearch(params) {
return http.post(baseUrl, {
actionType: "noticesearch",
// actionBody: {
// csggqh: 1663, //公告期号
// sbzch: "36280736" //商标注册号
// }
actionBody: params
});
}
//商标精确检索接口
export function findTrademarkNameAccurate(params) {
return http.post(baseUrl, {
......
channel-access/src/router/index.js
......@@ -115,6 +115,12 @@ const routes = [
path: "/bycnoticeindex",
name: "bycnoticeindex",
component: () => import("@/views/pages/bycnoticeindex/Bycnoticeindex")
},
// 公告查询 公告详情页
{
path: "/bycnoticedetail",
name: "bycnoticedetail",
component: () => import("@/views/pages/bycnoticedetail/Bycnoticedetail")
}
];
const router = new VueRouter({
......
channel-access/src/views/pages/bycnoticedetail/Bycnoticedetail.vue 0 → 100644
<template>
<div class="notice-details-page">
<div class="nav">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item
>
<!-- 优化点：公告类型不同 -->
<el-breadcrumb-item :to="{ path: '/bycnoticeindex' }"
>第{{ noticesearchparams.ggqh }}期商标初审公告</el-breadcrumb-item
>
<el-breadcrumb-item :to="{ path: '/bycnoticedetail' }"
>{{ sbmc }}公告详情</el-breadcrumb-item
>
</el-breadcrumb>
</div>
<div class="show-notice">
<!-- 优化点：数据图片的展示：GET net::ERR_NAME_NOT_RESOLVED 给予相应提示 -->
<img :src="linkurl" alt="" />
</div>
</div>
</template>
<script>
import { noticeSearch } from "@/api/tmQuery.js";
export default {
data() {
return {
noticesearchparams: {
ggqh: "",
sbzch: ""
},
// 面包屑部分： 商标名称
sbmc: "",
// 返回数据中的公告图形
linkurl: ""
};
},
created() {
// 面包屑部分 商标名称的装填
this.sbmc = this.$route.query.sbmc;
// 获取并装填公告详情查询参数
this.noticesearchparams.ggqh = this.$route.query.ggqh.split("(")[0];
this.noticesearchparams.sbzch = this.$route.query.sbzch;
// 进行公告详情查询
noticeSearch(this.noticesearchparams).then(res => {
if (res.status == 0) {
if (res.data == null) {
this.$notify({
title: "警告",
message: "暂时没有该公告", // 服务器端返回的数据为空
type: "warning"
});
}
// 状态码不是 0
else {
this.linkurl = res.data.linkurl;
// 域名处理 http://sbggwj.saic.gov.cn:8000/ 变为 http://sbggwj.sbj.cnipa.gov.cn:8000/ 公告才可以访问
let linkpart2 = this.linkurl.split(":8000")[1];
let rightlinkpart1 = "http://sbggwj.sbj.cnipa.gov.cn";
let rightlinkurl = rightlinkpart1.concat(":8000", linkpart2);
this.linkurl = rightlinkurl;
}
} else {
this.$notify.error({
title: "错误", // 服务器端请求失败
message: res.msg
});
}
});
}
};
</script>
<style lang="scss" scoped>
.notice-details-page {
min-height: calc(100% - 70px);
}
.nav {
width: 1200px;
margin: 0 auto;
padding: 20px 0;
}
.show-notice {
width: 889px;
height: 1260px;
padding-top: 50px;
margin: 0 auto;
img {
display: block;
border: 1px solid gray;
}
}
</style>
channel-access/src/views/pages/bycnoticeindex/Bycnoticeindex.vue
......@@ -6,7 +6,7 @@
<el-breadcrumb-item :to="{ path: '/bycnoticetm' }"
>商标公告查询</el-breadcrumb-item
>
<el-breadcrumb-item>注册公告</el-breadcrumb-item>
<el-breadcrumb-item>{{ choiceForm.num }}期公告</el-breadcrumb-item>
</el-breadcrumb>
</div>
......@@ -19,20 +19,20 @@
v-model="choiceForm.type"
placeholder="请选择"
class="info-box"
@change="changeType"
>
<el-option label="商标初步审定公告" value="chushen"></el-option>
<el-option
label="商标注册公告（一）"
value="gonggaoyi"
></el-option>
<el-option
label="商标注册公告（二）"
value="gonggaoer"
></el-option>
<el-option label="商标初步审定公告" value="TMZCSQ"></el-option>
<!--TMZCSQ TMZCZC TMQTZC-->
<el-option label="商标注册公告（一）" value="TMZCZC"></el-option>
<el-option label="商标注册公告（二）" value="TMQTZC"></el-option>
</el-select>
</el-form-item>
<el-form-item label="公告期号：" class="left-span">
<el-input v-model="choiceForm.num" class="info-box"></el-input>
<el-input
v-model="choiceForm.num"
class="info-box"
placeholder="请输入公告期号"
></el-input>
</el-form-item>
<el-form-item label="申请人：" class="left-span">
<el-input
......@@ -44,21 +44,33 @@
</el-row>
<el-row>
<el-form-item label="商标名称：" class="left-span">
<el-input v-model="choiceForm.name" class="info-box"></el-input>
<el-input
v-model="choiceForm.name"
class="info-box"
placeholder="请输入商标名称"
></el-input>
</el-form-item>
<el-form-item label="商标类别：" class="left-span">
<el-select
v-model="choiceForm.type"
v-model="choiceForm.kind"
placeholder="全部类别"
class="info-box"
@change="changeKind"
>
<el-option label="全部类别" value="all"></el-option>
<el-option label="01" value="one"></el-option>
<el-option label="02" value="two"></el-option>
<el-option
v-for="item in ncloptions"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="申请号：" class="left-span">
<el-input v-model="choiceForm.digit" class="info-box"></el-input>
<el-input
v-model="choiceForm.digit"
class="info-box"
placeholder="请输入商标申请号"
></el-input>
</el-form-item>
<el-form-item>
<el-button
......@@ -67,7 +79,10 @@
class="btn-size left-span"
>查询</el-button
>
<el-button plain class="btn-size">重置</el-button>
<el-button plain class="btn-size" @click="clearChoices"
>重置</el-button
>
</el-form-item>
</el-row>
</el-form>
......@@ -76,7 +91,7 @@
<div class="record">
<div class="title">
共
<span>&nbsp;13420&nbsp;</span>条公告数据
<span>&nbsp;{{ count }}&nbsp;</span>条公告数据
</div>
</div>
<!-- 商标表格 -->
......@@ -117,20 +132,11 @@
width="300"
></el-table-column>
<el-table-column
prop="brandtype"
prop="gglx"
label="公告类型"
align="center"
width="200"
>{{
$route.query.type == "chushen"
? "商标初步审定公告"
: $route.query.type == "gonggaoyi"
? "商标注册公告（一）"
: $route.query.type == "gonggaoer"
? "商标注册公告（二）"
: ""
}}</el-table-column
>
></el-table-column>
<el-table-column
prop="ggqh"
label="公告期号"
......@@ -141,19 +147,28 @@
prop="branddetail"
label="公告详情"
align="center"
width="100"
width="90"
>
<el-button type="text" size="small">公告详情</el-button>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="passNoticeNumber(scope.$index, scope.row)"
>公告详情</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<!-- 分页器 -->
<div class="pagenation">
<div class="pagenation" v-if="count != 0">
<el-pagination
background
layout="prev, pager, next"
:total="100"
:page-size="20"
:total="count"
@current-change="handleCurrentChange"
></el-pagination>
</div>
</div>
......@@ -166,44 +181,229 @@ export default {
return {
// 查询选择表单数据
choiceForm: {
// 公告期号
num: "",
// 公告类型
type: "",
// 申请人
user: "",
// 商标名称
name: "",
// 商标类别
kind: "",
// 申请号
digit: 323
num: "", // 公告期号
type: "", // 公告类型
user: "", // 申请人
name: "", // 商标名称
kind: "all", // 商标类别
digit: null // 申请号
},
// 商标表格数据
brandData: [],
resultData: []
// 商标类别 数据
ncloptions: [
{ value: "all", label: "全部类别" },
{ value: "1", label: "01类 化学原料" },
{ value: "2", label: "02类 颜料油漆" },
{ value: "3", label: "03类 日化用品" },
{ value: "4", label: "04类 燃料油脂" },
{ value: "5", label: "05类 医药" },
{ value: "6", label: "06类 金属材料" },
{ value: "7", label: "07类 机械设备" },
{ value: "8", label: "08类 手工器械" },
{ value: "9", label: "09类 科学仪器" },
{ value: "10", label: "10类 医疗器械" },
{ value: "11", label: "11类 灯具空调" },
{ value: "12", label: "12类 运输工具" },
{ value: "13", label: "13类 军火烟火" },
{ value: "14", label: "14类 珠宝钟表" },
{ value: "15", label: "15类 乐器" },
{ value: "16", label: "16类 办公用品" },
{ value: "17", label: "17类 橡胶制品" },
{ value: "18", label: "18类 皮革皮具" },
{ value: "19", label: "19类 建筑材料" },
{ value: "20", label: "20类 家具" },
{ value: "21", label: "21类 厨房洁具" },
{ value: "22", label: "22类 绳网袋蓬" },
{ value: "23", label: "23类 纱线丝" },
{ value: "24", label: "24类 布料床单" },
{ value: "25", label: "25类 服装鞋帽" },
{ value: "26", label: "26类 钮扣拉链" },
{ value: "27", label: "27类 地毯席垫" },
{ value: "28", label: "28类 健身器材" },
{ value: "29", label: "29类 食品" },
{ value: "30", label: "30类 方便食品" },
{ value: "31", label: "31类 农林生鲜" },
{ value: "32", label: "32类 啤酒饮料" },
{ value: "33", label: "33类 酒" },
{ value: "34", label: "34类 烟草烟具" },
{ value: "35", label: "35类 广告销售" },
{ value: "36", label: "36类 金融物管" },
{ value: "37", label: "37类 建筑修理" },
{ value: "38", label: "38类 通讯服务" },
{ value: "39", label: "39类 运输贮藏" },
{ value: "40", label: "40类 材料加工" },
{ value: "41", label: "41类 教育娱乐" },
{ value: "42", label: "42类 科技服务" },
{ value: "43", label: "43类 餐饮住宿" },
{ value: "44", label: "44类 医疗园艺" },
{ value: "45", label: "45类 社会服务" }
],
// 公告查询参数
noticequeryparams: {
noticenumber: "1656",
applynumber: "",
tmname: "大爱城控股",
applier: "",
noticetype: "TMZCSQ",
nclNum: "all",
pageSize: 20,
currentPage: 1
},
// 共查出的数据条数
count: 0
};
},
methods: {
onSubmit() {
// 点击 公告详情 跳到对应的公告详情页面
passNoticeNumber(index, row) {
// console.log(index, row);
// 提交请求
this.$router.push({
path: "/bycnoticedetail",
query: {
ggqh: row.ggqh,
sbzch: row.sbzch,
sbmc: row.sbmc // 公告请求的类型
}
});
},
// 分页器 改变当前页码
async handleCurrentChange(val) {
// 改变当前页码为点击到的高亮的页码
this.noticequeryparams.currentPage = val;
// 提交查询参数
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
let result = await noticequery(this.noticequeryparams).then(res => {
if (res.status == 0) {
if (res.data.rows.length == 0) {
this.$notify({
title: "警告",
message: "没有该商品", // 服务器端返回的数据为空
type: "warning"
});
} else {
return res.data; // 返回请求成功的非空数据
}
} else {
// 服务器端请求失败
this.$notify.error({
title: "错误",
message: res.msg
});
}
});
if (result == undefined) {
this.brandData = [];
this.count = 0;
} else {
// 请求回来的数据装填 数据表 和 记录条数
this.brandData = result.rows;
this.count = result.count;
}
},
// 提交查询
async onSubmit() {
console.log("submit!");
// 提交查询参数
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
console.log(this.noticequeryparams);
let result = await noticequery(this.noticequeryparams).then(res => {
console.log(res);
if (res.status == 0) {
if (res.data.rows.length == 0) {
// // 服务器端返回的数据为空
// this.$notify({
// title: "警告",
// message: "没有该商品",
// type: "warning"
// });
} else {
return res.data; // 返回请求成功的非空数据
}
} else {
// 服务器端请求失败
this.$notify.error({
title: "错误",
message: res.msg
});
}
});
// 如果查询后没有数据 就显示 0条记录 并 把表格数据置为空
if (result == undefined) {
this.brandData = [];
this.count = 0;
} else {
this.brandData = result.rows;
this.count = result.count;
}
},
// 下拉select框的选择条目的改变
changeKind(value) {
this.choiceForm.kind = value;
},
// 下拉公告类别的改变
changeType(val) {
this.choiceForm.type = val;
},
// 重置公告查询选项
clearChoices() {
console.log("clear, clear, clear");
this.choiceForm.num = null;
this.choiceForm.type = null;
this.choiceForm.user = null;
this.choiceForm.name = null;
this.choiceForm.kind = null;
this.choiceForm.digit = null;
}
},
created() {
noticequery().then(res => {
// form表格接收传过来的参数 并 装填上
this.choiceForm.type = this.$route.query.type;
this.choiceForm.num = this.$route.query.noticenum;
// 获取 公告查询的参数
this.noticequeryparams.noticenumber = this.choiceForm.num;
this.noticequeryparams.applynumber = this.choiceForm.digit;
this.noticequeryparams.tmname = this.choiceForm.name;
this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind;
// 进行公告查询 并 对返回的数据进行处理
noticequery(this.noticequeryparams).then(res => {
if (res.status == 0) {
if (res.data.rows.length == 0) {
// 服务器端返回的数据为空
this.$notify({
title: "警告",
message: "没有该商品",
type: "warning"
});
// this.$notify({
// title: "警告",
// message: "没有该商品",
// type: "warning"
// });
} else {
this.resultData = res.data.rows;
console.log(this.resultData);
this.brandData = res.data.rows;
this.count = res.data.count;
}
} else {
// 服务器端请求失败
......@@ -212,9 +412,9 @@ export default {
message: res.msg
});
}
console.log(res);
});
}
},
mounted() {}
};
</script>
......@@ -225,6 +425,11 @@ export default {
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
// 样式，，，
.el-breadcrumb > .el-breadcrumb__item > .el-breadcrumb__inner {
color: rgb(9, 137, 197);
font-size: 16px;
}
}
/* 查询选择表单 */
......
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
<template>
<div>
<div class="noticepage">
<!-- 头部导航面包屑 -->
<div class="nav">
<span>商标公告查询</span>
......@@ -15,15 +15,9 @@
class="info-box"
@change="changeOption"
>
<el-option label="商标初步审定公告" value="chushen"></el-option>
<el-option
label="商标注册公告（一）"
value="gonggaoyi"
></el-option>
<el-option
label="商标注册公告（二）"
value="gonggaoer"
></el-option>
<el-option label="商标初步审定公告" value="TMZCSQ"></el-option>
<el-option label="商标注册公告（一）" value="TMZCZC"></el-option>
<el-option label="商标注册公告（二）" value="TMQTZC"></el-option>
</el-select>
</el-form-item>
<el-form-item label="公告期号：" class="left-span" prop="num">
......@@ -47,13 +41,8 @@
<!-- 公告表格 -->
<div class="brand-form-wrap">
<el-table :data="brandData" class="brand-form">
<el-table-column
prop="notice_issue"
label="公告期"
align="center"
width="240"
>
<el-table :data="brandData" class="brand-form" v-loading="loading">
<el-table-column prop="notice_issue" label="公告期" align="center">
</el-table-column>
<el-table-column
prop="date"
......@@ -72,7 +61,14 @@
></el-table-column>
<el-table-column prop="operation" label="操作" align="center">
<el-button type="text" size="small">公告详情</el-button>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="passNoticeNumber(scope.$index, scope.row)"
>公告详情</el-button
>
</template>
</el-table-column>
</el-table>
</div>
......@@ -86,36 +82,33 @@ export default {
return {
// 查询选择表单数据
choiceForm: {
// 公告类型
type: "chushen",
// 公告期号
num: null
type: "TMZCSQ", // 公告类型
num: null // 公告期号
},
rule: {},
// 商标表格数据
brandData: []
brandData: [],
// 动画
loading: false
};
},
methods: {
onSubmit() {
// console.log("submit!", this.choiceForm.num);
// console.log(typeof this.choiceForm.num);
console.log(this.choiceForm.num);
if (this.choiceForm.num == null) {
console.log("konhkongkong");
this.$message({
message: "请输入目标",
type: "warning"
});
}
// 判断为
// if () {
// this.$message({
// message: "工期号只能是数字",
// type: "warning"
// });
// }
else {
} else if (/\D/.test(this.choiceForm.num)) {
this.$message({
message: "工期号只能是数字",
type: "warning"
});
} else {
this.$router.push({
path: "/bycnoticeindex",
query: {
......@@ -129,23 +122,37 @@ export default {
// console.log(value);
this.choiceForm.type = value;
console.log("change change", this.choiceForm.type);
},
passNoticeNumber(index, row) {
this.choiceForm.num = row.notice_issue;
// 提交请求
this.$router.push({
path: "/bycnoticeindex",
query: {
type: this.choiceForm.type,
noticenum: this.choiceForm.num
}
});
}
},
created() {
// 刷新页面取消查询的query参数
this.$router.push("/bycnoticetm");
this.loading = true;
noticequeryTMZCSQ().then(res => {
this.brandData = res.data.rows;
this.loading = false;
});
},
mounted() {
console.log(this.choiceForm.type);
}
mounted() {}
};
</script>
<style lang="scss" scoped>
.noticepage {
// 企链 70px的footer ; 启服通的footer是377px
min-height: calc(100% - 70px);
}
/* 头部导航面包屑 */
.nav {
width: 1200px;
......@@ -221,6 +228,7 @@ export default {
font-family: PingFangSC-Regular;
font-size: 14px;
color: #333333;
// 样式，，，
> .el-table__body-wrapper
> .el-table__body
> tbody
......
channel-access/src/views/pages/jdbycquerytm/index.vue
......@@ -22,7 +22,7 @@
<el-button type="primary">检索</el-button>
</div>
<div class="jdbycquerytm-serch-right">
<el-button>公告查询</el-button>
<el-button @click="$router.push('/bycnoticetm')">公告查询</el-button>
</div>
</div>
<div class="jdbycquerytm-tabs">
......
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