diff --git a/src/components/list-item/index.vue b/src/components/list-item/index.vue
index 3ee6d79..df767cc 100644
--- a/src/components/list-item/index.vue
+++ b/src/components/list-item/index.vue
@@ -16,7 +16,7 @@
-
+
diff --git a/src/pages/ask-leave/detail.vue b/src/pages/ask-leave/detail.vue
index 252765f..8df763a 100644
--- a/src/pages/ask-leave/detail.vue
+++ b/src/pages/ask-leave/detail.vue
@@ -21,8 +21,9 @@ import BaseData from '../audits/base-data'
const modalRef = ref(null)
const actions = ref([
- { name: '修改', value: 'edit' },
- { name: '删除', value: 'delete' },
+ { name: '修改', value: 'edit', disabled: false },
+ { name: '删除', value: 'delete', disabled: false },
+ { name: '审核流程', value: 'check-logs', disabled: false }
])
const detail = ref()
const pickerRef = ref(null)
@@ -52,6 +53,10 @@ const confirmPicker = e => {
}
if (e.value == 'delete') {
return modalRef.value.open()
+ } else if (e.value == 'check-logs') {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${detail.value.workflow_check.id}`
+ })
}
}
const onSubmit = async () => {
@@ -67,6 +72,7 @@ const onSubmit = async () => {
title: "删除成功",
icon: "none"
})
+ uni.$emit('refresh')
uni.navigateBack()
} catch (error) {
console.log(error)
@@ -79,8 +85,11 @@ onLoad(options => {
http.get(`/hr/holidays/${options.id}`).then(res => {
detail.value = res
- if ([2, 3].indexOf(res.workflow_check.check_status) != -1) {
- actions.value = []
+ let status = res.workflow_check.check_status
+ if ([2, 3].indexOf(status) != -1) {
+ actions.value[0].disabled = true
+ actions.value[1].disabled = true
+ // actions.value.splice(0, 2)
}
})
})
diff --git a/src/pages/ask-leave/list.vue b/src/pages/ask-leave/list.vue
index ec25c6f..c7d9ddd 100644
--- a/src/pages/ask-leave/list.vue
+++ b/src/pages/ask-leave/list.vue
@@ -51,7 +51,7 @@
diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js
index c14c963..0f28745 100644
--- a/src/pages/audits/data.data.js
+++ b/src/pages/audits/data.data.js
@@ -1,11 +1,16 @@
import { timeFormat } from '@climblee/uv-ui/libs/function'
+import statusFun from '@/utils/status'
+
export default {
//清洁任务
task_hygienes: {
data: [
{
title: '审核状态',
- dataIndex: 'workflow_check.check_status_text',
+ dataIndex: 'check_status',
+ format: (value) => {
+ return statusFun(value, 'statusExpense2', 'name')
+ }
},
{
title: '未通过理由',
@@ -49,6 +54,21 @@ export default {
include: 'check.subject.type,check.subject.employee,check.subject.store',
},
data: [
+ {
+ title: '审核状态',
+ dataIndex: 'check_status',
+ format: (value) => {
+ return statusFun(value, 'statusExpense2', 'name')
+ }
+ },
+ {
+ title: '未通过原因',
+ dataIndex: 'remarks',
+ labelPosition: 'top',
+ isShow: (item) => {
+ return item?.check_status == 4
+ },
+ },
{
title: "申请人",
dataIndex: "check.subject.employee.name"
@@ -83,14 +103,7 @@ export default {
dataIndex: 'check.subject.photos',
type: 'album',
},
- {
- title: '未通过原因',
- dataIndex: 'remarks',
- labelPosition: 'top',
- isShow: (item) => {
- return item?.check_status == 4
- },
- },
+
]
},
//升职
@@ -99,158 +112,63 @@ export default {
include: 'check.subject.store,check.subject.invitor,check.subject.employee,check.subject.job',
},
data: [
- {
- title: '审核状态',
- dataIndex: 'check_status_text',
- },
- {
- title: '未通过理由',
- dataIndex: 'remarks',
- labelPosition: 'top',
- isShow: (item) => {
- return item?.check_status == 4
- },
- }, {
- title: '晋升职位',
- dataIndex: 'check.subject.job.name',
- }, {
- title: '推荐人',
- dataIndex: 'check.subject.invitor.name',
- }, {
- title: '申请人',
- dataIndex: 'check.subject.employee.name',
- }, {
- title: '年龄',
- dataIndex: 'check.subject.employee_data.age',
- }, {
- title: '性别',
- dataIndex: 'check.subject.employee_data.sex',
- }, {
- title: '学历',
- dataIndex: 'check.subject.employee_data.education',
- }, {
- title: '首次参加工作时间',
- dataIndex: 'check.subject.employee_data.first_work_time',
- labelWidth: "250rpx"
- }, {
- title: '工作年限',
- dataIndex: 'check.subject.employee_data.work_years',
- }, {
- title: '本公司工作年限',
- dataIndex: 'check.subject.employee_data.work_years_in_company',
- }, {
- title: '员工自评',
- dataIndex: 'check.subject.employee_data.comment_self',
- labelPosition: 'top',
- }, {
- title: '未来计划',
- dataIndex: 'check.subject.employee_data.plans',
- labelPosition: 'top',
- }, {
- title: '推荐理由',
- dataIndex: 'check.subject.employee_data.reason',
- labelPosition: 'top',
- }]
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
+ { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
+ { title: '晋升职位', dataIndex: 'check.subject.job.name'},
+ { title: '推荐人', dataIndex: 'check.subject.invitor.name'},
+ { title: '申请人', dataIndex: 'check.subject.employee.name'},
+ { title: '年龄', dataIndex: 'check.subject.employee_data.age'},
+ { title: '性别', dataIndex: 'check.subject.employee_data.sex'},
+ { title: '学历', dataIndex: 'check.subject.employee_data.education'},
+ { title: '首次参加工作时间', dataIndex: 'check.subject.employee_data.first_work_time', labelWidth: "250rpx"},
+ { title: '工作年限', dataIndex: 'check.subject.employee_data.work_years'},
+ { title: '本公司工作年限', dataIndex: 'check.subject.employee_data.work_years_in_company'},
+ { title: '员工自评', dataIndex: 'check.subject.employee_data.comment_self', labelPosition: 'top'},
+ { title: '未来计划', dataIndex: 'check.subject.employee_data.plans', labelPosition: 'top'},
+ { title: '推荐理由', dataIndex: 'check.subject.employee_data.reason', labelPosition: 'top'}
+ ]
},
//补卡申请
employee_sign_repairs: {
params: {
include: 'check.subject.employee,check.subject.store',
},
- data: [{
- title: '审核状态',
- dataIndex: 'check_status_text',
- },
- {
- title: '未通过理由',
- dataIndex: 'remarks',
- labelPosition: 'top',
- isShow: (item) => {
- return item?.check_status == 4
- },
- }, {
- title: '申请人',
- dataIndex: 'check.subject.employee.name',
- }, {
- title: '所属门店',
- dataIndex: 'check.subject.store.title',
- }, {
- title: '电话号码',
- dataIndex: 'check.subject.employee.phone'
- }, {
- title: '申请时间',
- dataIndex: 'check.subject.created_format'
- }, {
- title: '补卡时间',
- dataIndex: 'check.subject.date_format',
- }, {
- title: '补卡原因',
- dataIndex: 'check.subject.reason',
- labelPosition: 'top',
- }, {
- title: '是否外勤',
- dataIndex: 'check.subject.sign_type',
- format: (e) => {
- return e == 1 ? '否' : '是'
- }
- }, {
- title: '外勤事由',
- dataIndex: 'check.subject.outside_remarks',
- labelPosition: 'top',
- isShow: (item) => {
- return item?.sign_type == 2
- }
- }]
+ data: [
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
+ { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
+ { title: '申请人', dataIndex: 'check.subject.employee.name'},
+ { title: '所属门店', dataIndex: 'check.subject.store.title'},
+ { title: '电话号码', dataIndex: 'check.subject.employee.phone'},
+ { title: '申请时间', dataIndex: 'check.subject.created_format'},
+ { title: '补卡时间', dataIndex: 'check.subject.date_format'},
+ { title: '补卡原因', dataIndex: 'check.subject.reason', labelPosition: 'top'},
+ { title: '是否外勤', dataIndex: 'check.subject.sign_type', format: (e) => e == 1 ? '否' : '是'},
+ { title: '外勤事由', dataIndex: 'check.subject.outside_remarks', labelPosition: 'top', isShow: (item) => item?.sign_type == 2}
+ ]
},
//请假申请
holiday_applies: {
params: {
include: 'check.subject.employee,check.subject.type,check.subject.store'
},
- data: [{
- title: '审核状态',
- dataIndex: 'check_status_text',
- },
- {
- title: '未通过理由',
- dataIndex: 'remarks',
- labelPosition: 'top',
- isShow: (item) => {
- return item?.check_status == 4
- },
- }, {
- 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.type.name',
- }, {
- title: '请假开始时间',
- dataIndex: 'check.subject.start_format',
- }, {
- title: '请假结束时间',
- dataIndex: 'check.subject.end_format',
- }, {
- title: '请假原因',
- dataIndex: 'check.subject.reason',
- labelPosition: 'top',
- }]
+ data: [
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
+ { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4},
+ { 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.type.name'},
+ { title: '开始时间', dataIndex: 'check.subject.start_format'},
+ { title: '请假结束时间', dataIndex: 'check.subject.end_format'},
+ { title: '请假原因', dataIndex: 'check.subject.reason', labelPosition: 'top'}]
},
offical_business: {
params: {
include: 'check.subject.employee,check.subject.store'
},
data: [
- { title: '审核状态', dataIndex: 'check_status_text' },
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' },
{ title: '所属门店', dataIndex: 'check.subject.store.title' },
@@ -265,7 +183,7 @@ export default {
include: 'check.subject.employee,check.subject.store'
},
data: [
- { title: '审核状态', dataIndex: 'check_status_text' },
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' },
{ title: '所属门店', dataIndex: 'check.subject.store.title' },
@@ -280,7 +198,7 @@ export default {
include: 'check.subject.employee'
},
data: [
- { title: '审核状态', dataIndex: 'check_status_text' },
+ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')},
{ title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 },
{ title: '申请人', dataIndex: 'check.subject.employee.name' },
{ title: '合同名称', dataIndex: 'check.subject.name' },
diff --git a/src/pages/audits/log.vue b/src/pages/audits/log.vue
index a15263a..d005d45 100644
--- a/src/pages/audits/log.vue
+++ b/src/pages/audits/log.vue
@@ -13,7 +13,7 @@
{{ item.check_user ? item.check_user.name : item.check_name }}
- {{ item.check_status == 2 ? '待审核' : item.check_status_text }}
+ {{ item.check_status_text }}
{{item.remarks}}
diff --git a/src/pages/business/detail.vue b/src/pages/business/detail.vue
index dc354ad..714e714 100644
--- a/src/pages/business/detail.vue
+++ b/src/pages/business/detail.vue
@@ -22,8 +22,9 @@ import BaseData from '../audits/base-data'
const modalRef = ref(null)
const actions = ref([
- { name: '修改', value: 'edit' },
- { name: '删除', value: 'delete' },
+ { name: '修改', value: 'edit', disabled: false },
+ { name: '删除', value: 'delete', disabled: false },
+ { name: '审核流程', value: 'check-logs', disabled: false }
])
const detail = ref({})
@@ -54,6 +55,11 @@ const confirmPicker = e => {
if (e.value == 'delete') {
return modalRef.value.open()
}
+ if (e.value == 'check-logs') {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${detail.value.workflow_check.id}`
+ })
+ }
}
const onSubmit = async () => {
try {
@@ -68,6 +74,7 @@ const onSubmit = async () => {
title: "删除成功",
icon: "none"
})
+ uni.$emit('refresh')
uni.navigateBack()
} catch (error) {
console.log(error)
@@ -77,19 +84,14 @@ const onSubmit = async () => {
}
onLoad(options => {
id.value = options.id
- http
- .request({
- url: `/hr/offical-bussiness/${options.id}`,
- method: "GET",
- header: {
- Accept: "application/json"
- }
- })
- .then(res => {
- detail.value = res
- if ([2, 3].indexOf(res.workflow_check.check_status) != -1) {
- actions.value = []
- }
- })
+ http.get(`/hr/offical-bussiness/${options.id}`).then(res => {
+ detail.value = res
+ let status = res.workflow_check.check_status
+ if ([2, 3].indexOf(status) != -1) {
+ actions.value[0].disabled = true
+ actions.value[1].disabled = true
+ // actions.value.splice(0, 2)
+ }
+ })
})
diff --git a/src/pages/business/list.vue b/src/pages/business/list.vue
index 32730c2..65b99d4 100644
--- a/src/pages/business/list.vue
+++ b/src/pages/business/list.vue
@@ -56,7 +56,7 @@
-
+
-
@@ -66,8 +22,9 @@ import { timeFormat } from '@climblee/uv-ui/libs/function/index'
import BaseData from '../audits/base-data'
const modalRef = ref(null)
const actions = ref([
- { name: '修改', value: 'edit' },
- { name: '删除', value: 'delete' },
+ { name: '修改', value: 'edit', disabled: false },
+ { name: '删除', value: 'delete', disabled: false },
+ { name: '审核流程', value: 'check-logs', disabled: false }
])
const detail = ref()
const pickerRef = ref(null)
@@ -95,20 +52,20 @@ const confirmPicker = (e) => {
if (e.value == 'delete') {
return modalRef.value.open()
}
+ if (e.value == 'check-logs') {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${detail.value.workflow_check.id}`
+ })
+ }
}
const onSubmit = async () => {
try {
- await http.request({
- url: `/agreements/${id.value}`,
- method: 'DELETE',
- header: {
- Accept: 'application/json',
- },
- })
+ await http.delete(`/agreements/${id.value}`)
uni.showToast({
title: '删除成功',
icon: 'none',
})
+ uni.$emit('refresh')
uni.navigateBack()
} catch (error) {
console.log(error)
@@ -118,19 +75,14 @@ const onSubmit = async () => {
}
onLoad((options) => {
id.value = options.id
- http
- .request({
- url: `/agreements/${options.id}`,
- method: 'GET',
- header: {
- Accept: 'application/json',
- },
- })
- .then((res) => {
- detail.value = res
- if ([2, 3].indexOf(res.workflow_check.check_status) != -1) {
- actions.value = []
- }
- })
+ http.get(`/agreements/${options.id}`).then((res) => {
+ detail.value = res
+ let status = res.workflow_check.check_status
+ if ([2, 3].indexOf(status) != -1) {
+ actions.value[0].disabled = true
+ actions.value[1].disabled = true
+ // actions.value.splice(0, 2)
+ }
+ })
})
diff --git a/src/pages/expense-account/detail.vue b/src/pages/expense-account/detail.vue
index 4b92729..5b8e47b 100644
--- a/src/pages/expense-account/detail.vue
+++ b/src/pages/expense-account/detail.vue
@@ -2,12 +2,7 @@
-
+
@@ -16,21 +11,9 @@
-
-
+
-
+
diff --git a/src/pages/make-card/list.vue b/src/pages/make-card/list.vue
index fffe6c9..6353165 100644
--- a/src/pages/make-card/list.vue
+++ b/src/pages/make-card/list.vue
@@ -52,7 +52,7 @@
-
+
@@ -33,8 +33,9 @@ import BaseData from '../audits/base-data'
const modalRef = ref(null)
const actions = ref([
- { name: '修改', value: 'edit' },
- { name: '删除', value: 'delete' },
+ { name: '修改', value: 'edit', disabled: false },
+ { name: '删除', value: 'delete', disabled: false },
+ { name: '审核流程', value: 'check-logs', disabled: false }
])
const detail = ref({})
const pickerRef = ref(null)
@@ -70,20 +71,20 @@ const confirmPicker = (e) => {
if (e.value == 'delete') {
return modalRef.value.open()
}
+ if (e.value == 'check-logs') {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${detail.value.workflow_check.id}`
+ })
+ }
}
const onSubmit = async () => {
try {
- await http.request({
- url: `/hr/overtimes/${id.value}`,
- method: 'DELETE',
- header: {
- Accept: 'application/json',
- },
- })
+ await http.delete(`/hr/overtimes/${id.value}`)
uni.showToast({
title: '删除成功',
icon: 'none',
})
+ uni.$emit('refresh')
uni.navigateBack()
} catch (error) {
console.log(error)
@@ -93,19 +94,14 @@ const onSubmit = async () => {
}
onLoad((options) => {
id.value = options.id
- http
- .request({
- url: `/hr/overtimes/${options.id}`,
- method: 'GET',
- header: {
- Accept: 'application/json',
- },
- })
- .then((res) => {
- detail.value = res
- if ([2, 3].indexOf(res.workflow_check.check_status) != -1) {
- actions.value = []
- }
- })
+ http.get(`/hr/overtimes/${options.id}`).then((res) => {
+ detail.value = res
+ let status = res.workflow_check.check_status
+ if ([2, 3].indexOf(status) != -1) {
+ actions.value[0].disabled = true
+ actions.value[1].disabled = true
+ // actions.value.splice(0, 2)
+ }
+ })
})
diff --git a/src/pages/overtime/list.vue b/src/pages/overtime/list.vue
index 2769bef..cbe920c 100644
--- a/src/pages/overtime/list.vue
+++ b/src/pages/overtime/list.vue
@@ -53,7 +53,7 @@
-
+
+
+ 审核流程
+
+
@@ -60,6 +64,14 @@ const getDetail = async () => {
data.value = resdata
}
+const checkLogs = () => {
+ if (data.value.taskable.workflow_check.id) {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${data.value.taskable.workflow_check.id}`
+ })
+ }
+}
+
const getValue = (obj, path) => {
return path.split('.').reduce((acc, key) => (acc ? acc[key] : undefined), obj)
}
diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue
index adeb6d1..b2cbe36 100644
--- a/src/pages/task/index.vue
+++ b/src/pages/task/index.vue
@@ -51,7 +51,7 @@
v-for="item in list"
:key="item.id"
:title="item.check.subject.task.name"
- :status-text="item.check_status_text"
+ :status-text="statusFun(item.check_status, 'statusExpense2' ,'name')"
:status-color="statusFun(item.check_status, 'statusExpense' ,'color')"
:body="[
{label: '任务时间: ', value: item.check.subject.task.start_format + '-' + item.check.subject.task.end_format},
diff --git a/src/pages/work/detail.vue b/src/pages/work/detail.vue
index 19c20b5..0170a0b 100644
--- a/src/pages/work/detail.vue
+++ b/src/pages/work/detail.vue
@@ -1,6 +1,10 @@
-
+
+
+ 审核流程
+
+
@@ -50,4 +54,13 @@ onLoad((options) => {
})
})
+const checkLogs = () => {
+ if (data.value.workflow_check.id) {
+ return uni.navigateTo({
+ url: `/pages/audits/log?id=${data.value.workflow_check.id}`
+ })
+ }
+}
+
+
diff --git a/src/pages/work/list.vue b/src/pages/work/list.vue
index c58ab2e..5f0ab5b 100644
--- a/src/pages/work/list.vue
+++ b/src/pages/work/list.vue
@@ -72,7 +72,7 @@
v-for="item in list"
:key="item.id"
:title="item.check.subject.job.name"
- :status-text="item.check_status_text"
+ :status-text="statusFun(item.check_status, 'statusExpense2', 'name')"
:status-color="statusFun(item.check_status, 'statusExpense', 'color')"
:body="[
{ label: '申请人: ', value: item.check.subject.employee.name },
diff --git a/src/utils/status.js b/src/utils/status.js
index 168d6ec..f3e3c73 100644
--- a/src/utils/status.js
+++ b/src/utils/status.js
@@ -33,6 +33,27 @@ const data = {
name: '已取消',
color: '#999999'
}],
+ statusExpense2: [{
+ value: 1,
+ name: '待提审',
+ color: '#f56c6c'
+ }, {
+ value: 2,
+ name: '待审核',
+ color: '#f56c6c'
+ }, {
+ value: 3,
+ name: '审核通过',
+ color: '#3c9cff'
+ }, {
+ value: 4,
+ name: '未通过',
+ color: '#999999'
+ }, {
+ value: 5,
+ name: '已取消',
+ color: '#999999'
+ }],
//清洁任务
task_hygienes: [{
value: 1,