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

src/components/hzwlComponents/UploadFormItem.vue

@@ -32,7 +32,8 @@
         </el-button>
       </div>
     </div>
-    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件"  v-dragDialogWidth
+               :close-on-click-modal="false">
       <el-upload
           multiple
           drag

src/pages/policyRegulation/meeting/components/TopicsTable.vue

@@ -137,7 +137,7 @@
         >
         </el-table-column>
       </el-table>
-      <pagination style="position: relative" :page="searchForm.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+      <pagination style="position: relative" :auto-size="true" :page-size="searchForm.pageSize" :page="searchForm.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
       <loading :loading="loading">数据获取中...</loading>
     </div>
     <div slot="footer">
@@ -163,7 +163,10 @@ export default {
     ]
     return {
       show: false,
-      searchForm: {},
+      searchForm: {
+        pageSize:20,
+        page:1
+      },
       api: {
         page: 'lawss/sarLawsTopic/page'
       },
@@ -177,7 +180,7 @@ export default {
   },
   methods: {
     async getData () {
-      this.searchForm.pageSize = this.searchForm.pageSize || this.$store.getters.userInfo.configContent
+      this.searchForm.pageSize = this.searchForm.pageSize
       this.searchForm.page = this.searchForm.page || 1
       let params = { ...this.searchForm }
       const res = await this.$http._getData(this.api.page, params, {_this:this,loading: 'loading'})
@@ -187,7 +190,10 @@ export default {
       }
     },
     open () {
-      this.$set(this, 'searchForm', {})
+      this.$set(this, 'searchForm', {
+        pageSize:20,
+        page:1
+      })
       this.getData()
       this.show = true
     },

src/pages/processCenter/pages/creatProcess/policyWarehousing/components/SearchResult.vue

@@ -80,7 +80,11 @@
                 label="序号"
                 width="55"
                 align="center"
-            ></el-table-column>
+            >
+              <template slot-scope="{scope, column, $index}">
+                {{ ($index + 1) + (SearchForm.page - 1) * SearchForm.pageSize }}
+              </template>
+            </el-table-column>
             <el-table-column
                 show-overflow-tooltip
                 label="政策文号"
@@ -125,6 +129,8 @@
           </el-table>
         </div>
         <pagination
+            :auto-size="true"
+            :page-size="SearchForm.pageSize"
             :page="SearchForm.page"
             :total="SearchForm.total"
             @pageChange="pageChange"
@@ -165,7 +171,7 @@ export default {
       standardDrawer: false,
       SearchForm: {
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
         total: 0,
         // standType: 'INLAND',
         lawsNumber: '',

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue

@@ -351,6 +351,7 @@
               align="center">
           </el-table-column>
           <el-table-column
+              fixed="left"
               type="index"
               width="55"
               label="序号"
@@ -749,6 +750,8 @@
         <!--分页-->
         <pagination
             style="position: relative;"
+            :auto-size="true"
+            :page-size="handleSelectForm.pageSize"
             :page="handleSelectForm.page"
             :total="handleSelectForm.total"
             @pageChange="handleSelectPageChange"
@@ -784,7 +787,7 @@ export default {
         lawNumber: '', // 标准编号/政策编号
         lawName: '', // 标准名称/政策名称
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent,
+        pageSize: 20,
         total: 0,
         standType: '',
         quoteIdList: '',