Skip to content

Z
zhichan
Commit a681a535 by 任建
Options

rj

parent be76d6b1
Showing with 74 additions and 41 deletions
channel-access/src/api/tmQuery.js
...@@ -22,7 +22,7 @@ export function getCompanyInfoNoUser(name) { ...@@ -22,7 +22,7 @@ export function getCompanyInfoNoUser(name) {
//申请人查询接口 //申请人查询接口
export function findTrademarkzcr(name, pageSize, currentPage) { export function findTrademarkzcr(name, pageSize, currentPage) {
return http.post("/web/action/tmQuery/springBoard", { return http.post(baseUrl, {
actionType: "findTrademarkzcr", actionType: "findTrademarkzcr",
actionBody: { actionBody: {
regMan: name, regMan: name,
......
channel-access/src/api/tmTools.js
...@@ -74,7 +74,7 @@ export function pic2pdf(url) { ...@@ -74,7 +74,7 @@ export function pic2pdf(url) {
//企业注册信息查询 //企业注册信息查询
export function getEntregistryByCompanyName(name) { export function getEntregistryByCompanyName(name) {
return http.post("/web/action/tmTools/springBoard", { return http.post(baseUrl, {
actionType: "getEntregistryByCompanyName", actionType: "getEntregistryByCompanyName",
actionBody: { actionBody: {
companyName: name companyName: name
......
channel-access/src/views/pages/companyinformation/index.vue
...@@ -250,26 +250,31 @@ ...@@ -250,26 +250,31 @@
</div> </div>
<div class="companycertificateinfo" ref="qiye"> <div class="companycertificateinfo" ref="qiye">
<h3><b></b> 子公司或分支机构</h3> <h3><b></b> 子公司或分支机构</h3>
<div v-if="QccBranches.length != 0"> <div
<table v-for="(item, index) in QccBranches" :key="index"> v-if="QccBranches.length != 0 && getcountAllList.length != 0"
>
<table v-for="(item, index) in getcountAllList" :key="index">
<thead> <thead>
<tr> <tr>
<td colspan="5" style="textAlign:left;paddingLeft:20px;"> <td colspan="5" style="textAlign:left;paddingLeft:20px;">
<span class="tdSpan" <span
class="tdSpan"
style="cursor: pointer;" style="cursor: pointer;"
@click="gotoMine(item.Name)" @click="gotoMine(item.name)"
>{{ item.Name }}</span >{{ item.name }}</span
> >
</td> </td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>特种资质</td> <td
<td>知产证照</td> v-for="(val, key, index) in getcountAllList[index].obj
<td>网络文化</td> .data"
<td>食品</td> :key="index"
<td>互联网经营</td> >
{{ key }}{{ val }}
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -447,9 +452,8 @@ import { ...@@ -447,9 +452,8 @@ import {
companyportraitCtl, companyportraitCtl,
companynamequery, companynamequery,
gxCountByAuthor, gxCountByAuthor,
getQccBranches getQccBranches,
// getcountAll, getcountAll
// ipListByAuthor
} from "@/api/enterpriseQuery.js"; } from "@/api/enterpriseQuery.js";
// //
export default { export default {
...@@ -573,6 +577,7 @@ export default { ...@@ -573,6 +577,7 @@ export default {
}, },
countGong(num) { countGong(num) {
this.shangbiaoCount = num; this.shangbiaoCount = num;
this.loading = false;
}, },
randomBrowseVolume() { randomBrowseVolume() {
return (Math.random() * 400 + 100).toFixed(0); return (Math.random() * 400 + 100).toFixed(0);
...@@ -664,30 +669,44 @@ export default { ...@@ -664,30 +669,44 @@ export default {
resolve(); resolve();
if (res.status == 0 && res.data != null) { if (res.status == 0 && res.data != null) {
this.QccBranches = res.data; this.QccBranches = res.data;
this.asyncQinqiu(this.QccBranches);
} }
}); });
}); });
Promise.all([p1, p2, p3, p5, p6, p7, p8, p9])
Promise.all([p1, p3, p2, p5, p6, p7, p8, p9])
.then(() => { .then(() => {
this.loading = false; // if(this.shangbiaoCount){
// this.loading = false;
// }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
/////////////////// ///////////////////
// if (this.QccBranches.length != 0) {
// for(var i=0;i<this.QccBranches.length-1;i++){
// awaitgetcountAll(this.QccBranches[i].Name).then(res => {
// console.log(res, "resresres");
// this.getcountAllList.push(res.data);
// });
// }
// }
/////////////////// ///////////////////
}, },
async asyncQinqiu(list) {
console.log(list.length);
if (list.length != 0) {
for (var i = 0; i < list.length - 1; i++) {
console.log(123123);
this.getcountAllList.push({
obj: await this.getCountAllNum(list[i].Name),
name: list[i].Name
});
}
}
},
getCountAllNum(name) {
return new Promise(resolve => {
getcountAll(name).then(res => {
// this.getcountAllList.push(res.data);
console.log(this.getcountAllList, "asdasdasdasqweqweqeqwe");
resolve(res);
});
});
},
//翻转表格 //翻转表格
showTable(index) { showTable(index) {
this.show = null; this.show = null;
...@@ -997,8 +1016,8 @@ export default { ...@@ -997,8 +1016,8 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
border: 1px solid rgba(238, 238, 238, 1); border: 1px solid rgba(238, 238, 238, 1);
position: relative; position: relative;
.tdSpan:hover{ .tdSpan:hover {
color:#499bff; color: #499bff;
} }
h3 { h3 {
font-size: 16px; font-size: 16px;
......
channel-access/src/views/pages/companyinformation/trademark.vue
<template> <template>
<div class="trademark"> <div class="trademark">
<div class="trademarkLoading" v-if="loading" v-loading="true"></div>
<h3> <h3>
<p class="el-icon-arrow-left" @click="showTable">返回</p> <p class="el-icon-arrow-left" @click="showTable">返回</p>
<b></b> <b></b>
...@@ -54,26 +55,29 @@ ...@@ -54,26 +55,29 @@
<script> <script>
import { findTrademarkzcr } from "@/api/tmQuery.js"; import { findTrademarkzcr } from "@/api/tmQuery.js";
export default { export default {
props:["name"], props: ["name"],
data() { data() {
return { return {
pageSize: 5, pageSize: 5,
currentPage: 1, currentPage: 1,
trademarkList: [], trademarkList: [],
itemList: [], itemList: [],
listcount: 0 listcount: 0,
loading: false
}; };
}, },
mounted() { mounted() {
findTrademarkzcr(this.name,this.pageSize,this.currentPage).then(res => { this.loading = true;
console.log(res, "获取商标注册证"); findTrademarkzcr(this.name, this.pageSize, this.currentPage).then(res => {
if (res.status == 0) { console.log(res, "获取商标注册证");
let newArr = res.data.rows; this.loading = false;
this.itemList = newArr; if (res.status == 0) {
this.listcount = res.data.count; let newArr = res.data.rows;
this.$emit("getCount",res.data.count) this.itemList = newArr;
} this.listcount = res.data.count;
}); this.$emit("getCount", res.data.count);
}
});
}, },
methods: { methods: {
//跳转详情页 //跳转详情页
...@@ -86,8 +90,10 @@ export default { ...@@ -86,8 +90,10 @@ export default {
// val * this.pageSize // val * this.pageSize
// ); // );
this.currentPage = val; this.currentPage = val;
findTrademarkzcr(this.name,this.pageSize,this.currentPage).then(res => { this.loading = true;
findTrademarkzcr(this.name, this.pageSize, this.currentPage).then(res => {
console.log(res, "获取商标注册证"); console.log(res, "获取商标注册证");
this.loading = false;
if (res.status == 0) { if (res.status == 0) {
let newArr = res.data.rows; let newArr = res.data.rows;
this.itemList = newArr; this.itemList = newArr;
...@@ -113,6 +119,14 @@ export default { ...@@ -113,6 +119,14 @@ export default {
<style lang="scss"> <style lang="scss">
.trademark { .trademark {
width: 100%; width: 100%;
position: relative;
.trademarkLoading{
position: absolute !important;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
.gotoDetail { .gotoDetail {
color: #1478f0; color: #1478f0;
cursor: pointer; cursor: pointer;
......
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