Merge branch 'dev_test' into dev_20230829_change

# Conflicts:
#	src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -191,7 +191,7 @@
             label="适用产品线">
           </el-table-column>
         </el-table>
-        <pagination :page="page" :total="total" @pageChange="pageChange"
+        <pagination :page="standardForm.page" :total="total" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -221,7 +221,7 @@
                 label="序号"
                 align="center">
               <template slot-scope="{scope, column, $index}">
-                {{ ($index + 1) + ((tableFlag === '' ? sarStandardsSearch.page : tableFlag.page)-1) * (tableFlag === '' ? sarStandardsSearch.pageSize : tableFlag.pageSize)}}
+                {{ ($index + 1) + ((tableFlag === '' ? sarStandardsSearch.page : tableFlag.page)-1) * (tableFlag === '' ? sarStandardsSearch.pageSize : $store.getters.userInfo.configContent)}}
               </template>
             </el-table-column>
             <el-table-column
@@ -2432,13 +2432,13 @@ export default {
       rows: 10,
       replacePage: 1,
       replaceTotal: 0,
-      replaceRows: 10,
+      replaceRows: this.$store.getters.userInfo.configContent,
       pageItems: 1,
       totalItems: 0,
-      itemsRows: 10,
+      itemsRows: this.$store.getters.userInfo.configContent,
       configPage: 1,
       configTotal: 0,
-      configRows: 10,
+      configRows: this.$store.getters.userInfo.configContent,
       zNodesS: [], // 责任部门树结构
       zNodesSItem: [],
       searchInlandNodes: [], // 条目部门选择树形结构
@@ -3930,6 +3930,7 @@ export default {
     // 搜索
     getDomesticStandardTableBtn(item) {
       sessionStorage.setItem('tableFlag', JSON.stringify(item))
+
       this.tableFlag = item
       item.page = 1
       this.getDomesticStandardTable(item)

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -321,7 +321,7 @@
               label="序号"
               align="center">
             <template slot-scope="{scope, column, $index}">
-              {{ ($index + 1) + ((tableFlag === '' ? sarBussionessSearch.page : tableFlag.page) - 1) * (tableFlag === '' ? sarBussionessSearch.pageSize : tableFlag.pageSize) }}
+              {{ ($index + 1) + ((tableFlag === '' ? sarBussionessSearch.page : tableFlag.page) - 1) * (tableFlag === '' ? sarBussionessSearch.pageSize : $store.getters.userInfo.configContent) }}
             </template>
           </el-table-column>
 

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2070,13 +2070,13 @@ export default {
       rows: 10,
       replacePage: 1,
       replaceTotal: 0,
-      replaceRows: 10,
+      replaceRows: this.$store.getters.userInfo.configContent,
       pageItems: 1,
       totalItems: 0,
-      itemsRows: 10,
+      itemsRows: this.$store.getters.userInfo.configContent,
       configPage: 1,
       configTotal: 0,
-      configRows: 10,
+      configRows: this.$store.getters.userInfo.configContent,
       zNodesS: [], // 责任部门树结构
       zNodesSItem: [],
       searchInlandNodes: [], // 条目部门选择树形结构

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -212,6 +212,8 @@
             </el-table-column>
           </el-table>
           <pagination
+            :auto-size="true"
+            :page-size="sarProStatePageSize"
             :page="sarProStateTotalPage"
             :total="sarProStateTotal"
             @pageChange="pageProStateChange"
@@ -251,7 +253,7 @@ export default {
       },
       sarProStateTotal: 0,
       sarProStateTotalPage: 1,
-      sarProStatePageSize: this.$store.getters.userInfo.configContent,
+      sarProStatePageSize:20,
       sarProStateListDatas: [], // 符合性项目列表数据
       sarProStateTableHeight: null, // 符合性项目列表高度
       productId: "" // 符合性项目Id

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -309,6 +309,8 @@
             </el-table-column>
           </el-table>
           <pagination
+              :auto-size="true"
+                  :pageSize="sarProStatePageSize"
                   :page="sarProStateTotalPage"
                   :total="sarProStateTotal"
                   @pageChange="pageProStateChange"
@@ -483,7 +485,7 @@
         },
         sarProStateTotal: 0,
         sarProStateTotalPage: 1,
-        sarProStatePageSize: this.$store.getters.userInfo.configContent,
+        sarProStatePageSize: 20,
         sarProStateListDatas: [], // 符合性项目列表数据
         sarProStateTableHeight: null,
         standId: '', // 符合性项目id

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -564,6 +564,7 @@
        width="875px"
       :close-on-click-modal="false"
       :append-to-body="true"
+      :destroy-on-close="true"
     >
       <div class="search-area">
         <div class="left">
@@ -688,6 +689,7 @@
       <pagination
         style="position: relative;"
         :page="page"
+        :autoSize="true"
         :pageSize="pageSize"
         :total="total"
         @pageChange="pageChange"
@@ -743,7 +745,7 @@ export default {
         }
       ],
       page: 1,
-      pageSize: this.$store.getters.userInfo.configContent,
+      pageSize: 20,
       total: 0,
       drawerTitle: "",
       //存放被勾选的项目的数据