Skip to content

T
ty_patentSys
Commit 1b05e098 by liudx
Options

修改重置功能、可选日期

parent 2e495e32
Showing with 42 additions and 13 deletions
src/views/company/companyDetails.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<a-tag color="#6096E6" v-if="baseinfo.zjtg_sjxjr == '1'">{{ <a-tag color="#6096E6" v-if="baseinfo.zjtg_sjxjr == '1'">{{
"专精特新小巨人" "专精特新小巨人"
}}</a-tag> }}</a-tag>
<a-tag color="#6096E6" v-if="baseinfo.zjtg == '1'">{{ <a-tag color="#6096E6" v-if="baseinfo.zjtg == '1'">{{
"专精特新中小企业" "专精特新中小企业"
}}</a-tag> }}</a-tag>
</div> </div>
...@@ -220,6 +220,18 @@ export default { ...@@ -220,6 +220,18 @@ export default {
enterpriseDetail({ id: id }).then((res) => { enterpriseDetail({ id: id }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.baseinfo = res.data; this.baseinfo = res.data;
this.baseinfo.share_holders.forEach((item, index) => {
item.id = index + 1;
});
this.baseinfo.company_marjor.forEach((item, index) => {
item.id = index + 1;
});
this.baseinfo.company_invest.forEach((item, index) => {
item.id = index + 1;
});
this.baseinfo.company_finance.forEach((item, index) => {
item.id = index + 1;
});
} else { } else {
message.error(res.msg); message.error(res.msg);
} }
...@@ -806,7 +818,7 @@ export default { ...@@ -806,7 +818,7 @@ export default {
var that = this; var that = this;
let share_holders = that.baseinfo.share_holders; let share_holders = that.baseinfo.share_holders;
//对模板中股东信息进行修改 //对模板中股东信息进行修改
share_holders.forEach((item) => { that.baseinfo.share_holders.forEach((item, index) => {
item.percent = (item.percent * 100).toFixed(2) + "%"; item.percent = (item.percent * 100).toFixed(2) + "%";
item.amount = Number(item.amount) + "万元"; item.amount = Number(item.amount) + "万元";
}); });
...@@ -997,6 +1009,7 @@ export default { ...@@ -997,6 +1009,7 @@ export default {
created() { created() {
this.id = this.$route.query.id; this.id = this.$route.query.id;
this.init(this.id); this.init(this.id);
window.scrollTo(0, 0);
}, },
}; };
</script> </script>
......
src/views/company/index.vue
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
<a-config-provider :locale="zh_CN"> <a-config-provider :locale="zh_CN">
<a-range-picker <a-range-picker
v-model:value="formState['rangetime1']" v-model:value="formState['rangetime1']"
:disabledDate="disabledDate"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
</a-config-provider> </a-config-provider>
...@@ -245,6 +246,9 @@ export default { ...@@ -245,6 +246,9 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
disabledDate(current) {
return current && current > dayjs().endOf("day");
},
//获取企业列表 //获取企业列表
getCompanyList(keyword) { getCompanyList(keyword) {
let params = { let params = {
...@@ -342,6 +346,8 @@ export default { ...@@ -342,6 +346,8 @@ export default {
rangetime1: [], rangetime1: [],
}; };
this.industryvalue = []; this.industryvalue = [];
this.filter = []
this.Filter()
}, },
//点击筛选 //点击筛选
Filter() { Filter() {
......
src/views/patent/index.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="patent_con"> <div class="patent_con">
<div class="patent_con_left"> <div class="patent_con_left">
<h3>筛选器</h3> <h3>筛选器</h3>
<a-form style="height: 80%" :layout="'vertical'" :model="formState"> <a-form style="height: 78%" :layout="'vertical'" :model="formState">
<a-form-item label="专利类型"> <a-form-item label="专利类型">
<a-select <a-select
v-model:value="value1" v-model:value="value1"
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<a-config-provider :locale="zh_CN"> <a-config-provider :locale="zh_CN">
<a-range-picker <a-range-picker
v-model:value="formState['rangetime1']" v-model:value="formState['rangetime1']"
:disabledDate="disabledDate"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
</a-config-provider> </a-config-provider>
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
<a-form-item name="range-picker" label="公开日"> <a-form-item name="range-picker" label="公开日">
<a-config-provider :locale="zh_CN"> <a-config-provider :locale="zh_CN">
<a-range-picker <a-range-picker
:disabledDate="disabledDate"
v-model:value="formState['rangetime2']" v-model:value="formState['rangetime2']"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
...@@ -123,7 +125,7 @@ export default { ...@@ -123,7 +125,7 @@ export default {
return { return {
zh_CN, zh_CN,
type: "", type: "",
currentPage:1, currentPage: 1,
value1: [], value1: [],
value2: [], value2: [],
keyword: "", keyword: "",
...@@ -180,6 +182,9 @@ export default { ...@@ -180,6 +182,9 @@ export default {
}, },
components: {}, components: {},
methods: { methods: {
disabledDate(current) {
return current && current > dayjs().endOf("day");
},
//获取页面的表格 //获取页面的表格
getList(keyword) { getList(keyword) {
let params = { let params = {
...@@ -237,6 +242,8 @@ export default { ...@@ -237,6 +242,8 @@ export default {
rangetime1: "", rangetime1: "",
rangetime2: "", rangetime2: "",
}; };
this.filter = [];
this.Filter();
}, },
//点击筛选 //点击筛选
Filter() { Filter() {
...@@ -285,6 +292,7 @@ export default { ...@@ -285,6 +292,7 @@ export default {
} }
} }
} }
} else { } else {
this.$message(res.msg); this.$message(res.msg);
} }
...@@ -297,10 +305,10 @@ export default { ...@@ -297,10 +305,10 @@ export default {
//保留历史搜索记录 //保留历史搜索记录
let historysearch = { let historysearch = {
keyword: this.keyword, keyword: this.keyword,
value1:this.value1, value1: this.value1,
rangetime1:this.formState.rangetime1, rangetime1: this.formState.rangetime1,
rangetime2:this.formState.rangetime2, rangetime2: this.formState.rangetime2,
value2:this.value2, value2: this.value2,
}; };
sessionStorage.setItem("currentpagezl", this.currentPage); sessionStorage.setItem("currentpagezl", this.currentPage);
sessionStorage.setItem("searchzl", JSON.stringify(historysearch)); sessionStorage.setItem("searchzl", JSON.stringify(historysearch));
...@@ -325,7 +333,6 @@ export default { ...@@ -325,7 +333,6 @@ export default {
}); });
} }
}, },
}, },
created() { created() {
this.keyword = this.$route.query.keyword; this.keyword = this.$route.query.keyword;
...@@ -333,7 +340,7 @@ export default { ...@@ -333,7 +340,7 @@ export default {
this.getList(this.keyword); this.getList(this.keyword);
this.type = "专利"; this.type = "专利";
}, },
beforeMount(){ beforeMount() {
this.currentPage = sessionStorage.getItem("currentpagezl"); this.currentPage = sessionStorage.getItem("currentpagezl");
if (sessionStorage.getItem("searchzl")) { if (sessionStorage.getItem("searchzl")) {
let searchValue = JSON.parse(sessionStorage.getItem("searchzl")); let searchValue = JSON.parse(sessionStorage.getItem("searchzl"));
...@@ -345,7 +352,9 @@ export default { ...@@ -345,7 +352,9 @@ export default {
this.Filter(); this.Filter();
} }
}, },
computed: {}, computed: {
},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
src/views/patent/patentDetails.vue
...@@ -398,10 +398,11 @@ export default { ...@@ -398,10 +398,11 @@ export default {
value1: [], value1: [],
details: {}, details: {},
optionsType: [ optionsType: [
{ label: "上市挂牌企业", value: "上市挂牌企业" },
{ label: "高新技术企业", value: "高新技术企业" }, { label: "高新技术企业", value: "高新技术企业" },
{ label: "专精特新中小企业", value: "专精特新中小企业" },
{ label: "专精特新小巨人", value: "专精特新小巨人" }, { label: "专精特新小巨人", value: "专精特新小巨人" },
{ label: "上市挂牌企业", value: "上市挂牌企业" }, { label: "专精特新中小企业", value: "专精特新中小企业" },
], ],
techArr: [], techArr: [],
list: [], list: [],
......
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