diff --git a/src/pages/audits/data.data.js b/src/pages/audits/data.data.js index 007dd30..a5eb116 100644 --- a/src/pages/audits/data.data.js +++ b/src/pages/audits/data.data.js @@ -9,65 +9,79 @@ export default { // }, { title: '所属门店', - dataIndex: 'taskable.store.title', + dataIndex: 'check.subject.store.title', // borderBottom: false, // labelPosition: 'top' }, { title: '电话号码', - dataIndex: '', + dataIndex: 'check.subject.store_master.phone', }, { title: '申请时间', - dataIndex: 'created_at', + dataIndex: 'check.subject.created_at', format: timeFormat, }, { title: '清洁范围', - dataIndex: 'taskable.description', + dataIndex: 'check.subject.description', labelPosition: 'top', }, { title: '清洁结果', - dataIndex: 'taskable.photos', + dataIndex: 'check.subject.photos', type: 'album', }, ], + params: { include: 'check.subject.task,check.subject.storeMaster,check.subject.store' } }, reimbursements: { params: { - include: 'employee,store,type', + include: 'check.subject.type,check.subject.employee,check.subject.store', }, data: [ { - title: '审核状态', - dataIndex: 'workflow_check.check_status_text', + title: "申请人", + dataIndex: "check.subject.employee.name" }, { - title: '未通过理由', - dataIndex: 'workflow_check.check_remarks', - isShow: (item) => { - return item?.workflow_check?.check_status == 4 - }, + title: "所属门店", + dataIndex: "check.subject.store.title" + }, + { + title: "电话号码", + dataIndex: "check.subject.employee.phone" + }, + { + title: "申请时间", + dataIndex: "check.subject.created_at_format" }, { title: '报销分类', - dataIndex: 'type.name', + dataIndex: 'check.subject.type.name', }, { title: '报销金额', - dataIndex: 'expense', + dataIndex: 'check.subject.expense', }, { title: '报销原因', - dataIndex: 'reason', + dataIndex: 'check.subject.reason', labelPosition: 'top', }, { title: '报销凭证', - dataIndex: 'photos', + dataIndex: 'check.subject.photos', type: 'album', }, + { + title: '未通过原因', + dataIndex: 'remarks', + labelPosition: 'top', + isShow: (item) => { + return 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 b1ff3a0..672f190 100644 --- a/src/pages/audits/detail.vue +++ b/src/pages/audits/detail.vue @@ -2,11 +2,7 @@ @@ -74,20 +70,11 @@ const modelOptions = reactive({ const onConfirm = async () => { try { - await http.post( - `/workflow/${id.value}/check`, - { - subject_type: type.value, - status: !modelOptions.isValue, - remarks: modelOptions.isValue ? value.value : '', - }, - { - header: { - Accept: 'application/json', - }, - } - ) - uni.$emit('audits:onRefresh') + await http.post(`/workflow/${id.value}/check`, { + status: !modelOptions.isValue, + remarks: modelOptions.isValue ? value.value : '', + }) + // uni.$emit('audits:onRefresh') uni.navigateBack() } catch (error) {} } @@ -124,7 +111,6 @@ const getData = async () => { }) data.value = resData.data checkable.value = resData.checkable - console.log(resData) } const goPath = (url) => { diff --git a/src/pages/audits/log.vue b/src/pages/audits/log.vue index dda7b79..5010104 100644 --- a/src/pages/audits/log.vue +++ b/src/pages/audits/log.vue @@ -21,7 +21,6 @@ {{ item.check_user ? item.check_user.name : item.check_name }} { - return item?.workflow_check?.check_status == 4 - }, + title: "申请人", + dataIndex: "employee.name" + }, + { + title: "所属门店", + dataIndex: "store.title" + }, + { + title: "电话号码", + dataIndex: "employee.phone" + }, + { + title: "申请时间", + dataIndex: "created_at_format" }, { title: '报销分类', @@ -69,6 +78,14 @@ const colums = [ dataIndex: 'photos', type: 'album', }, + { + title: '未通过原因', + dataIndex: 'remarks', + labelPosition: 'top', + isShow: (item) => { + return item?.check_status == 4 + }, + }, ] const actionSheet = ref(null) const data = ref(null) diff --git a/src/pages/expense-account/index.vue b/src/pages/expense-account/index.vue index 7ca0eca..308f718 100644 --- a/src/pages/expense-account/index.vue +++ b/src/pages/expense-account/index.vue @@ -2,11 +2,7 @@ @@ -29,8 +25,25 @@ > @@ -45,13 +58,27 @@ > @@ -63,7 +90,8 @@ import { ref } from 'vue' import { onPageScroll, onReachBottom } from '@dcloudio/uni-app' import useMescrollMore from '@/uni_modules/mescroll-uni/hooks/useMescrollMore.js' import MescrollItem from '@/components/mescroll-api/more.vue' -import Item from './item.vue' +import { timeFormat } from '@climblee/uv-ui/libs/function' +import statusFun from '@/utils/status' const mescrollItem0 = ref(null) const mescrollItem1 = ref(null) @@ -83,7 +111,7 @@ const tabList = ref([ { name: '报销审核', apiUrl: '/workflow', - params: { subject_type: 'reimbursements', include: 'employee,store,type' }, + params: { subject_type: 'reimbursements', include: 'check.subject.type' }, }, ]) @@ -97,4 +125,16 @@ const goPath = (url) => { url, }) } + +const applyDetail = (item) => { + uni.navigateTo({ + url: `/pages/expense-account/detail?id=${item.id}` + }) +} + +const checkDetail = (item) => { + uni.navigateTo({ + url: `/pages/audits/detail?id=${item.id}&type=${item.check.subject_type}` + }) +} diff --git a/src/pages/expense-account/item.vue b/src/pages/expense-account/item.vue deleted file mode 100644 index 7fa425d..0000000 --- a/src/pages/expense-account/item.vue +++ /dev/null @@ -1,61 +0,0 @@ - - diff --git a/src/pages/task/components/item.vue b/src/pages/task/components/item.vue deleted file mode 100644 index 2c2ea20..0000000 --- a/src/pages/task/components/item.vue +++ /dev/null @@ -1,70 +0,0 @@ - - diff --git a/src/pages/task/detail.vue b/src/pages/task/detail.vue index 5d7dd3e..bde107d 100644 --- a/src/pages/task/detail.vue +++ b/src/pages/task/detail.vue @@ -57,7 +57,7 @@ import { timeFormat } from '@climblee/uv-ui/libs/function' const baseColums = [ { title: '申请人', - dataIndex: 'name', + dataIndex: 'taskable.store_master.name', }, { title: '所属门店', @@ -65,7 +65,7 @@ const baseColums = [ }, { title: '电话号码', - dataIndex: '', + dataIndex: 'taskable.store_master.phone', }, { title: '申请时间', diff --git a/src/pages/task/index.vue b/src/pages/task/index.vue index 4983a6c..c1c4c71 100644 --- a/src/pages/task/index.vue +++ b/src/pages/task/index.vue @@ -22,8 +22,15 @@ > @@ -38,12 +45,15 @@ > @@ -53,10 +63,11 @@ diff --git a/src/pages/task/task_hygienes_submit.vue b/src/pages/task/task_hygienes_submit.vue index e53130c..159de38 100644 --- a/src/pages/task/task_hygienes_submit.vue +++ b/src/pages/task/task_hygienes_submit.vue @@ -21,14 +21,15 @@ + { @@ -80,6 +82,8 @@ onLoad((options) => { const submit = () => { formRef.value.validate().then((res) => { modalRef.value.open() + }).catch(error => { + console.log(error) }) } @@ -90,9 +94,6 @@ const onSubmit = async () => { await http.request({ url: `/tasks/${id.value}/submit`, method: 'POST', - header: { - Accept: 'application/json', - }, data: { task_hygiene: { description: form.description, @@ -105,7 +106,7 @@ const onSubmit = async () => { icon: 'none', }) formRef.value.resetFields() - uni.$emit('task:submit', resData) + uni.$emit('task:submit') uni.navigateBack() } catch (error) { console.log(error)