修改重置功能、可选日期

src/views/company/companyDetails.vue

@@ -220,6 +220,18 @@ export default {
       enterpriseDetail({ id: id }).then((res) => {
         if (res.code == 0) {
           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 {
           message.error(res.msg);
         }
@@ -806,7 +818,7 @@ export default {
       var that = this;
       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.amount = Number(item.amount) + "万元";
       });
@@ -997,6 +1009,7 @@ export default {
   created() {
     this.id = this.$route.query.id;
     this.init(this.id);
+    window.scrollTo(0, 0);
   },
 };
 </script>

src/views/company/index.vue

@@ -56,6 +56,7 @@
             <a-config-provider :locale="zh_CN">
               <a-range-picker
                 v-model:value="formState['rangetime1']"
+                :disabledDate="disabledDate"
                 value-format="YYYY-MM-DD"
               />
             </a-config-provider>
@@ -245,6 +246,9 @@ export default {
   },
   components: {},
   methods: {
+    disabledDate(current) {
+      return current && current > dayjs().endOf("day");
+    },
     //获取企业列表
     getCompanyList(keyword) {
       let params = {
@@ -342,6 +346,8 @@ export default {
         rangetime1: [],
       };
       this.industryvalue = [];
+      this.filter = []
+      this.Filter()
     },
     //点击筛选
     Filter() {

src/views/patent/index.vue

@@ -27,7 +27,7 @@
     <div class="patent_con">
       <div class="patent_con_left">
         <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-select
               v-model:value="value1"
@@ -40,6 +40,7 @@
             <a-config-provider :locale="zh_CN">
               <a-range-picker
                 v-model:value="formState['rangetime1']"
+                :disabledDate="disabledDate"
                 value-format="YYYY-MM-DD"
               />
             </a-config-provider>
@@ -47,6 +48,7 @@
           <a-form-item name="range-picker" label="公开日">
             <a-config-provider :locale="zh_CN">
               <a-range-picker
+              :disabledDate="disabledDate"
                 v-model:value="formState['rangetime2']"
                 value-format="YYYY-MM-DD"
               />
@@ -123,7 +125,7 @@ export default {
     return {
       zh_CN,
       type: "",
-      currentPage:1,
+      currentPage: 1,
       value1: [],
       value2: [],
       keyword: "",
@@ -180,6 +182,9 @@ export default {
   },
   components: {},
   methods: {
+    disabledDate(current) {
+      return current && current > dayjs().endOf("day");
+    },
     //获取页面的表格
     getList(keyword) {
       let params = {
@@ -237,6 +242,8 @@ export default {
         rangetime1: "",
         rangetime2: "",
       };
+      this.filter = [];
+      this.Filter();
     },
     //点击筛选
     Filter() {
@@ -285,6 +292,7 @@ export default {
               }
             }
           }
+         
         } else {
           this.$message(res.msg);
         }
@@ -297,10 +305,10 @@ export default {
           //保留历史搜索记录
           let historysearch = {
             keyword: this.keyword,
-            value1:this.value1,
-            rangetime1:this.formState.rangetime1,
-            rangetime2:this.formState.rangetime2,
-            value2:this.value2,
+            value1: this.value1,
+            rangetime1: this.formState.rangetime1,
+            rangetime2: this.formState.rangetime2,
+            value2: this.value2,
           };
           sessionStorage.setItem("currentpagezl", this.currentPage);
           sessionStorage.setItem("searchzl", JSON.stringify(historysearch));
@@ -325,7 +333,6 @@ export default {
         });
       }
     },
-   
   },
   created() {
     this.keyword = this.$route.query.keyword;
@@ -333,7 +340,7 @@ export default {
     this.getList(this.keyword);
     this.type = "专利";
   },
-  beforeMount(){
+  beforeMount() {
     this.currentPage = sessionStorage.getItem("currentpagezl");
     if (sessionStorage.getItem("searchzl")) {
       let searchValue = JSON.parse(sessionStorage.getItem("searchzl"));
@@ -345,7 +352,9 @@ export default {
       this.Filter();
     }
   },
-  computed: {},
+  computed: {
+    
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/patent/patentDetails.vue

@@ -398,10 +398,11 @@ export default {
       value1: [],
       details: {},
       optionsType: [
+      { label: "上市挂牌企业", value: "上市挂牌企业" },
         { label: "高新技术企业", value: "高新技术企业" },
-        { label: "专精特新中小企业", value: "专精特新中小企业" },
         { label: "专精特新小巨人", value: "专精特新小巨人" },
-        { label: "上市挂牌企业", value: "上市挂牌企业" },
+        { label: "专精特新中小企业", value: "专精特新中小企业" },
+        
       ],
       techArr: [],
       list: [],