diff --git a/pages/todo/detail.vue b/pages/todo/detail.vue
index 603f9ab..382e94c 100644
--- a/pages/todo/detail.vue
+++ b/pages/todo/detail.vue
@@ -5,7 +5,7 @@
{{ row.typeLabel || row.type || '审批' }}
- {{ row.status || '待处理' }}
+ {{ statusText }}
{{ row.title || row.no }}
{{ row.submitter || '' }}
@@ -69,7 +69,7 @@ import FyHeader from '../../components/fy-header.vue'
import FyFiles from '../../components/fy-files.vue'
import { store } from '../../utils/store.js'
import { oaGet } from '../../utils/api.js'
-import { toast } from '../../utils/format.js'
+import { flowStatus, toast } from '../../utils/format.js'
import { collectFiles, fileId } from '../../utils/files.js'
const LABELS = {
@@ -124,6 +124,9 @@ export default {
const logs = (this.row && this.row.logs) || []
return Array.isArray(logs) ? [...logs].reverse() : []
},
+ statusText() {
+ return flowStatus(this.row && this.row.status)
+ },
canAct() {
if (!this.row) return false
const st = String(this.row.status || '')
diff --git a/pages/todo/list.vue b/pages/todo/list.vue
index 3692124..863e5dc 100644
--- a/pages/todo/list.vue
+++ b/pages/todo/list.vue
@@ -17,7 +17,7 @@
{{ r.title || r.no }}
{{ r.submitter || r.assigneeName || '' }}
- {{ r.status || '待处理' }}
+ {{ statusText(r) }}
›
@@ -29,7 +29,7 @@
import FyHeader from '../../components/fy-header.vue'
import FyScroll from '../../components/fy-scroll.vue'
import { store } from '../../utils/store.js'
-import { asList } from '../../utils/format.js'
+import { asList, flowStatus } from '../../utils/format.js'
import { oaGet } from '../../utils/api.js'
export default {
@@ -82,6 +82,7 @@ export default {
this.loading = false
}
},
+ statusText(r) { return flowStatus(r && r.status) },
open(r) {
if (r.source === 'work' || r.taskId) {
uni.navigateTo({ url: '/pages/coop/detail?id=' + encodeURIComponent(r.id || r.taskId) })
diff --git a/utils/format.js b/utils/format.js
index 9dccdf9..e2fa60d 100644
--- a/utils/format.js
+++ b/utils/format.js
@@ -148,6 +148,34 @@ export function convType(s) {
return 'direct'
}
+const FLOW_STATUS = {
+ pending: '待审批',
+ waiting: '待处理',
+ processing: '审批中',
+ reviewing: '审阅中',
+ review: '待审阅',
+ approved: '已通过',
+ passed: '已通过',
+ rejected: '已驳回',
+ refused: '已拒绝',
+ denied: '已拒绝',
+ cancelled: '已撤销',
+ canceled: '已撤销',
+ withdrawn: '已撤回',
+ draft: '草稿',
+ done: '已完成',
+ completed: '已完成',
+ handled: '已处理',
+ reviewed: '已审阅',
+ running: '进行中'
+}
+
+export function flowStatus(status) {
+ const raw = String(status || '').trim()
+ if (!raw) return '待处理'
+ return FLOW_STATUS[raw.toLowerCase()] || raw
+}
+
export function toast(title, icon = 'none') {
uni.showToast({ title: String(title || ''), icon, duration: 2200 })
}