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

---
 src/pages/ask-leave/detail.vue       |  2 +-
 src/pages/audits/data.data.js        |  3 +-
 src/pages/expense-account/detail.vue | 55 +++++-----------------------
 3 files changed, 12 insertions(+), 48 deletions(-)

diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue
index af10966..b209195 100644
--- a/src/pages/ask-leave/detail.vue
+++ b/src/pages/ask-leave/detail.vue
@@ -33,9 +33,9 @@ const id = ref(0)
 const columns = [
   { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
   { title: '申请人', dataIndex: 'employee.name' },
-  { title: '申请时间', dataIndex: 'created_format' },
   { title: '所属门店', dataIndex: 'store.title' },
   { title: '电话号码', dataIndex: 'employee.phone' },
+  { title: '申请时间', dataIndex: 'created_format' },
   { title: '请假类型', dataIndex: 'type.name' },
   { title: '请假开始时间', dataIndex: 'start_format' },
   { title: '请假结束时间', dataIndex: 'end_format' },
diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js
index e47efa3..b0c72a0 100644
--- a/src/pages/audits/data.data.js
+++ b/src/pages/audits/data.data.js
@@ -84,11 +84,10 @@ export default {
     },
     data: [
       { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
-      
       { title: '申请人', dataIndex: 'check.subject.employee.name'},
-      { title: '申请时间', dataIndex: 'check.subject.created_format'},
       { title: '所属门店', dataIndex: 'check.subject.store.title'},
       { title: '电话号码', dataIndex: 'check.subject.employee.phone'},
+      { title: '申请时间', dataIndex: 'check.subject.created_format'},
       { title: '请假类型', dataIndex: 'check.subject.type.name'},
       { title: '请假开始时间', dataIndex: 'check.subject.start_format'},
       { title: '请假结束时间', dataIndex: 'check.subject.end_format'},
diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue
index b028471..ee76899 100644
--- a/src/pages/expense-account/detail.vue
+++ b/src/pages/expense-account/detail.vue
@@ -32,51 +32,16 @@ const actions = ref([
 ])
 
 const colums = [
-  {
-    title: '审核状态',
-    dataIndex: 'workflow_check.check_status',
-    format: (value) => statusFun(value, 'statusExpense', 'name')
-  },
-  {
-    title: '申请人',
-    dataIndex: 'employee.name',
-  },
-  {
-    title: '所属门店',
-    dataIndex: 'store.title',
-  },
-  {
-    title: '电话号码',
-    dataIndex: 'employee.phone',
-  },
-  {
-    title: '申请时间',
-    dataIndex: 'created_format',
-  },
-  {
-    title: '报销分类',
-    dataIndex: 'type.name',
-  },
-  {
-    title: '报销金额',
-    dataIndex: 'expense',
-  },
-  {
-    title: '报销原因',
-    dataIndex: 'reason',
-    labelPosition: 'top',
-  },
-  {
-    title: '报销凭证',
-    dataIndex: 'photos',
-    type: 'album',
-  },
-  {
-    title: '未通过原因',
-    dataIndex: 'workflow_check.check_remarks',
-    labelPosition: 'top',
-    isShow: (item) => item?.workflow_check.check_status == 4,
-  },
+  { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
+  { title: '申请人', dataIndex: 'employee.name' },
+  { title: '所属门店', dataIndex: 'store.title' },
+  { title: '电话号码', dataIndex: 'employee.phone' },
+  { title: '申请时间', dataIndex: 'created_format' },
+  { title: '报销分类', dataIndex: 'type.name' },
+  { title: '报销金额', dataIndex: 'expense' },
+  { title: '报销原因', dataIndex: 'reason', labelPosition: 'top' },
+  { title: '报销凭证', dataIndex: 'photos', type: 'album' },
+  { title: '未通过原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (item) => item?.workflow_check.check_status == 4 },
 ]
 const actionSheet = ref(null)
 const data = ref(null)