Skip to content

Z
zhichan
Commit a372502b by 尹亚亭
Options

bycnotice

parents ea5b2d15 fde79904
Showing with 163 additions and 130 deletions
channel-access/src/api/tmQuery.js
...@@ -20,23 +20,6 @@ export function getCompanyInfoNoUser(name) { ...@@ -20,23 +20,6 @@ export function getCompanyInfoNoUser(name) {
}); });
} }
//申请人查询接口
export function findTrademarkzcr(name, pageSize, currentPage) {
return http.post(baseUrl, {
actionType: "findTrademarkzcr",
actionBody: {
regMan: name,
sqlbtabkey: "",
flzttabkey: "",
sqnftabkey: "",
zcrname: "",
xcl: [],
pageSize: pageSize,
currentPage: currentPage
}
});
}
// 近12期初审公告 // 近12期初审公告
export function noticequeryTMZCSQ() { export function noticequeryTMZCSQ() {
return http.post(baseUrl, { return http.post(baseUrl, {
...@@ -51,17 +34,7 @@ export function noticequeryTMZCSQ() { ...@@ -51,17 +34,7 @@ export function noticequeryTMZCSQ() {
export function noticequery(params) { export function noticequery(params) {
return http.post(baseUrl, { return http.post(baseUrl, {
actionType: "noticequery", actionType: "noticequery",
// actionBody: {
// noticenumber: "1656",
// applynumber: "",
// tmname: "大爱城控股",
// applier: "",
// noticetype: "TMZCSQ",
// nclNum: "all",
// // 公告列表检索接口
// pageSize: 20,
// currentPage: 1
// }
actionBody: params actionBody: params
}); });
} }
...@@ -93,3 +66,19 @@ export function findTrademarkName(params) { ...@@ -93,3 +66,19 @@ export function findTrademarkName(params) {
actionBody: params actionBody: params
}); });
} }
//商标申请号查询接口
export function findTrademarkzchAccurate(params) {
return http.post(baseUrl, {
actionType: "findTrademarkzchAccurate",
actionBody: params
});
}
//商标申请人查询接口
export function findTrademarkzcr(params) {
return http.post(baseUrl, {
actionType: "findTrademarkzcr",
actionBody: params
});
}
channel-access/src/views/pages/bycnoticeindex/Bycnoticeindex.vue
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
layout="prev, pager, next" layout="prev, pager, next"
:page-size="20" :page-size="20"
:total="count" :total="count"
:current-page="noticequeryparams.currentPage"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
></el-pagination> ></el-pagination>
</div> </div>
...@@ -324,18 +325,13 @@ export default { ...@@ -324,18 +325,13 @@ export default {
this.noticequeryparams.applier = this.choiceForm.user; this.noticequeryparams.applier = this.choiceForm.user;
this.noticequeryparams.noticetype = this.choiceForm.type; this.noticequeryparams.noticetype = this.choiceForm.type;
this.noticequeryparams.nclNum = this.choiceForm.kind; this.noticequeryparams.nclNum = this.choiceForm.kind;
this.noticequeryparams.currentPage = 1;
console.log(this.noticequeryparams); console.log(this.noticequeryparams);
let result = await noticequery(this.noticequeryparams).then(res => { let result = await noticequery(this.noticequeryparams).then(res => {
console.log(res); console.log(res);
if (res.status == 0) { if (res.status == 0) {
if (res.data.rows.length == 0) { if (res.data.rows.length == 0) {
// // 服务器端返回的数据为空
// this.$notify({
// title: "警告",
// message: "没有该商品",
// type: "warning"
// });
} else { } else {
return res.data; // 返回请求成功的非空数据 return res.data; // 返回请求成功的非空数据
} }
......
channel-access/src/views/pages/bycnoticetm/Bycnoticetm.vue
...@@ -148,94 +148,102 @@ export default { ...@@ -148,94 +148,102 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.noticepage { .noticepage {
// 企链 70px的footer ; 启服通的footer是377px // 企链 70px的footer ; 启服通的footer是377px
min-height: calc(100% - 70px); min-height: calc(100% - 70px);
}
/* 头部导航面包屑 */
.nav {
width: 1200px;
margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
span {
font-weight: 500;
line-height: 20px;
font-size: 16px;
color: #03004c;
}
}
/* 查询选择表单 */ .choice-form {
.choice-form { .el-input__inner {
background: #f7f8fc; border-radius: 0px;
border: 1px solid #eff1f9;
width: 1198px;
height: 76px;
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
background: #0989c5;
width: 80px;
height: 34px;
padding: 0;
box-sizing: border-box;
border-radius: 0;
line-height: 0;
} }
} }
.has-gutter tr th {
.left-span { background: #d6daeb;
margin-left: 20px;
height: 34px;
} }
/* 头部导航面包屑 */
.info-box { .nav {
width: 300px; width: 1200px;
border-radius: 0px; margin: 0 auto;
padding-top: 21px;
padding-bottom: 18px;
span {
font-weight: 500;
line-height: 20px;
font-size: 16px;
color: #03004c;
}
} }
.btn-size { /* 查询选择表单 */
width: 60px; .choice-form {
height: 34px; background: #f7f8fc;
font-family: PingFangSC-Regular; border: 1px solid #eff1f9;
font-size: 14px; width: 1198px;
height: 76px;
margin: 0 auto;
.first-row {
margin-top: 18px;
button.el-button {
background: #0989c5;
width: 80px;
height: 34px;
padding: 0;
box-sizing: border-box;
border-radius: 0;
line-height: 0;
}
}
.left-span {
margin-left: 20px;
height: 34px;
}
.info-box {
width: 300px;
border-radius: 0px;
}
.btn-size {
width: 60px;
height: 34px;
font-family: PingFangSC-Regular;
font-size: 14px;
}
} }
}
/* 最新12期初审公告 */ /* 最新12期初审公告 */
.record { .record {
width: 1200px; width: 1200px;
margin: 0 auto; margin: 0 auto;
height: 40px; height: 40px;
span { span {
padding-left: 17px; padding-left: 17px;
font-size: 14px; font-size: 14px;
color: rgb(130, 130, 130); color: rgb(130, 130, 130);
line-height: 40px; line-height: 40px;
}
} }
}
/* 商标表格 */ /* 商标表格 */
.brand-form-wrap { .brand-form-wrap {
width: 1198px; width: 1198px;
margin: 0 auto; margin: 0 auto;
border: 1px solid #d6daeb; border: 1px solid #d6daeb;
margin-bottom: 100px; margin-bottom: 100px;
.brand-form { .brand-form {
font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
// 样式，，， // 样式，，，
> .el-table__body-wrapper }
> .el-table__body .el-table__row {
> tbody td:nth-child(4) {
> .el-table__row .cell {
> .el-table_1_column_4 color: #de2828;
> .cell { }
color: rgb(255, 90, 0); }
} }
} }
} }
......
channel-access/src/views/pages/jdbycquerytm/bomTable.vue
<template> <template>
<div class="bomTable"> <div class="bomTable">
<div class="bomTable-item" v-for="(item, index) in data" :key="index"> <div
class="bomTable-item"
v-for="(item, index) in data"
:key="index"
@click="gotoDetail(item)"
>
<div class="bomTable-item-left"> <div class="bomTable-item-left">
<img :src="item.logo" alt="" /> <img :src="item.logo" alt="" />
</div> </div>
...@@ -9,14 +14,32 @@ ...@@ -9,14 +14,32 @@
<h1>{{ item.sbmc }}</h1> <h1>{{ item.sbmc }}</h1>
</div> </div>
<div class="bomTable-item-right-container"> <div class="bomTable-item-right-container">
<p>法律状态：<span class="zhuceSpan">{{item.sbzt}}</span></p> <p>
<p>国际分类：<span>{{item.gjflname}}</span></p> 法律状态：<span class="zhuceSpan">{{
<p>申请号：<span>{{item.sbzch}}</span></p> item.sbzt ? item.sbzt : "---"
<p>申请日期：<span>{{item.sqrq}}</span></p> }}</span>
<p>初审公告日期：<span>{{item.csrq}}</span></p> </p>
<p>注册公告日期：<span>{{item.zcrq}}</span></p> <p>
<p>申请人：<span>{{item.zcr}}</span></p> 国际分类：<span>{{ item.gjflname ? item.gjflname : "---" }}</span>
<p>商标群组：<span>{{item.sbqz}}</span></p> </p>
<p>
申请号：<span>{{ item.sbzch ? item.sbzch : "---" }}</span>
</p>
<p>
申请日期：<span>{{ item.sqrq ? item.sqrq : "---" }}</span>
</p>
<p>
初审公告日期：<span>{{ item.csrq ? item.csrq : "---" }}</span>
</p>
<p>
注册公告日期：<span>{{ item.zcrq ? item.zcrq : "---" }}</span>
</p>
<p>
申请人：<span>{{ item.zcr ? item.zcr : "---" }}</span>
</p>
<p>
商标群组：<span>{{ item.sbq ? item.sbq : "---" }}</span>
</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -26,8 +49,17 @@ ...@@ -26,8 +49,17 @@
<script> <script>
export default { export default {
props: ["data"], props: ["data"],
updated() { methods: {
console.log(this.data); gotoDetail(item) {
let routeData = this.$router.resolve({
name: "jdbycdetailtm",
query: {
sbzch: item.sbzch,
gjfl: item.gjfl
}
});
window.open(routeData.href, "_blank");
}
} }
}; };
</script> </script>
...@@ -41,14 +73,15 @@ export default { ...@@ -41,14 +73,15 @@ export default {
.bomTable-item { .bomTable-item {
width: 100%; width: 100%;
padding: 30px 0; padding: 30px 0;
border-bottom: 1px solid #D6DAEB; border-bottom: 1px solid #d6daeb;
display: flex; display: flex;
cursor: pointer;
} }
} }
.bomTable-item-left { .bomTable-item-left {
width: 160px; width: 160px;
height: 98px; height: 98px;
border: 1px solid #EFF1F9; border: 1px solid #eff1f9;
margin-right: 25px; margin-right: 25px;
img { img {
width: 100%; width: 100%;
...@@ -85,7 +118,7 @@ export default { ...@@ -85,7 +118,7 @@ export default {
span { span {
color: #2f2f2f; color: #2f2f2f;
} }
.zhuceSpan{ .zhuceSpan {
color: #108ee9; color: #108ee9;
} }
} }
......
channel-access/src/views/pages/jdtrademark/Jdtmsearch.vue
...@@ -127,13 +127,20 @@ export default { ...@@ -127,13 +127,20 @@ export default {
checkedCount > 0 && checkedCount < this.typeList.length; checkedCount > 0 && checkedCount < this.typeList.length;
}, },
goSearch() { goSearch() {
this.$router.push({ if (this.searchValue) {
path: `/jdbycquerytm`, this.$router.push({
query: { path: `/jdbycquerytm`,
checkedNcl: JSON.stringify(this.checkedType), query: {
tminput: this.searchValue checkedNcl: JSON.stringify(this.checkedType),
} tminput: this.searchValue
}); }
});
}else {
this.$message({
message:"请输入搜索内容！",
type:"warning"
})
}
} }
} }
}; };
......
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