rj

channel-access/src/api/tmQuery.js

@@ -22,7 +22,7 @@ export function getCompanyInfoNoUser(name) {
 
 //申请人查询接口
 export function findTrademarkzcr(name, pageSize, currentPage) {
-    return http.post("/web/action/tmQuery/springBoard", {
+    return http.post(baseUrl, {
         actionType: "findTrademarkzcr",
         actionBody: {
             regMan: name,

channel-access/src/api/tmTools.js

@@ -74,7 +74,7 @@ export function pic2pdf(url) {
 
 //企业注册信息查询
 export function getEntregistryByCompanyName(name) {
-    return http.post("/web/action/tmTools/springBoard", {
+    return http.post(baseUrl, {
         actionType: "getEntregistryByCompanyName",
         actionBody: {
             companyName: name

channel-access/src/views/pages/companyinformation/index.vue

@@ -250,26 +250,31 @@
             </div>
             <div class="companycertificateinfo" ref="qiye">
               <h3><b></b> 子公司或分支机构</h3>
-              <div v-if="QccBranches.length != 0">
-                <table v-for="(item, index) in QccBranches" :key="index">
+              <div
+                v-if="QccBranches.length != 0 && getcountAllList.length != 0"
+              >
+                <table v-for="(item, index) in getcountAllList" :key="index">
                   <thead>
                     <tr>
                       <td colspan="5" style="textAlign:left;paddingLeft:20px;">
-                        <span class="tdSpan"
+                        <span
+                          class="tdSpan"
                           style="cursor: pointer;"
-                          @click="gotoMine(item.Name)"
-                          >{{ item.Name }}</span
+                          @click="gotoMine(item.name)"
+                          >{{ item.name }}</span
                         >
                       </td>
                     </tr>
                   </thead>
                   <tbody>
                     <tr>
-                      <td>特种资质</td>
-                      <td>知产证照</td>
-                      <td>网络文化</td>
-                      <td>食品</td>
-                      <td>互联网经营</td>
+                      <td
+                        v-for="(val, key, index) in getcountAllList[index].obj
+                          .data"
+                        :key="index"
+                      >
+                        {{ key }}{{ val }}
+                      </td>
                     </tr>
                   </tbody>
                 </table>
@@ -447,9 +452,8 @@ import {
   companyportraitCtl,
   companynamequery,
   gxCountByAuthor,
-  getQccBranches
-  // getcountAll,
-  // ipListByAuthor
+  getQccBranches,
+  getcountAll
 } from "@/api/enterpriseQuery.js";
 //
 export default {
@@ -573,6 +577,7 @@ export default {
     },
     countGong(num) {
       this.shangbiaoCount = num;
+      this.loading = false;
     },
     randomBrowseVolume() {
       return (Math.random() * 400 + 100).toFixed(0);
@@ -664,30 +669,44 @@ export default {
           resolve();
           if (res.status == 0 && res.data != null) {
             this.QccBranches = res.data;
+            this.asyncQinqiu(this.QccBranches);
           }
         });
       });
-
-      Promise.all([p1, p3, p2, p5, p6, p7, p8, p9])
+      Promise.all([p1, p2, p3, p5, p6, p7, p8, p9])
         .then(() => {
-          this.loading = false;
+          // if(this.shangbiaoCount){
+          // this.loading = false;
+          // }
         })
         .catch(() => {
           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) {
       this.show = null;
@@ -997,8 +1016,8 @@ export default {
       margin-bottom: 15px;
       border: 1px solid rgba(238, 238, 238, 1);
       position: relative;
-      .tdSpan:hover{
-        color:#499bff;
+      .tdSpan:hover {
+        color: #499bff;
       }
       h3 {
         font-size: 16px;

channel-access/src/views/pages/companyinformation/trademark.vue

 <template>
   <div class="trademark">
+    <div class="trademarkLoading" v-if="loading" v-loading="true"></div>
     <h3>
       <p class="el-icon-arrow-left" @click="showTable">返回</p>
       <b></b>
@@ -54,26 +55,29 @@
 <script>
 import { findTrademarkzcr } from "@/api/tmQuery.js";
 export default {
-  props:["name"],
+  props: ["name"],
   data() {
     return {
       pageSize: 5,
       currentPage: 1,
       trademarkList: [],
       itemList: [],
-      listcount: 0
+      listcount: 0,
+      loading: false
     };
   },
   mounted() {
-      findTrademarkzcr(this.name,this.pageSize,this.currentPage).then(res => {
-        console.log(res, "获取商标注册证");
-        if (res.status == 0) {
-          let newArr = res.data.rows;
-          this.itemList = newArr;
-          this.listcount = res.data.count;
-          this.$emit("getCount",res.data.count)
-        }
-      });
+    this.loading = true;
+    findTrademarkzcr(this.name, this.pageSize, this.currentPage).then(res => {
+      console.log(res, "获取商标注册证");
+      this.loading = false;
+      if (res.status == 0) {
+        let newArr = res.data.rows;
+        this.itemList = newArr;
+        this.listcount = res.data.count;
+        this.$emit("getCount", res.data.count);
+      }
+    });
   },
   methods: {
     //跳转详情页
@@ -86,8 +90,10 @@ export default {
       //   val * this.pageSize
       // );
       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, "获取商标注册证");
+        this.loading = false;
         if (res.status == 0) {
           let newArr = res.data.rows;
           this.itemList = newArr;
@@ -113,6 +119,14 @@ export default {
 <style lang="scss">
 .trademark {
   width: 100%;
+  position: relative;
+  .trademarkLoading{
+    position: absolute !important;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
   .gotoDetail {
     color: #1478f0;
     cursor: pointer;