From d69084b4ee2a9267078c1a3703cd098667694dfd Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Wed, 13 Dec 2023 09:38:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/processCenter/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index d5e6d905a..8945ef755 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/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 ||'', From e6ac4afcd129f60800e7041538c7e2386ba47272 Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Wed, 13 Dec 2023 09:43:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=9A=84=E5=BA=8F=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processList/tabComponents/taskDraft/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 4509cd931..2214e4218 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/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 From c5fcb2b4108cf93ab7b6f921166c5138749be9b1 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 13 Dec 2023 09:50:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86):?= =?UTF-8?q?=20=E9=87=8D=E6=96=B0=E8=B5=B7=E8=8D=89-=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 31c0601ea..ad226e221 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/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;">