diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index b31c4bf..e47efa3 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -5,52 +5,14 @@ export default { //清洁任务 task_hygienes: { data: [ - { - title: '审核状态', - dataIndex: 'check_status', - format: (value) => statusFun(value, 'statusExpense2', 'name') - }, - { - title: '拒绝原因', - dataIndex: 'remarks', - labelPosition: 'top', - isShow: (row) => row?.check_status == 4 - }, - - { title: '申请人', dataIndex: 'check.employee.name'}, - { - title: '所属门店', - dataIndex: 'check.subject.store.title', - // borderBottom: false, - // labelPosition: 'top' - }, - { - title: '电话号码', - dataIndex: 'check.subject.store_master.phone', - }, - { - title: '申请时间', - dataIndex: 'check.subject.created_at', - format: timeFormat, - }, - { - title: '清洁范围', - dataIndex: 'check.subject.description', - labelPosition: 'top', - }, - { - title: '清洁结果', - dataIndex: 'check.subject.photos', - type: 'album', - }, - { - title: '未通过理由', - dataIndex: 'workflow_check.check_remarks', - labelPosition: 'top', - isShow: (item) => { - return item?.workflow_check?.check_status == 4 - }, - }, + { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name') }, + { title: '申请人', dataIndex: 'check.employee.name' }, + { title: '所属门店', dataIndex: 'check.subject.store.title' }, + { title: '电话号码', dataIndex: 'check.subject.store_master.phone' }, + { title: '申请时间', dataIndex: 'check.subject.created_format' }, + { title: '清洁范围', dataIndex: 'check.subject.description', labelPosition: 'top' }, + { title: '清洁结果', dataIndex: 'check.subject.photos', type: 'album' }, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ], params: { include: 'check.subject.task,check.subject.storeMaster,check.subject.store,check.employee' } }, @@ -60,57 +22,16 @@ 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: "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.type.name', - }, - { - title: '报销金额', - dataIndex: 'check.subject.expense', - }, - { - title: '报销原因', - dataIndex: 'check.subject.reason', - labelPosition: 'top', - }, - { - title: '报销凭证', - dataIndex: 'check.subject.photos', - type: 'album', - }, - { - title: '未通过原因', - dataIndex: 'remarks', - labelPosition: 'top', - isShow: (item) => { - return item?.check_status == 4 - }, - }, - + { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name') }, + { 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.type.name' }, + { title: '报销金额', dataIndex: 'check.subject.expense' }, + { title: '报销原因', dataIndex: 'check.subject.reason', labelPosition: 'top' }, + { title: '报销凭证', dataIndex: 'check.subject.photos', type: 'album' }, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ] }, //升职 @@ -133,7 +54,7 @@ export default { { 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: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, ] }, //补卡申请 @@ -153,7 +74,7 @@ export default { { 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?.check?.subject?.sign_type == 2}, - { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, ] }, //请假申请 @@ -172,7 +93,7 @@ export default { { title: '请假开始时间', dataIndex: 'check.subject.start_format'}, { title: '请假结束时间', dataIndex: 'check.subject.end_format'}, { title: '请假原因', dataIndex: 'check.subject.reason', labelPosition: 'top'}, - { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4}, ] }, offical_business: { @@ -181,7 +102,6 @@ export default { }, 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' }, @@ -190,6 +110,7 @@ export default { { title: '开始时间', dataIndex: 'check.subject.start_format' }, { title: '结束时间', dataIndex: 'check.subject.end_format' }, { title: '出差事由', dataIndex: 'check.subject.reason', labelPosition: 'top' }, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ] }, overtime_applies: { @@ -208,7 +129,7 @@ export default { { title: '结束时间', dataIndex: 'check.subject.end_format' }, { title: '加班时长', dataIndex: 'check.subject.hours' ,format: (value) => value + ' 小时'}, { title: '加班事由', dataIndex: 'check.subject.reason', labelPosition: 'top' }, - { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ] }, agreements: { @@ -217,14 +138,13 @@ export default { }, data: [ { title: '审核状态', dataIndex: 'check_status', format: (value) => statusFun(value, 'statusExpense2', 'name')}, - { title: '上传人', dataIndex: 'check.subject.employee.name' }, { title: '所属门店', dataIndex: 'check.subject.employee.store.title' }, { title: '电话号码', dataIndex: 'check.subject.employee.phone' }, { title: '上传时间', dataIndex: 'check.subject.created_format' }, { title: '合同名称', dataIndex: 'check.subject.name' }, { title: '合同照片', dataIndex: 'check.subject.images', type: 'album' }, - { title: '未通过理由', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, + { title: '未通过原因', dataIndex: 'remarks', labelPosition: 'top', isShow: (item) => item?.check_status == 4 }, ] } } \ No newline at end of file diff --git a/src/pages/audits/detail.vue b/src/pages/audits/detail.vue index d17e6f9..f615ba6 100644 --- a/src/pages/audits/detail.vue +++ b/src/pages/audits/detail.vue @@ -37,7 +37,7 @@ > - + @@ -70,7 +70,7 @@ const modelOptions = reactive({ const onConfirm = async () => { if (modelOptions.isValue && !value.value) { - return uni.showToast({title: "请填写拒绝原因", icon: "none"}) + return uni.showToast({title: "请填写未通过原因", icon: "none"}) } try { await http.post(`/workflow/${id.value}/check`, { diff --git a/src/pages/task/detail.vue b/src/pages/task/detail.vue index 8a8ab03..2283bf1 100644 --- a/src/pages/task/detail.vue +++ b/src/pages/task/detail.vue @@ -27,12 +27,6 @@ const baseColums = [ return statusFun(value, 'task_hygienes', 'name') }, }, - { - title: '拒绝原因', - dataIndex: 'taskable.workflow_check.check_remarks', - labelPosition: 'top', - isShow: (row) => row?.taskable?.workflow_check.check_status == 4 - }, { title: '申请人', dataIndex: 'taskable.store_master.name', @@ -47,8 +41,7 @@ const baseColums = [ }, { title: '申请时间', - dataIndex: 'created_at', - format: timeFormat, + dataIndex: 'created_format', }, { title: '清洁范围', @@ -61,6 +54,12 @@ const baseColums = [ labelPosition: 'top', type: 'album' }, + { + title: '拒绝原因', + dataIndex: 'taskable.workflow_check.check_remarks', + labelPosition: 'top', + isShow: (row) => row?.taskable?.workflow_check.check_status == 4 + }, ] const id = ref(null) const data = ref({})