status

src/pages/ask-leave/detail.vue

@@ -18,6 +18,7 @@ import { http } from "@/utils/request"
 import { onLoad } from "@dcloudio/uni-app"
 import { ref } from "vue"
 import BaseData from '../audits/base-data'
+import statusFun from '@/utils/status'
 
 const modalRef = ref(null)
 const actions = ref([
@@ -30,8 +31,7 @@ const pickerRef = ref(null)
 const id = ref(0)
 
 const columns = [
-  { title: '审核状态', dataIndex: 'workflow_check.check_status_text' },
+  { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
-  { title: '拒绝原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
   { title: '申请人', dataIndex: 'employee.name' },
   { title: '所属门店', dataIndex: 'store.title' },
   { title: '电话号码', dataIndex: 'employee.phone' },
@@ -40,6 +40,7 @@ const columns = [
   { title: '请假开始时间', dataIndex: 'start_format' },
   { title: '请假结束时间', dataIndex: 'end_format' },
   { title: '请假原因', dataIndex: 'reason', labelPosition: 'top' },
+  { title: '未通过原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
 ]
 
 const open = () => {
@@ -61,13 +62,7 @@ const confirmPicker = e => {
 }
 const onSubmit = async () => {
   try {
-    await http.request({
+    await http.delete(`/hr/holidays/${id.value}`)
-      url: `/hr/holidays/${id.value}`,
-      method: "DELETE",
-      header: {
-        Accept: "application/json"
-      }
-    })
     uni.showToast({
       title: "删除成功",
       icon: "none"

src/pages/ask-leave/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.type.name },

src/pages/business/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 '../audits/base-data'
+import statusFun from '@/utils/status'
 
 const modalRef = ref(null)
 const actions = ref([
@@ -29,8 +30,7 @@ const actions = ref([
 const detail = ref({})
 
 const columns = [
-  { title: '审核状态', dataIndex: 'workflow_check.check_status_text' },
+  { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
-  { title: '拒绝原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
   { title: '申请人', dataIndex: 'employee.name' },
   { title: '所属门店', dataIndex: 'store.title' },
   { title: '电话号码', dataIndex: 'employee.phone' },
@@ -39,7 +39,7 @@ const columns = [
   { title: '开始时间', dataIndex: 'start_format' },
   { title: '结束时间', dataIndex: 'end_format' },
   { title: '出差原因', dataIndex: 'reason', labelPosition: 'top' },
-  
+  { title: '未通过原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
 ]
 
 const pickerRef = ref(null)

src/pages/business/list.vue

@@ -30,7 +30,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.address},

src/pages/contract/detail.vue

@@ -20,6 +20,8 @@ import { onLoad } from '@dcloudio/uni-app'
 import { ref } from 'vue'
 import { timeFormat } from '@climblee/uv-ui/libs/function/index'
 import BaseData from '../audits/base-data'
+import statusFun from "@/utils/status"
+
 const modalRef = ref(null)
 const actions = ref([
   { name: '修改', value: 'edit', disabled: false },
@@ -31,14 +33,14 @@ const pickerRef = ref(null)
 const id = ref(0)
 
 const columns = [
-  { title: '审核状态', dataIndex: 'workflow_check.check_status_text' },
+  { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
-  { title: '拒绝原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
   { title: '上传人', dataIndex: 'employee.name' },
   { title: '所属门店', dataIndex: 'store.title' },
   { title: '电话号码', dataIndex: 'employee.phone' },
   { title: '上传时间', dataIndex: 'created_format' },
   { title: '合同名称', dataIndex: 'name' },
   { title: '合同内容', dataIndex: 'images', type: 'album' },
+  { title: '未通过原因', dataIndex: 'workflow_check.check_remarks', labelPosition: 'top', isShow: (data) => data?.workflow_check?.check_status == 4 },
 ]
 
 const open = () => {

src/pages/contract/list.vue

@@ -29,7 +29,7 @@
           <ListItem
             v-for="item in list" :key="item.id"
             :title="item.name"
-            :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')"
             :images="item.images"
             :body="[

src/pages/make-card/list.vue

@@ -52,8 +52,8 @@
           <ListItem
             v-for="item in list" :key="item.id"
             title="补卡申请"
-            :status-text="statusFun( item.check_status,'statusExpense2','name')"
+            :status-text="statusFun(item.check_status, 'statusExpense2', 'name')"
-            :status-color="statusFun( item.check_status,'statusExpense2','color')"
+            :status-color="statusFun(item.check_status, 'statusExpense2', 'color')"
             :body="[
               { label: '申请人: ', value: item.check.subject.employee.name },
               { label: '补卡时间: ', value: item.check.subject.date_format },

src/pages/overtime/detail.vue

@@ -30,6 +30,7 @@ import { http } from '@/utils/request'
 import { onLoad } from '@dcloudio/uni-app'
 import { ref } from 'vue'
 import BaseData from '../audits/base-data'
+import statusFun from "@/utils/status"
 
 const modalRef = ref(null)
 const actions = ref([
@@ -42,13 +43,7 @@ const pickerRef = ref(null)
 const id = ref(0)
 
 const columns = [
-  { title: '审核状态', dataIndex: 'workflow_check.check_status_text' },
+  { title: '审核状态', dataIndex: 'workflow_check.check_status', format: (value) => statusFun(value, 'statusExpense', 'name') },
-  {
-    title: '拒绝原因',
-    dataIndex: 'workflow_check.check_remarks',
-    labelPosition: 'top',
-    isShow: (data) => data?.workflow_check?.check_status == 4,
-  },
   { title: '申请人', dataIndex: 'employee.name' },
 
   { title: '所属门店', dataIndex: 'store.title' },
@@ -59,6 +54,12 @@ const columns = [
   { title: '结束时间', dataIndex: 'end_format' },
   { title: '加班时长', dataIndex: 'hours',format: (value) => value + ' 小时' },
   { title: '请假事由', dataIndex: 'reason', labelPosition: 'top' },
+  {
+    title: '未通过原因',
+    dataIndex: 'workflow_check.check_remarks',
+    labelPosition: 'top',
+    isShow: (data) => data?.workflow_check?.check_status == 4,
+  },
 ]
 
 const open = () => {

src/pages/overtime/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 },