Merge branch 'dev_20231201_feizhi' into 'master'

Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!124

src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue

@@ -25,7 +25,7 @@
                             :height="tablePHeight"
                             border
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
-                            style="width: 10%;float: left;margin-right: 20px;">
+                            style="width: calc(10% - 20px);float: left;margin-right: 20px;">
                         <el-table-column
                                 prop="userName"
                                 align="center"

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -197,7 +197,7 @@ export default {
       selectPeople:'',
       total: 0,
       pageNo: 1,
-      pageSize:10,
+      pageSize:this.$store.getters.userInfo.configContent,
       loading: false,
       processList: [],// 列表数据
       processListSelect: [], // 列表选中数据
@@ -263,7 +263,7 @@ export default {
     queryProcess () { // 查询待办流程
       this.$http.postData('lawss/activiti/todoTaskListNew', {
                 current: this.pageNo,
-                size: parseInt(this.$store.getters.userInfo.configContent),
+                size: this.pageSize,
                 userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
                 prcName: this.searchForm.prcName,
                 prcType: parseInt(this.searchForm.prcType) || this.searchForm.prcType  ||'',

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -164,7 +164,7 @@ export default {
         prcNum: '',
         prcType: ''
       },
-      pageSize:10,
+      pageSize:this.$store.getters.userInfo.configContent,
       total: 0,
       pageNo: 1,
       loading: false,
@@ -189,7 +189,7 @@ export default {
     queryProcess () { // 查询待办流程
       this.$http.postData('lawss/activiti/queryTaskDraft', {
             current: this.pageNo,
-            size: parseInt(this.$store.getters.userInfo.configContent),
+            size: this.pageSize,
             userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
             prcName: this.searchForm.prcName,
             prcType: this.searchForm.prcType