diff --git a/src/pages/revert/index.vue b/src/pages/revert/index.vue index 4d044e5..b4ff677 100644 --- a/src/pages/revert/index.vue +++ b/src/pages/revert/index.vue @@ -199,6 +199,7 @@ import { } from 'vue' import { useUserStore } from '@/store/modules/user' import { timeFormat } from '@climblee/uv-ui/libs/function/index' +import { empty } from '@climblee/uv-ui/libs/function/test' import { add } from '@/utils/index' import checkPermission from '@/utils/permission' import { onShow } from '@dcloudio/uni-app' @@ -275,9 +276,39 @@ const submit = () => { formRef.value.validate().then((res) => { modalRef.value.open() }) + } + +function filterLotteryData(datas) { + + return datas.filter(item => { + + if (empty(item.sales) && empty(item.expenditure)) { + return false; + } + + return true; + }); + +} + + +function removeEmptyValues(datas) { + return datas.map(item => { + // 过滤出空值的属性 + const filteredItem = Object.entries(item) + .filter(([key, value]) => !empty(value)) + .reduce((acc, [key, value]) => { + acc[key] = value; + return acc; + }, {}); + + return filteredItem; + }).filter(item => Object.keys(item).length !== 0); // 移除所有属性都为空的对象 +} const onSubmit = async () => { + console.log(filterLotteryData(form.items)) const params = { date: form.date, sales: form.sales, @@ -285,7 +316,7 @@ const onSubmit = async () => { handover_amount: form.handover_amount, new_customers: form.new_customers, photos: form.photos.map((item) => item.url), - items: form.items, + items: removeEmptyValues(filterLotteryData(form.items)), } http .request({