Skip to content

Z
zhichan
Commit 6ec65814 by 任建
Options

rj

parent 1a99f165
Showing with 9 additions and 15 deletions
embed_applications/app/front/vues/pages/noticetm/noticetm.html
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
</el-checkbox-group> --> </el-checkbox-group> -->
<el-radio-group v-model="selected_issue" size="mini" :border="true" <el-radio-group v-model="selected_issue" size="mini" :border="true"
@change="noticetmquery" style="dispaly:flex"> @change="noticetmquery" style="dispaly:flex">
<!-- <el-radio-button label="不限"> <el-radio-button label="不限">
不限 不限
</el-radio-button> --> </el-radio-button>
<div> <div>
<el-radio-button v-for="(item, index) in issue_list" :label="item.value" <el-radio-button v-for="(item, index) in issue_list" :label="item.value"
v-model="item.value"> v-model="item.value">
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<!-- 分页 --> <!-- 分页 -->
<div class="brandfind-list-page" v-if="tms.length"> <div class="brandfind-list-page" v-if="tms.length">
<el-pagination style="marginTop:18px;" background v-if="tms" layout="prev, pager, next" :page-size="pageSize" prev-text="上一页" <el-pagination style="marginTop:18px;" background v-if="tms" layout="prev, pager, next" :page-size="pageSize" prev-text="上一页"
next-text="下一页" :current-page="currentPage" :total="total" next-text="下一页" :current-page="currentPage" :total="total>10000 ? 10000 : total"
@current-change="currentChange"> @current-change="currentChange">
</el-pagination> </el-pagination>
</div> </div>
......
embed_applications/app/front/vues/pages/noticetm/noticetm.js
...@@ -91,10 +91,9 @@ ...@@ -91,10 +91,9 @@
this.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequeryTMZCSQ", obj).then(function (d) {
that.loading = false; that.loading = false;
that.issue_list = d.data.selectdata.slice(1,12); that.issue_list = d.data.selectdata;
that.issue_data = d.data.rows.slice(1,12); that.issue_data = d.data.rows;
that.maxdata = d.data.selectdata[0].value; that.maxdata = d.data.selectdata[0].value;
console.log(d, "//////////////////////////");
}).catch(function (e) { }).catch(function (e) {
this.loading = false; this.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
...@@ -102,10 +101,10 @@ ...@@ -102,10 +101,10 @@
}, },
/** 最新12期公告页面点击详情按钮前往公告商标查询 */ /** 最新12期公告页面点击详情按钮前往公告商标查询 */
toNoticeDetail(row){ toNoticeDetail(row){
console.log(row,";l;;;;;;;;;;;;;;;;;;");
if (row && row.notice_issue) { if (row && row.notice_issue) {
this.selected_issue = row.notice_issue; this.selected_issue = row.notice_issue;
this.brandKey = 2; this.brandKey = 2;
this.currentPage = 1;
this.noticetmquery(); this.noticetmquery();
} }
}, },
...@@ -122,7 +121,9 @@ ...@@ -122,7 +121,9 @@
"currentPage": 1 "currentPage": 1
} */ } */
console.log(v,"lllllllllllllll"); if(v!=undefined) {
this.currentPage = 1;
};
var selected_issue = ""; var selected_issue = "";
if (this.selected_issue && this.selected_issue != "不限") { if (this.selected_issue && this.selected_issue != "不限") {
selected_issue = this.selected_issue; selected_issue = this.selected_issue;
...@@ -136,7 +137,6 @@ ...@@ -136,7 +137,6 @@
applynumber: this.selected_regnum, tmname: this.selected_tmname, applynumber: this.selected_regnum, tmname: this.selected_tmname,
applier: this.selected_applier, nclNum: selected_nclNum applier: this.selected_applier, nclNum: selected_nclNum
}; };
console.log(obj);
var that = this; var that = this;
this.loading = true; this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => { this.$root.postReq("/web/tmquery/tmqueryCtl/noticequery", obj).then(d => {
...@@ -144,12 +144,10 @@ ...@@ -144,12 +144,10 @@
if (d.status == 0 && d.data) { if (d.status == 0 && d.data) {
var rows = d.data.rows; var rows = d.data.rows;
for (var i = 0; i < rows.length; i++) { for (var i = 0; i < rows.length; i++) {
console.log(rows[i],"99999999");
if (rows[i].sblb) { if (rows[i].sblb) {
var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, ""); var sblb = rows[i].sblb.replace(/(^\s*)|(\s*$)/g, "");
var nclnum = sblb.split(" ")[0]; var nclnum = sblb.split(" ")[0];
nclnum = Number(nclnum); nclnum = Number(nclnum);
console.log(nclnum);
nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name; nclnum = this.ncldata[nclnum - 1].code + " " + this.ncldata[nclnum - 1].name;
rows[i]["nclnum"] = nclnum; rows[i]["nclnum"] = nclnum;
} }
...@@ -158,14 +156,12 @@ ...@@ -158,14 +156,12 @@
that.total = d.data.count; that.total = d.data.count;
} }
}).catch(function (e) { }).catch(function (e) {
console.log(e,"lslslslls");
that.loading = false; that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`); that.$message.warning(`操作失败，请刷新页面后重新操作`);
}); });
}, },
/**商标详情 */ /**商标详情 */
toTmDetail(tm){ toTmDetail(tm){
console.log(tm.sblb);
if (tm && tm.sblb && tm.sbzch) { if (tm && tm.sblb && tm.sbzch) {
var sblb = tm.sblb.replace(/(^\s*)|(\s*$)/g, ""); var sblb = tm.sblb.replace(/(^\s*)|(\s*$)/g, "");
var nclNum = sblb.split(" ")[0]; var nclNum = sblb.split(" ")[0];
...@@ -181,7 +177,6 @@ ...@@ -181,7 +177,6 @@
} }
}, },
currentChange(v){ currentChange(v){
console.log(v);
this.currentPage = v; this.currentPage = v;
this.noticetmquery(); this.noticetmquery();
} }
......
embed_applications/app/front/vues/pages/wins/wins.js
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
}] }]
} }
}, },
methods: { methods: {
/*字数长度 */ /*字数长度 */
selectedCharatCommand(v) { selectedCharatCommand(v) {
......
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