From bec404984c99dba03a774e33b8ff85296c0d3651 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 21 Apr 2023 17:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
anrui-system-ui/src/api/flow/read.js | 8 +++++++-
anrui-system-ui/src/api/flow/todo.js | 8 ++++++++
anrui-system-ui/src/views/flow/doneList.vue | 15 +++++++++++----
anrui-system-ui/src/views/flow/havereadList.vue | 14 +++++++++++---
anrui-system-ui/src/views/flow/tobereadList.vue | 17 ++++++++++++-----
anrui-system-ui/src/views/flow/todoList.vue | 14 +++++++++++---
6 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/anrui-system-ui/src/api/flow/read.js b/anrui-system-ui/src/api/flow/read.js
index ef24c0b6d8..23fc15f596 100644
--- a/anrui-system-ui/src/api/flow/read.js
+++ b/anrui-system-ui/src/api/flow/read.js
@@ -28,4 +28,10 @@ export function getToBeReadNum(data) {
})
}
-
+// 待办已办待阅已阅获取人员
+export function sysstaffinfo() {
+ return request({
+ url: '/portal/v1/sysstaffinfo/v1/sysstaffinfo/selectStaffLists',
+ method: 'get'
+ })
+}
diff --git a/anrui-system-ui/src/api/flow/todo.js b/anrui-system-ui/src/api/flow/todo.js
index 61bb9b2799..c517e15fd8 100644
--- a/anrui-system-ui/src/api/flow/todo.js
+++ b/anrui-system-ui/src/api/flow/todo.js
@@ -40,6 +40,14 @@ export function getList(params) {
})
}
+// 待办已办待阅已阅获取人员
+export function sysstaffinfo() {
+ return request({
+ url: '/portal/v1/sysstaffinfo/selectStaffLists',
+ method: 'get'
+ })
+}
+
// 代办任务同意办理
export function businessAgree(params) {
return request({
diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue
index d1c12cae34..872baca62a 100644
--- a/anrui-system-ui/src/views/flow/doneList.vue
+++ b/anrui-system-ui/src/views/flow/doneList.vue
@@ -13,7 +13,9 @@
-
+
+
+
@@ -143,11 +145,10 @@ import flowRecords from '@/components/flow/flowRecord'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getStorage } from '@/utils/auth'
-import { revokeTask, getList, selectUrl, readXml, getFlowViewer, breakProcess, commentSave } from '@/api/flow/todo'
-import { flowRecord, revokeProcess } from '@/api/workflow/finished'
+import { getList, selectUrl, readXml, getFlowViewer, breakProcess, commentSave, sysstaffinfo } from '@/api/flow/todo'
+import { flowRecord } from '@/api/workflow/finished'
import { loginDetails } from '@/api/user'
import upload from '@/components/uploadFile/upload'
-// import flow from "@/views/flow/flow";
export default {
name: '',
@@ -160,6 +161,7 @@ export default {
data() {
return {
taskList: [],
+ user_list: [],
xmlData: '',
dialogHeight: '80%',
isDialogVisible: false, // 撤回弹窗
@@ -278,6 +280,11 @@ export default {
}
},
init() {
+ sysstaffinfo().then((resp) => {
+ if (resp.success) {
+ this.user_list = resp.data
+ }
+ })
var token = getStorage()
loginDetails(token).then((response) => {
if (response.code === '200') {
diff --git a/anrui-system-ui/src/views/flow/havereadList.vue b/anrui-system-ui/src/views/flow/havereadList.vue
index 1e3fc817bf..497b7fa2da 100644
--- a/anrui-system-ui/src/views/flow/havereadList.vue
+++ b/anrui-system-ui/src/views/flow/havereadList.vue
@@ -12,7 +12,9 @@
-
+
+
+
@@ -114,7 +116,7 @@ import flowRecords from '@/components/flow/flowRecord'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getStorage } from '@/utils/auth'
-import { selectUrl, readXml, getFlowViewer, commentSave } from '@/api/flow/todo'
+import { selectUrl, readXml, getFlowViewer, commentSave, sysstaffinfo } from '@/api/flow/todo'
import { pagerList } from '@/api/flow/read'
import { flowRecord } from '@/api/workflow/finished'
import upload from '@/components/uploadFile/upload'
@@ -130,6 +132,7 @@ export default {
data() {
return {
taskList: [],
+ user_list: [],
xmlData: '',
dialogHeight: '80%',
centerDialogVisible: false, // 弹框
@@ -170,7 +173,7 @@ export default {
userSid: '',
state: '1', // 0是待阅,1是已阅
orgPath: '',
- startUserName: ''
+ startUserSid: ''
}
}
}
@@ -201,6 +204,11 @@ export default {
iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
},
init() {
+ sysstaffinfo().then((resp) => {
+ if (resp.success) {
+ this.user_list = resp.data
+ }
+ })
this.getList()
},
// 序号
diff --git a/anrui-system-ui/src/views/flow/tobereadList.vue b/anrui-system-ui/src/views/flow/tobereadList.vue
index 10ae7d9cf1..2c812329b4 100644
--- a/anrui-system-ui/src/views/flow/tobereadList.vue
+++ b/anrui-system-ui/src/views/flow/tobereadList.vue
@@ -11,8 +11,10 @@
-
-
+
+
+
+
@@ -103,12 +105,11 @@ import flowRecords from '@/components/flow/flowRecord'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getStorage } from '@/utils/auth'
-import { selectUrl, readXml, getFlowViewer, commentSave } from '@/api/flow/todo'
+import { selectUrl, readXml, getFlowViewer, commentSave, sysstaffinfo } from '@/api/flow/todo'
import { pagerList, changeRead } from '@/api/flow/read'
import { flowRecord } from '@/api/workflow/finished'
import upload from '@/components/uploadFile/upload'
-
export default {
name: '',
components: {
@@ -120,6 +121,7 @@ export default {
data() {
return {
taskList: [],
+ user_list: [],
xmlData: '',
dialogHeight: '80%',
centerDialogVisible: false, // 弹框
@@ -160,7 +162,7 @@ export default {
userSid: '',
state: '0', // 0是待阅,1是已阅
orgPath: '',
- startUserName: ''
+ startUserSid: ''
}
}
}
@@ -191,6 +193,11 @@ export default {
iframe.height = this.dialogHeight // iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
},
init() {
+ sysstaffinfo().then((resp) => {
+ if (resp.success) {
+ this.user_list = resp.data
+ }
+ })
this.getList()
},
// 序号
diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue
index ded89f8ad3..f3787c7354 100644
--- a/anrui-system-ui/src/views/flow/todoList.vue
+++ b/anrui-system-ui/src/views/flow/todoList.vue
@@ -13,7 +13,9 @@
-
+
+
+
@@ -120,7 +122,7 @@
import flowRecords from '@/components/flow/flowRecord'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
-import { getFlowViewer, readXml, breakTask, businessAgree, pagerList, rejectTask, selectUrl, commentSave } from '@/api/flow/todo'
+import { getFlowViewer, readXml, breakTask, businessAgree, pagerList, rejectTask, selectUrl, commentSave, sysstaffinfo } from '@/api/flow/todo'
import { getStorage } from '@/utils/auth'
import { flowRecord } from '@/api/workflow/finished'
import { loginDetails } from '@/api/user'
@@ -137,6 +139,7 @@ export default {
data() {
return {
taskList: [],
+ user_list: [],
xmlData: '',
dialogHeight: '80%',
centerDialogVisible: false, // 弹框
@@ -199,7 +202,7 @@ export default {
startDate: '',
endDate: '',
userSid: '',
- startUserName: ''
+ startUserSid: ''
}
}
}
@@ -265,6 +268,11 @@ export default {
}
},
init() {
+ sysstaffinfo().then((resp) => {
+ if (resp.success) {
+ this.user_list = resp.data
+ }
+ })
var token = getStorage()
loginDetails(token).then((response) => {
if (response.code === '200') {