Commit 956845e4 by liudx

修改关注列表跳转

parent b0dfe3cc
...@@ -181,6 +181,7 @@ export default { ...@@ -181,6 +181,7 @@ export default {
email: "", email: "",
}, },
visible: false, visible: false,
max_value_purchase: 0,
email: "", email: "",
value: undefined, value: undefined,
activeKey: "企业概况", activeKey: "企业概况",
...@@ -321,8 +322,10 @@ export default { ...@@ -321,8 +322,10 @@ export default {
patentPurchase({ id: id }).then((res) => { patentPurchase({ id: id }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.patentPurchaseData = res.data; this.patentPurchaseData = res.data;
this.patentPurchaseData.max_value_purchase = this.max_value_purchase =
this.patentPurchaseData.max_list[0].max_value; this.patentPurchaseData.max_list.length > 0
? this.patentPurchaseData.max_list[0].max_value
: 0;
this.getOptions2(); this.getOptions2();
} else { } else {
message.error(res.msg); message.error(res.msg);
...@@ -999,6 +1002,7 @@ export default { ...@@ -999,6 +1002,7 @@ export default {
let company_invest = that.baseinfo.company_invest; let company_invest = that.baseinfo.company_invest;
//融资信息 //融资信息
let company_finance = that.baseinfo.company_finance; let company_finance = that.baseinfo.company_finance;
let max_value_purchase = that.max_value_purchase;
let date = new Date(); let date = new Date();
var year = date.getFullYear(); var year = date.getFullYear();
var month = date.getMonth() + 1; var month = date.getMonth() + 1;
...@@ -1127,6 +1131,7 @@ export default { ...@@ -1127,6 +1131,7 @@ export default {
// 设置模板变量的值 // 设置模板变量的值
doc.setData({ doc.setData({
...that.baseinfo, ...that.baseinfo,
max_value_purchase,
share_holders, share_holders,
company_marjor, company_marjor,
company_invest, company_invest,
...@@ -1212,7 +1217,7 @@ export default { ...@@ -1212,7 +1217,7 @@ export default {
"application/vnd.openxmlformats-officedocument.wordprocessingml.document", "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
}); });
//formData文件流 //formData文件流
that.blobToBase64(out,that.formState.email); that.blobToBase64(out, that.formState.email);
// 将目标文件对象保存为目标类型的文件,并命名 // 将目标文件对象保存为目标类型的文件,并命名
// saveAs(out, `企业科创能力报告.docx`); // saveAs(out, `企业科创能力报告.docx`);
} }
...@@ -1225,7 +1230,7 @@ export default { ...@@ -1225,7 +1230,7 @@ export default {
// 处理验证失败的情况 // 处理验证失败的情况
}); });
}, },
blobToBase64(blob,email) { blobToBase64(blob, email) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const fileReader = new FileReader(); const fileReader = new FileReader();
fileReader.onload = (e) => { fileReader.onload = (e) => {
......
...@@ -204,68 +204,6 @@ export default { ...@@ -204,68 +204,6 @@ export default {
key: "capital_date", key: "capital_date",
}, },
], ],
// columns_history: [
// {
// title: "序号",
// dataIndex: "name",
// key: "name",
// },
// {
// title: "股东",
// dataIndex: "age",
// key: "age",
// width: 300,
// },
// {
// title: "股东类型",
// dataIndex: "address",
// key: "percent",
// },
// {
// title: "退出时持股比例",
// dataIndex: "address",
// key: "address 2",
// },
// {
// title: "退出日期",
// dataIndex: "address",
// key: "address 3",
// },
// {
// title: "认缴出资额",
// dataIndex: "address",
// key: "address 4",
// },
// {
// title: "认缴出资日期",
// dataIndex: "address",
// key: "address 4",
// // sorter: {
// // compare: (a, b) => a.chinese - b.chinese,
// // multiple: 3,
// // },
// },
// {
// title: "实缴出资额",
// dataIndex: "address",
// key: "address 4",
// // sorter: {
// // compare: (a, b) => a.chinese - b.chinese,
// // multiple: 3,
// // },
// },
// {
// title: "实缴出资日期",
// dataIndex: "address",
// key: "address 4",
// // sorter: {
// // compare: (a, b) => a.chinese - b.chinese,
// // multiple: 3,
// // },
// },
// ],
data_shareholder: [], data_shareholder: [],
history_shareholder: [], history_shareholder: [],
columns_keyperson: [ columns_keyperson: [
...@@ -362,6 +300,7 @@ export default { ...@@ -362,6 +300,7 @@ export default {
], ],
pagination: { pagination: {
pageSize: 5, pageSize: 5,
showSizeChanger:false
}, },
}; };
}, },
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
:columns="columnshistory" :columns="columnshistory"
:data-source="dataHistory" :data-source="dataHistory"
:pagination="false" :pagination="false"
:customRow="rowClick"
> >
<template #bodyCell="{ column, text, record }"> <template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex == 'action'"> <template v-if="column.dataIndex == 'action'">
...@@ -21,6 +20,9 @@ ...@@ -21,6 +20,9 @@
>取消关注</a-button >取消关注</a-button
> >
</template> </template>
<template v-if="column.dataIndex == 'name'">
<span @click="rowClick(record)">{{ text }}</span>
</template>
<template v-if="column.dataIndex == 'f_type'"> <template v-if="column.dataIndex == 'f_type'">
{{ text == "patent" ? "专利" : "公司" }} {{ text == "patent" ? "专利" : "公司" }}
</template> </template>
...@@ -115,32 +117,25 @@ export default { ...@@ -115,32 +117,25 @@ export default {
}); });
}, },
//跳转到专利详情或者公司详情页面 //跳转到专利详情或者公司详情页面
rowClick(record, index) { rowClick(record) {
console.log(record)
if (record.f_type == "patent") { if (record.f_type == "patent") {
return { this.$router.push({
onClick: (event) => { path: "/patentDetails",
this.$router.push({ query: {
path: "/patentDetails", id: record.ent_or_pat_id,
query: { // zlcode: record.gkh,
id: record.ent_or_pat_id, zlcode: record.name,
// zlcode: record.gkh,
zlcode: record.name,
},
});
}, },
}; });
} else { } else {
return { this.$router.push({
onClick: (event) => { path: "/companyDetails",
this.$router.push({ query: {
path: "/companyDetails", id: record.ent_or_pat_id,
query: { name: record.name,
id: record.ent_or_pat_id,
name:record.name ,
},
});
}, },
}; });
} }
}, },
//改变页码 //改变页码
...@@ -191,7 +186,7 @@ export default { ...@@ -191,7 +186,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.history { .history {
padding: 0 30px; padding: 0 30px;
width: calc(100%); width: calc(100%);
min-height: 900px; min-height: 900px;
background-color: #ebebeb; background-color: #ebebeb;
...@@ -205,7 +200,7 @@ export default { ...@@ -205,7 +200,7 @@ export default {
background-color: #fff; background-color: #fff;
padding: 20px; padding: 20px;
height: 92%; height: 92%;
text-align: center; text-align: center;
} }
:deep(.ant-modal-footer) { :deep(.ant-modal-footer) {
......
...@@ -18,12 +18,14 @@ ...@@ -18,12 +18,14 @@
:data-source="dataHistory" :data-source="dataHistory"
:pagination="false" :pagination="false"
:style="'width:90%;'" :style="'width:90%;'"
:customRow="rowClick"
> >
<template #bodyCell="{ column, text, record }"> <template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex == 'f_type'"> <template v-if="column.dataIndex == 'f_type'">
{{ text == "patent" ? "专利" : "公司" }} {{ text == "patent" ? "专利" : "公司" }}
</template> </template>
<template v-if="column.dataIndex == 'name'">
<span @click="rowClick(record)">{{ text }}</span>
</template>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination
...@@ -55,6 +57,9 @@ ...@@ -55,6 +57,9 @@
>发送到邮箱</a-button >发送到邮箱</a-button
> >
</template> </template>
<template v-if="column.dataIndex == 'name'">
<span @click="rowClick(record)">{{ text }}</span>
</template>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination
...@@ -172,33 +177,25 @@ export default { ...@@ -172,33 +177,25 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
//跳转到专利详情或者公司详情页面 //跳转到专利详情或者公司详情页面
rowClick(record, index) { rowClick(record) {
if (record.f_type == "patent") { if (record.f_type == "patent") {
return { this.$router.push({
onClick: (event) => { path: "/patentDetails",
this.$router.push({ query: {
path: "/patentDetails", id: record.ent_or_pat_id,
query: { // zlcode: record.gkh,
id: record.ent_or_pat_id, zlcode: record.name,
// zlcode: record.gkh,
zlcode: record.name,
},
});
}, },
}; });
} else { } else {
return { this.$router.push({
onClick: (event) => { path: "/companyDetails",
this.$router.push({ query: {
path: "/companyDetails", id: record.ent_or_pat_id,
query: { name: record.name,
id: record.ent_or_pat_id,
name:record.name ,
},
});
}, },
}; });
} }
}, },
//发送到邮箱 //发送到邮箱
...@@ -214,8 +211,8 @@ export default { ...@@ -214,8 +211,8 @@ export default {
this.visible = false; this.visible = false;
}, },
//浏览记录翻页 //浏览记录翻页
onChange(){ onChange() {
this.init() this.init();
}, },
init() { init() {
userBrowse({ userBrowse({
......
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