From cb62e8e56b40f87f775f89c2ef71e3c70b5b7409 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 3 May 2024 20:00:16 +0800
Subject: [PATCH] status

---
 src/pages/make-card/detail.vue | 18 +++++++++++-------
 src/pages/make-card/list.vue   |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/make-card/detail.vue b/src/pages/make-card/detail.vue
index ed3e69a..1544571 100644
--- a/src/pages/make-card/detail.vue
+++ b/src/pages/make-card/detail.vue
@@ -19,6 +19,7 @@ import { onLoad } from "@dcloudio/uni-app"
 import { ref } from "vue"
 import { timeFormat } from "@climblee/uv-ui/libs/function/index"
 import BaseData from '@/pages/audits/base-data.vue'
+import statusFun from '@/utils/status'
 
 const modalRef = ref(null)
 const actions = ref([
@@ -32,7 +33,8 @@ const id = ref(0)
 const detailColumns = [
   {
     title: "审核状态",
-    dataIndex: "workflow_check.check_status_text"
+    dataIndex: "workflow_check.check_status",
+    format: (value) =>  statusFun(value, 'statusExpense', 'name')
   },
   {
     title: "申请人",
@@ -65,16 +67,18 @@ const detailColumns = [
   {
     title: "是否外勤",
     dataIndex: "sign_type",
-    format: (value) => {
-      return value == 1 ? "否" : "是"
-    }
+    format: (value) => value == 1 ? "否" : "是"
   },
   {
     title: "外勤事由",
     dataIndex: "outside_remarks",
-    isShow: (data) => {
-      return data?.sign_type == 2
-    }
+    isShow: (data) => data?.sign_type == 2
+  },
+  {
+    title: '未通过原因',
+    dataIndex: 'workflow_check.check_remarks',
+    labelPosition: 'top',
+    isShow: (row) => row?.workflow_check.check_status == 4
   },
 ];
 const open = () => {
diff --git a/src/pages/make-card/list.vue b/src/pages/make-card/list.vue
index a65fe4f..e6261a3 100644
--- a/src/pages/make-card/list.vue
+++ b/src/pages/make-card/list.vue
@@ -26,7 +26,7 @@
           <ListItem
             v-for="item in list" :key="item.id"
             title="补卡申请"
-            :status-text="item.workflow_check.check_status_text"
+            :status-text="statusFun(item.workflow_check.check_status,'statusExpense','name')"
             :status-color="statusFun(item.workflow_check.check_status,'statusExpense','color')"
             :body="[
               { label: '补卡时间: ', value: item.date_format },