Merge remote-tracking branch 'origin/dev_test' into dev_20231201_feizhi

2023-12-05 15:01:00 +08:00
parent 3bfdb1da01 c20ea9ccee
commit e334e1efc0
48 changed files with 208 additions and 108 deletions
@@ -131,6 +131,8 @@
      <!--分页-->
      <pagination
        style="position: relative;"
+        :auto-size="true"
+        :page-size="replaceLawsNumForm.pageSize"
        :page="replacePage"
        :total="replaceTotal"
        @pageChange="pageChangeReplace"
@@ -185,7 +187,7 @@ export default {
      replaceLawsNumForm: {
        standNumber: '', // 政策编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        standType: '',
        quoteIdList: '',
@@ -143,6 +143,8 @@
            <!--分页-->
            <pagination
                    style="position: relative;"
+                    :auto-size="true"
+                    :page-size="replaceLawsNumForm.pageSize"
                    :page="replacePage"
                    :total="replaceTotal"
                    @pageChange="pageChangeReplace"
@@ -206,7 +208,7 @@
                    standNumber: '', // 政策编号
                    standName: '',
                    page: 1,
-                    pageSize: this.$store.getters.userInfo.configContent,
+                    pageSize: 20,
                    total: 0,
                    standType: 'INLAND',
                    quoteIdList: '',
@@ -127,6 +127,8 @@
      <!--分页-->
      <pagination
        style="position: relative;"
+        :auto-size="true"
+        :page-size="replaceLawsNumForm.pageSize"
        :page="replacePage"
        :total="replaceTotal"
        @pageChange="pageChangeReplace"
@@ -187,7 +189,7 @@ export default {
      replaceLawsNumForm: {
        numberName: '', // 政策编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        lawsType: 'FOREIGN',
        quoteIdList: '',
@@ -123,6 +123,8 @@
            <!--分页-->
            <pagination
                    style="position: relative;"
+                    :auto-size="true"
+                    :page-size="replaceLawsNumForm.pageSize"
                    :page="replacePage"
                    :total="replaceTotal"
                    @pageChange="pageChangeReplace"
@@ -183,7 +185,7 @@
                // 代替标准号
                replaceLawsNumForm: {
                    page: 1,
-                    pageSize: this.$store.getters.userInfo.configContent,
+                    pageSize: 20,
                    total: 0,
                    standType: 'ALL',
                    quoteIdList: '',
@@ -126,6 +126,8 @@
      <!--分页-->
      <pagination
        style="position: relative;"
+        :auto-size="true"
+        :page-size="replaceLawsNumForm.pageSize"
        :page="replacePage"
        :total="replaceTotal"
        @pageChange="pageChangeReplace"
@@ -192,7 +194,7 @@ export default {
        dataSource: '',
        standNumber: '', // 标准编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        standType: 'INLAND',
        quoteIdList: '',
@@ -136,6 +136,8 @@
      <!--分页-->
      <pagination
        style="position: relative;"
+        :auto-size="true"
+        :page-size = "replaceLawsNumForm.pageSize"
        :page="replacePage"
        :total="replaceTotal"
        @pageChange="pageChangeReplace"
@@ -200,7 +202,7 @@ export default {
        standNumber: '', // 标准编号
        standName: '', // 标准编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        standType: 'INLAND',
        quoteIdList: '',
@@ -155,6 +155,8 @@
      <!--分页-->
      <pagination
          style="position: relative;"
+          :auto-size="true"
+          :page-size="replaceLawsNumForm.pageSize"
          :page="replacePage"
          :total="replaceTotal"
          @pageChange="pageChangeReplace"
@@ -215,7 +217,7 @@ export default {
        dataSource: 'BUSINESS', // 数据来源
        numberName: '', // 政策编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        quoteIdList: '',
        menuId: '',
@@ -139,6 +139,8 @@
      <!--分页-->
      <pagination
        style="position: relative;"
+        :auto-size="true"
+        :page-size="replaceLawsNumForm.pageSize"
        :page="replacePage"
        :total="replaceTotal"
        @pageChange="pageChangeReplace"
@@ -206,7 +208,7 @@ export default {
      replaceLawsNumForm: {
        standNumber: '', // 政策编号
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        standType: 'FOREIGN',
        quoteIdList: '',
@@ -152,6 +152,8 @@
      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
      <!--分页-->
      <pagination
+        :auto-size="true"
+        :page-size="replaceLawsNumForm.pageSize"
        style="position: relative;"
        :page="replacePage"
        :total="replaceTotal"
@@ -211,7 +213,7 @@ export default {
        lawsNumber: '', // 政策编号
        numberName: '', // 政策名称
        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
        total: 0,
        quoteIdList: '',
        menuId: '',
@@ -28,9 +28,14 @@ export default {
      this.$emit('pageChange', page)
    },
    pageSizeChange (pageSize) {
-      this.userInfo.configContent = pageSize
-      this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
-      this.$emit('pageSizeChange', pageSize)
+      if(this.autoSize) {
+        this.$emit('pageSizeChange', pageSize)
+      }else{
+        this.userInfo.configContent = pageSize
+        this.setUserInfo(JSON.stringify(JSON.parse(JSON.stringify(this.userInfo))))
+        this.$emit('pageSizeChange', pageSize)
+      }
+

      // if (this.getTypeFlag === 'CloudRepository') {
      //   this.userInfo.configContent = pageSize