Skip to content

T
ty_patentSys
Commit 3e74870f by liudx
Options

修改曾用名

parent 513e23a3
Showing with 50 additions and 22 deletions
public/company.docx
No preview for this file type
src/views/company/companyDetails.vue
...@@ -1063,11 +1063,13 @@ export default { ...@@ -1063,11 +1063,13 @@ export default {
display: flex; display: flex;
margin-left: 15px; margin-left: 15px;
div { div {
width: 18%; width: 25%;
height: 22px;
font-size: 16px; font-size: 16px;
text-align: center; padding-left: 10px;
// text-align: center;
color: #c7d8ec; color: #c7d8ec;
border-right: 1px solid #c7d8ec; border-right: 4px solid #c7d8ec;
} }
div:last-child { div:last-child {
border-right: transparent; border-right: transparent;
......
src/views/company/companyProfile.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
}}</a-descriptions-item> }}</a-descriptions-item>
<a-descriptions-item label="营业期限" <a-descriptions-item label="营业期限"
>{{ baseinfo.from_time }}-{{ >{{ baseinfo.from_time }}-{{
baseinfo.to_time?baseinfo.to_time:'无固定期限' baseinfo.to_time ? baseinfo.to_time : "无固定期限"
}}</a-descriptions-item }}</a-descriptions-item
> >
<a-descriptions-item label="纳税人资质">{{ <a-descriptions-item label="纳税人资质">{{
...@@ -64,9 +64,14 @@ ...@@ -64,9 +64,14 @@
<a-descriptions-item label="登记机关" :span="2">{{ <a-descriptions-item label="登记机关" :span="2">{{
baseinfo.register_org baseinfo.register_org
}}</a-descriptions-item> }}</a-descriptions-item>
<a-descriptions-item label="曾用名" :span="1">{{ <a-descriptions-item label="曾用名" :span="1">
<!-- {{
baseinfo.history_name ? baseinfo.history_name : "无" 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">{{ <a-descriptions-item label="英文名" :span="2">{{
baseinfo.en_name baseinfo.en_name
}}</a-descriptions-item> }}</a-descriptions-item>
...@@ -192,13 +197,11 @@ export default { ...@@ -192,13 +197,11 @@ export default {
title: "认缴出资额", title: "认缴出资额",
dataIndex: "amount", dataIndex: "amount",
key: "amount", key: "amount",
}, },
{ {
title: "认缴出资日期", title: "认缴出资日期",
dataIndex: "", dataIndex: "",
key: "", key: "",
}, },
], ],
// columns_history: [ // columns_history: [
...@@ -263,12 +266,8 @@ export default { ...@@ -263,12 +266,8 @@ export default {
// // }, // // },
// }, // },
// ], // ],
data_shareholder: [ data_shareholder: [],
history_shareholder: [],
],
history_shareholder: [
],
columns_keyperson: [ columns_keyperson: [
{ {
title: "序号", title: "序号",
...@@ -338,7 +337,6 @@ export default { ...@@ -338,7 +337,6 @@ export default {
title: "序号", title: "序号",
dataIndex: "index", dataIndex: "index",
key: "index", key: "index",
}, },
{ {
title: "披露日期", title: "披露日期",
......
src/views/company/index.vue
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
</div> </div>
<div class="company"> <div class="company">
<a-breadcrumb class="nav_bread"> <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-item>企业</a-breadcrumb-item>
</a-breadcrumb> </a-breadcrumb>
<div class="company_con"> <div class="company_con">
...@@ -209,6 +211,7 @@ import { ...@@ -209,6 +211,7 @@ import {
} from "../../utils/indexApi.js"; } from "../../utils/indexApi.js";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import zh_CN from "ant-design-vue/lib/locale-provider/zh_CN"; import zh_CN from "ant-design-vue/lib/locale-provider/zh_CN";
import { message } from "ant-design-vue";
dayjs.locale("zh-cn"); dayjs.locale("zh-cn");
export default { export default {
name: "company", name: "company",
...@@ -283,6 +286,7 @@ export default { ...@@ -283,6 +286,7 @@ export default {
}, },
//改变页码 //改变页码
onChange(page) { onChange(page) {
window.scrollTo(0, 0);
//获取当前页码数 //获取当前页码数
this.currentPage = page; this.currentPage = page;
//修改省份的格式 //修改省份的格式
...@@ -346,11 +350,33 @@ export default { ...@@ -346,11 +350,33 @@ export default {
rangetime1: [], rangetime1: [],
}; };
this.industryvalue = []; this.industryvalue = [];
this.filter = [] this.filter = [];
this.Filter() this.Filter();
}, },
//点击筛选 //点击筛选
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 = []; let area = [];
if (this.valueArea.length != 0) { if (this.valueArea.length != 0) {
......
src/views/patent/patentDetails.vue
...@@ -452,6 +452,8 @@ export default { ...@@ -452,6 +452,8 @@ export default {
}, },
//智能推荐翻页 //智能推荐翻页
onChange() { onChange() {
window.scrollTo(0, 0);
this.currentPage = 1
this.getRecommend(); this.getRecommend();
}, },
getRecommend() { getRecommend() {
......
vue.config.js
...@@ -18,12 +18,12 @@ module.exports = { ...@@ -18,12 +18,12 @@ module.exports = {
// 配置不同的后台API地址 // 配置不同的后台API地址
proxy: { proxy: {
'/api': { '/api': {
target: 'http://39.100.39.50:5089', target: 'http://39.100.39.50:5089/api',
ws: false, ws: false,
changeOrigin: true, changeOrigin: true,
// pathRewrite: { pathRewrite: {
// '^/api': '' '^/api': ''
// } }
} }
} }
}, },
......
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