修改曾用名

src/views/company/companyDetails.vue

@@ -1063,11 +1063,13 @@ export default {
       display: flex;
       margin-left: 15px;
       div {
-        width: 18%;
+        width: 25%;
+        height: 22px;
         font-size: 16px;
-        text-align: center;
+        padding-left: 10px;
+        // text-align: center;
         color: #c7d8ec;
-        border-right: 1px solid #c7d8ec;
+         border-right: 4px solid #c7d8ec;
       }
       div:last-child {
         border-right: transparent;

src/views/company/companyProfile.vue

@@ -39,7 +39,7 @@
             }}</a-descriptions-item>
             <a-descriptions-item label="营业期限"
               >{{ baseinfo.from_time }}-{{
-                baseinfo.to_time?baseinfo.to_time:'无固定期限'
+                baseinfo.to_time ? baseinfo.to_time : "无固定期限"
               }}</a-descriptions-item
             >
             <a-descriptions-item label="纳税人资质">{{
@@ -64,9 +64,14 @@
             <a-descriptions-item label="登记机关" :span="2">{{
               baseinfo.register_org
             }}</a-descriptions-item>
-            <a-descriptions-item label="曾用名" :span="1">{{
+            <a-descriptions-item label="曾用名" :span="1">
+              <!-- {{
               baseinfo.history_name ? baseinfo.history_name : "无"
-            }}</a-descriptions-item>
+            }} -->
+              <div v-for="item in baseinfo.history_name">
+                {{ item }}
+              </div>
+            </a-descriptions-item>
             <a-descriptions-item label="英文名" :span="2">{{
               baseinfo.en_name
             }}</a-descriptions-item>
@@ -192,13 +197,11 @@ export default {
           title: "认缴出资额",
           dataIndex: "amount",
           key: "amount",
-         
         },
         {
           title: "认缴出资日期",
           dataIndex: "",
           key: "",
-         
         },
       ],
       // columns_history: [
@@ -227,13 +230,13 @@ export default {
       //     title: "退出日期",
       //     dataIndex: "address",
       //     key: "address 3",
-          
+
       //   },
       //   {
       //     title: "认缴出资额",
       //     dataIndex: "address",
       //     key: "address 4",
-         
+
       //   },
       //   {
       //     title: "认缴出资日期",
@@ -263,12 +266,8 @@ export default {
       //     // },
       //   },
       // ],
-      data_shareholder: [
-       
-      ],
-      history_shareholder: [
-       
-      ],
+      data_shareholder: [],
+      history_shareholder: [],
       columns_keyperson: [
         {
           title: "序号",
@@ -338,7 +337,6 @@ export default {
           title: "序号",
           dataIndex: "index",
           key: "index",
-          
         },
         {
           title: "披露日期",

src/views/company/index.vue

@@ -21,7 +21,9 @@
   </div>
   <div class="company">
     <a-breadcrumb class="nav_bread">
-      <a-breadcrumb-item><router-link :to="'/home'">首页</router-link></a-breadcrumb-item>
+      <a-breadcrumb-item
+        ><router-link :to="'/home'">首页</router-link></a-breadcrumb-item
+      >
       <a-breadcrumb-item>企业</a-breadcrumb-item>
     </a-breadcrumb>
     <div class="company_con">
@@ -209,6 +211,7 @@ import {
 } from "../../utils/indexApi.js";
 import "dayjs/locale/zh-cn";
 import zh_CN from "ant-design-vue/lib/locale-provider/zh_CN";
+import { message } from "ant-design-vue";
 dayjs.locale("zh-cn");
 export default {
   name: "company",
@@ -283,6 +286,7 @@ export default {
     },
     //改变页码
     onChange(page) {
+      window.scrollTo(0, 0);
       //获取当前页码数
       this.currentPage = page;
       //修改省份的格式
@@ -346,11 +350,33 @@ export default {
         rangetime1: [],
       };
       this.industryvalue = [];
-      this.filter = []
-      this.Filter()
+      this.filter = [];
+      this.Filter();
     },
     //点击筛选
     Filter() {
+      if (
+        this.formState.capital_nums_min == "" &&
+        this.formState.capital_nums_max != ""
+      ) {
+        message.error("请输入完整的注册资本范围");
+        return false
+      } else if (
+        this.formState.capital_nums_min != "" &&
+        this.formState.capital_nums_max == ""
+      ) {
+        message.error("请输入完整的注册资本范围");
+        return false
+      } else if (
+        this.formState.capital_nums_min &&
+        this.formState.capital_nums_max
+      ) {
+        if (Number(this.formState.capital_nums_min) > Number(this.formState.capital_nums_max)) {
+          console.log(this.formState.capital_nums_min,this.formState.capital_nums_max)
+          message.error("注册资本范围无效");
+          return false
+        }
+      }
       //修改省份的格式
       let area = [];
       if (this.valueArea.length != 0) {

src/views/patent/patentDetails.vue

@@ -452,6 +452,8 @@ export default {
     },
     //智能推荐翻页
     onChange() {
+      window.scrollTo(0, 0);
+      this.currentPage = 1
       this.getRecommend();
     },
     getRecommend() {

vue.config.js

@@ -18,12 +18,12 @@ module.exports = {
     // 配置不同的后台API地址
     proxy: {
       '/api': {
-        target: 'http://39.100.39.50:5089',
+        target: 'http://39.100.39.50:5089/api',
         ws: false,
         changeOrigin: true,
-        // pathRewrite: {
-        //   '^/api': ''
-        // }
+        pathRewrite: {
+          '^/api': ''
+        }
       }
     }
   },