Skip to content

Z
zhichan
Commit 04867627 by 任建
Options

123

parent 37438b9a
Showing with 161 additions and 73 deletions
embed_applications/app/front/vues/pages/brandfind/brandfind.css
......@@ -32,14 +32,14 @@
position: absolute;
padding: 0 5px;
left: 5px;
top: 3px;
background: #118EE9;
top: 6px;
background: #eeeeee;
display: flex;
min-width: 60px;
height: 35px;
height: 30px;
justify-content: space-between;
align-items: center;
z-index: 1128;
z-index: 991;
border-radius: 3px;
font-size: 14px;
text-align: center;
......@@ -47,7 +47,7 @@
}
.brandfind-search-box .upload-input-img i {
color: #ffffff;
color: #797979;
cursor: pointer;
margin-left: 15px;
}
......@@ -104,12 +104,15 @@
font-size: 24px;
}
.brandfind-main .el-tabs--border-card>.el-tabs__header .el-tabs__item{
padding: 0 30px !important;
}
.brandfind-main .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
background: #118EE9;
color: #ffffff;
}
.brandfind-main .el-tabs__nav-scroll {
background: #F9F9F9;
}
......@@ -117,19 +120,17 @@
.brandfind-main .el-tabs--border-card {
border: none;
box-shadow: none;
}
.brandfind-main .el-tabs--border-card>.el-tabs__content {
padding: 0;
}
.brandfind-main-filter {
/* width: 1066px; */
width: 100%;
min-height: 172px;
box-sizing: border-box;
padding: 32px 18px 0;
padding: 32px 30px 0;
border: 1px solid #f7f7f8;
}
......@@ -139,6 +140,7 @@
min-height: 24px;
line-height: 24px;
margin-bottom: 20px;
position: relative;
}
.brandfind-main-filter-item::after {
......@@ -176,6 +178,7 @@
.brandfind-main-filter-item .el-checkbox-button--mini .el-checkbox-button__inner {
text-align: left;
border: none;
/* width: 100px; */
margin-bottom: 10px;
......@@ -213,7 +216,7 @@
}
.brandfind-main-filter-item>.brandfind-main-filter-more {
float: right;
/* float: right; */
box-sizing: border-box;
width: 70px;
height: 24px;
......@@ -224,6 +227,10 @@
background: #FFFFFF;
border: 1px solid #D1D1D1;
border-radius: 2px;
position: absolute;
top: 0;
right: 0;
}
.brandfind-main-filter-more>button {
......@@ -373,6 +380,7 @@
height: 180px;
box-sizing: border-box;
padding: 30px;
border-bottom:1px solid rgba(247,247,248,1);
}
......@@ -606,4 +614,18 @@
margin-top: 18px;
float: right;
margin-bottom: 18px;
}
.loading-brandfind{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.el-icon-warning{
font-size: 20px;
}
.el-message{
background: #fff !important;
}
\ No newline at end of file
embed_applications/app/front/vues/pages/brandfind/brandfind.html
<div class="brandfind">
<div class="loading-brandfind" v-if="loading" v-loading="true"></div>
<div class="brandfind-box">
<div class="brandfind-title">
商标查询
......@@ -22,7 +23,7 @@
</el-input>
</div>
</div>
<div class="upload-input-img" v-if="imageText && tabsName == 4">
<div>{{imageText}}</div>
<i @click="imageTextDelete" class="el-icon-circle-close"></i>
......@@ -53,7 +54,7 @@
</el-checkbox-button>
</el-checkbox-group>
</div>
<div class="brandfind-main-filter-more">
<div v-if="ncl_list.length" class="brandfind-main-filter-more">
<!-- i标签绑定class -->
<button @click="addheight">{{collapse.text}}<i
:class="collapse.icon"></i></button>
......@@ -108,7 +109,7 @@
</el-checkbox-button>
</el-checkbox-group>
</div>
<div class="brandfind-main-filter-more">
<div v-if="ncl_list.length" class="brandfind-main-filter-more">
<!-- i标签绑定class -->
<button @click="addheight1">{{collapse1.text}}<i
:class="collapse1.icon"></i>
......@@ -142,7 +143,7 @@
</div>
<!-- 筛选结束 -->
<el-tab-pane label="相同商标">
<el-tab-pane label="相同商标" style="padding:0px 30px">
<div class="brandfind-main-equal-warpper">
<div class="brandfind-main-equal">
<!-- 表格 -->
......
embed_applications/app/front/vues/pages/brandfind/brandfind.js
......@@ -11,7 +11,7 @@
/*搜索框禁用 */
searchDisabled: false,
placeholder: '请输入商标名称、申请号、申请人等',
loading:false,
tmList: [],
tmRegistNumsAll: [],
pagesize: "10",
......@@ -129,7 +129,12 @@
/** 智能查询按钮点击事件 */
tmSearchButtonClick(){
if (!this.text) {
this.$message.warning("请输入目标");
this.$message({
dangerouslyUseHTMLString: true,
iconClass: "el-icon-warning",
type: 'warning',
message: '<strong>&nbsp;&nbsp;&nbsp;请输入搜索内容</strong>'
});
} else {
this.ncl_list = [];
this.selected_ncl_list = ["不限"];
......@@ -209,11 +214,11 @@
}
obj["flzttabkey"] = selected_legal_status_list;
}
this.$root.loading = true;
this.loading = true;
clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000);
this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkNameAccurate", obj).then(d => {
this.$root.loading = false;
this.loading = false;
console.log("精确商标查询+++++++++++++++++++");
console.log(d);
if (d && d.status == 0 && d.data) {
......@@ -233,7 +238,7 @@
}
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -302,11 +307,11 @@
} else {
obj["sbtjdata"] = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"];
}
this.$root.loading = true;
this.loading = true;
clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000);
this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkName", obj).then(d => {
this.$root.loading = false;
this.loading = false;
console.log("模糊商标查询+++++++++++++++++++");
console.log(d);
if (d && d.status == 0 && d.data) {
......@@ -325,7 +330,7 @@
this.checkboxLabelHigh = ["近似", "变字", "拼音", "同义词", "形近字", "换序", "包含该商标"];
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -377,12 +382,12 @@
}
obj["flzttabkey"] = selected_legal_status_list;
}
this.$root.loading = true;
this.loading = true;
clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000);
this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzchAccurate", obj).then(d => {
this.$root.loading = false;
this.loading = false;
console.log("注册号商标查询+++++++++++++++++++");
console.log(d);
if (d && d.status == 0 && d.data) {
......@@ -399,7 +404,7 @@
}
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -452,11 +457,11 @@
}
obj["flzttabkey"] = selected_legal_status_list;
}
this.$root.loading = true;
this.loading = true;
clearTimeout(this.timer);
this.timer = setTimeout(() => { this.$root.loading = false; }, 10000);
this.timer = setTimeout(() => { this.loading = false; }, 10000);
this.$root.postReq("/web/tmquery/tmqueryCtl/findTrademarkzcr", obj).then(d => {
this.$root.loading = false;
this.loading = false;
console.log("申请人商标查询+++++++++++++++++++");
console.log(d);
if (d && d.status == 0 && d.data) {
......@@ -473,7 +478,7 @@
}
}
}).catch(function (e) {
that.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -622,24 +627,19 @@
}
var that = this;
console.log(obj);
const loadingbyc = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(255, 255, 255, 0.7)'
});
this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/findImageSearch", obj).then(function (d) {
console.log("findImageSearch");
console.log(d);
if (d.status == 0) {
that.total = d.data.count;
that.tmList = d.data.rows;
loadingbyc.close();
that.loading = false;
}
}).catch(function (e) {
console.log(e);
that.$message.warning(`操作失败，请刷新页面后重新操作`);
loadingbyc.close();
that.loading = false;
});
},
tabClick(){
......@@ -661,6 +661,11 @@
this.selected_apply_year_list = ["不限"];
this.checkboxLabelHigh = [];
this.selected_checkboxLabelHigh = ["不限"];
this.total = 0;
this.province_counts_o= [];
this.province_counts_t= [];
this.ncl_counts_o= [];
this.ncl_counts_t= [];
}
},
nclchange(v){
......@@ -845,6 +850,15 @@
imageTextDelete(){
this.imageText = "";
this.imageUrl = "";
this.tmList = [];
this.ncl_list = [];
this.selected_ncl_list = ["不限"];
this.legal_status_list = [];
this.selected_legal_status_list = ["不限"];
this.apply_year_list = [];
this.selected_apply_year_list = ["不限"];
this.checkboxLabelHigh = [];
this.selected_checkboxLabelHigh = ["不限"];
this.imageTmsearch();
},
currentChange(v){
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.css
......@@ -75,7 +75,7 @@
box-sizing: border-box;
border: 1px solid #E6E8E9;
height: 163px;
padding-top: 110px;
padding-top: 100px;
padding-bottom: 40px;
}
......@@ -130,7 +130,7 @@
width: 100%;
box-sizing: border-box;
padding: 30px;
border: 1px solid #eee;
}
.brandfinddetails-details-box {
......@@ -281,13 +281,23 @@
}
.brandfinddetails .is-finish .is-text{
background: #f68367;
background: #f68367 !important;
}
.brandfinddetails .is-finish .el-step__line {
background: #F68367;
}
.loading-brandfind{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
.el-step__icon.is-text{
background: #ccc;
}
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.html
<div class="brandfinddetails">
<div class="loading-brandfind" v-if="loading" v-loading="true"></div>
<div class="brandfinddetails-title">
<div>
<img v-if="tmdetail.logo" :src="tmdetail.logo" alt="">
......
embed_applications/app/front/vues/pages/brandfinddetails/brandfinddetails.js
......@@ -7,11 +7,14 @@
tmdetail: {},
serviceitems: [],
serviceitems_wzc: [],
loading:false,
regNum2:null,
nclNum2:null
}
},
methods: {
getTmDetail(){
getTmDetail(){
if (!this.regNum) {
this.$message.warning("参数错误");
return;
......@@ -24,14 +27,16 @@
"sbzch": this.regNum,
"gjfl": this.nclNum
};
this.$root.loading = true;
console.log(obj,"qweqwewqeqweqeq");
this.loading = true;
this.$root.postReq("/web/tmquery/tmqueryCtl/tradeMarkDetail", obj).then(d => {
console.log("商标详情+++++++++++++++++++");
console.log(d);
this.$root.loading = false;
this.loading = false;
if (d && d.status == 0 && d.data) {
if (d.data.detaildata && d.data.detaildata.length > 0) {
this.tmdetail = d.data.detaildata[0];
this.tmdetail = JSON.parse(JSON.stringify(d.data.detaildata[0]));
console.log(this.tmdetail,"zujianzhuangtaigengxinle");
if (this.tmdetail && this.tmdetail.sbzt) {
if (this.tmdetail.sbzt == "申请中") {
this.tmdetail["active"] = 1;
......@@ -58,7 +63,7 @@
}
}).catch(function (e) {
this.$root.loading = false;
that.loading = false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
},
......@@ -71,7 +76,6 @@
mounted: function() {
this.regNum = this.$router.history.current.query.regNum || "";
this.nclNum = this.$router.history.current.query.nclNum || "";
console.log(this.$router.history);
this.getTmDetail();
this.$nextTick(() => {
......@@ -86,7 +90,15 @@
}, 600);
});
},
activated:function(){
this.regNum = this.$router.history.current.query.regNum || "";
this.nclNum = this.$router.history.current.query.nclNum || "";
if(this.regNum!=this.regNum2&&this.nclNum!=this.nclNum2){
this.getTmDetail();
}
this.regNum2 = this.$router.history.current.query.regNum || "";
this.nclNum2 = this.$router.history.current.query.nclNum || "";
},
vname: "gsb-brandfinddetails"
}
embed_applications/app/front/vues/pages/proposer/proposer.css
......@@ -121,4 +121,12 @@
height: auto;
min-height: 114px;
}
.loading-brandfind{
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
\ No newline at end of file
embed_applications/app/front/vues/pages/proposer/proposer.html
<div class="proposer">
<div class="loading-brandfind" v-if="loading" v-loading="true"></div>
<h1>
<el-row>
<el-col :span="10">{{companyInfo.name}}</el-col>
......@@ -17,8 +18,8 @@
<ul>
<li>{{companyInfo.name}}</li>
<li><span>网址：</span><span>暂无数据</span></li>
<li><span>电话：</span><span>{{companyInfo.tel_info}}</span></li>
<li><span>地址：</span><span>{{companyInfo.businessAddress}}</span></li>
<li><span>电话：</span><span v-if="companyInfo.tel_info">{{companyInfo.tel_info}}</span><span v-else>-</span></li>
<li><span>地址：</span><span v-if="companyInfo.businessAddress">{{companyInfo.businessAddress}}</span><span v-else>-</span></li>
</ul>
<!-- <div>
<el-row>
......@@ -31,43 +32,55 @@
<div class="proposer-details">
<el-row>
<el-col :span="4"> 统一社会信用代码</el-col>
<el-col :span="8"> {{companyInfo.creditCode}}</el-col>
<el-col v-if="companyInfo.creditCode" :span="8"> {{companyInfo.creditCode}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 组织机构代码</el-col>
<el-col :span="8">{{companyInfo.organizationCode}} </el-col>
<el-col v-if="companyInfo.organizationCode" :span="8"> {{companyInfo.organizationCode}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row>
<el-row>
<el-col :span="4"> 注册号</el-col>
<el-col :span="8"> {{companyInfo.registrID}}</el-col>
<el-col v-if="companyInfo.registrID" :span="8"> {{companyInfo.registrID}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 经营状态</el-col>
<el-col :span="8"> {{companyInfo.managementState}}</el-col>
<el-col v-if="companyInfo.managementState" :span="8"> {{companyInfo.managementState}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row>
<el-row>
<el-col :span="4"> 公司类型</el-col>
<el-col :span="8"> {{companyInfo.companyType}}</el-col>
<el-col v-if="companyInfo.companyType" :span="8"> {{companyInfo.companyType}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 成立日期</el-col>
<el-col :span="8">{{companyInfo.foundedTime}} </el-col>
<el-col v-if="companyInfo.foundedTime" :span="8"> {{companyInfo.foundedTime}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row>
<el-row>
<el-col :span="4"> 法定代表人</el-col>
<el-col :span="8"> {{companyInfo.legalRepresentative}}</el-col>
<el-col v-if="companyInfo.legalRepresentative" :span="8"> {{companyInfo.legalRepresentative}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 营业期限</el-col>
<el-col :span="8"> {{companyInfo.businessTerm}}</el-col>
<el-col v-if="companyInfo.businessTerm" :span="8"> {{companyInfo.businessTerm}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row>
<el-row>
<el-col :span="4"> 注册资本</el-col>
<el-col :span="8"> {{companyInfo.registeredCapital}}</el-col>
<el-col v-if="companyInfo.registeredCapital" :span="8"> {{companyInfo.registeredCapital}}</el-col>
<el-col v-else :span="8"> -</el-col>
<el-col :span="4"> 发照日期</el-col>
<el-col :span="8"> {{companyInfo.dateIssue}}</el-col>
<el-col v-if="companyInfo.dateIssue" :span="8"> {{companyInfo.busindateIssueessTerm}}</el-col>
<el-col v-else :span="8"> -</el-col>
</el-row>
<el-row>
<el-col :span="4">登记机关 </el-col>
<el-col :span="20"> {{companyInfo.registerOffice}}</el-col>
<el-col v-if="companyInfo.registerOffice" :span="20"> {{companyInfo.registerOffice}}</el-col>
<el-col v-else :span="20"> -</el-col>
</el-row>
<el-row>
<el-col :span="4"> 经营范围 </el-col>
<el-col :span="20"> {{companyInfo.scope}}</el-col>
<el-col v-if="companyInfo.scope" :span="20"> {{companyInfo.scope}}</el-col>
<el-col v-else :span="20"> -</el-col>
</el-row>
</div>
......
embed_applications/app/front/vues/pages/proposer/proposer.js
......@@ -4,6 +4,8 @@
return {
company_name:"",
companyInfo:{},
loading:false,
company_name2:null
}
},
......@@ -17,22 +19,17 @@
company_name:this.company_name
};
var that=this;
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
});
this.loading=true;
that.$root.postReq("/web/tmquery/bytmmonitCtl/getCompanyInfoNoUser", obj).then(d=> {
console.log(d);
loading.close();
that.loading=false;
if(d.code==1){
if(d.data){
that.companyInfo=d.data;
}
}
}).catch(function (e) {
loading.close();
that.loading=false;
that.$message.warning(`操作失败，请刷新页面后重新操作`);
});
}
......@@ -41,6 +38,13 @@
this.company_name = this.$router.history.current.query.company_name || "";
this.getEntDetail();
},
activated:function(){
this.company_name = this.$router.history.current.query.company_name || "";
if(this.company_name!=this.company_name2){
this.getEntDetail();
}
this.company_name2 = this.$router.history.current.query.company_name || "";
},
vname:"gsb-proposer"
}
\ 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