From 4ced59c6d6cd4f8bf1c9a8ce7e7c9930f00c7b09 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 17 Apr 2023 14:20:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E3=80=81=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B5=B7=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 anrui-system-ui/src/views/flow/doneList.vue | 32 ++++++++++-----------
 anrui-system-ui/src/views/flow/todoList.vue |  8 ++++--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue
index d35f02ec09..73fbceee2d 100644
--- a/anrui-system-ui/src/views/flow/doneList.vue
+++ b/anrui-system-ui/src/views/flow/doneList.vue
@@ -12,6 +12,9 @@
           <el-form-item label="流程名称">
             <el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
           </el-form-item>
+          <el-form-item label="发起人">
+            <el-input v-model="listQuery.params.startUserName" placeholder="" clearable></el-input>
+          </el-form-item>
           <el-form-item label="申请日期">
             <el-date-picker v-model="listQuery.params.startDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
             <label>至</label>
@@ -23,7 +26,7 @@
     </div>
     <div class="listtop">
       <div class="tit">已办任务列表</div>
-      <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+      <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
     </div>
     <div class="listcon">
       <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width:100%" @selection-change="handleSelectionChange">
@@ -81,7 +84,7 @@
     </div>
     <div class="pages">
       <div class="tit"/>
-      <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+      <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
     </div>
     <!-- Start查看页面 -->
     <el-dialog
@@ -164,7 +167,6 @@ export default {
       editDialog: false,
       flowRecordList: [],
       listLoading: false,
-      total: 0,
       list: [],
       tableKey: 0,
       taskName_now: '',
@@ -209,8 +211,10 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
+        total: 0,
         params: {
           proDefName: '',
+          startUserName: '',
           startDate: '',
           endDate: '',
           userSid: ''
@@ -418,23 +422,19 @@ export default {
     },
     getList() {
       this.listLoading = true
-      getList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          proDefName: this.listQuery.params.proDefName,
-          startDate: this.listQuery.params.startDate,
-          endDate: this.listQuery.params.endDate,
-          userSid: this.listQuery.params.userSid
-        }
-      }).then((rep) => {
+      getList(this.listQuery).then((rep) => {
         this.listLoading = false
-        this.list = rep.data.records
-        this.total = rep.data.total
+        if (rep.success) {
+          this.list = rep.data.records
+          this.listQuery.total = rep.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
       })
     },
     handleFilter() {
-      this.listQuery.pageNumber = 1
+      this.listQuery.current = 1
       this.getList()
     },
     handleSelectionChange() {
diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue
index ebf37a9975..2c5cd31c36 100644
--- a/anrui-system-ui/src/views/flow/todoList.vue
+++ b/anrui-system-ui/src/views/flow/todoList.vue
@@ -12,6 +12,9 @@
           <el-form-item label="流程名称">
             <el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
           </el-form-item>
+          <el-form-item label="发起人">
+            <el-input v-model="listQuery.params.startUserName" placeholder="" clearable></el-input>
+          </el-form-item>
           <el-form-item label="申请日期">
             <el-date-picker v-model="listQuery.params.startDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
             <label>至</label>
@@ -195,7 +198,8 @@ export default {
             proDefName: '',
             startDate: '',
             endDate: '',
-            userSid: ''
+            userSid: '',
+            startUserName: ''
           }
         }
       }
@@ -511,7 +515,7 @@ export default {
         })
       },
       handleFilter() {
-        this.listQuery.pageNumber = 1
+        this.listQuery.current = 1
         this.getList()
       },
       handleSelectionChange() {