This commit is contained in:
yziiy
2025-09-27 17:44:38 +08:00
parent 98616cbe0f
commit a479867023
4 changed files with 12 additions and 6 deletions

View File

@@ -12,11 +12,11 @@
</el-select> </el-select>
<!-- 时间 --> <!-- 时间 -->
<el-date-picker v-if="item.type === 'date'" clearable v-model="form[item.prop]" :disabled-date="disabledDate" <el-date-picker v-if="item.type === 'date'" clearable v-model="form[item.prop]" :disabled-date="disabledDate"
type="date" class="!w-[160px]" :placeholder="`请选择${item.label}`" format="YYYY-MM-DD" type="datetime" class="!w-[160px]" :placeholder="`请选择${item.label}`" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD" /> value-format="YYYY-MM-DD HH:mm:ss" />
<!-- 时间范围 daterange--> <!-- 时间范围 daterange-->
<el-date-picker :disabled-date="disabledDate" v-if="item.type === 'daterange'" format="YYYY-MM-DD" <el-date-picker :disabled-date="disabledDate" v-if="item.type === 'daterange'" format="YYYY-MM-DD"
value-format="YYYY-MM-DD" v-model="form[item.prop]" type="daterange" range-separator="至" value-format="YYYY-MM-DD" v-model="form[item.prop]" type="datetime" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期"> start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

View File

@@ -25,8 +25,9 @@ defineExpose({ getRef });
<template> <template>
<el-form ref="ruleFormRef" :model="newFormInline" :rules="formRules" label-width="120px"> <el-form ref="ruleFormRef" :model="newFormInline" :rules="formRules" label-width="120px">
<el-form-item label="选择时间" prop="time"> <el-form-item label="选择时间" prop="time">
<el-date-picker v-model="newFormInline.time" format="YYYY-MM-DD" :disabled-date="disabledDate" <el-date-picker v-model="newFormInline.time" format="YYYY-MM-DD HH:mm:ss" :disabled-date="disabledDate"
value-format="YYYY-MM-DD" type="daterange" range-separator="" start-placeholder="开始日期" end-placeholder="结束日期"> value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="" start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>

View File

@@ -51,7 +51,7 @@ export function useData() {
// { label: "总收入(¥)", prop: "total_money" }, // { label: "总收入(¥)", prop: "total_money" },
{ label: "未支付(¥)", prop: "unpaid_money" }, { label: "未支付(¥)", prop: "unpaid_money" },
{ {
label: "zongs(¥)", prop: "paid_money" label: "总收入(¥)", prop: "paid_money"
}, },
{ label: "微信支付(¥)", prop: "wx_money" }, { label: "微信支付(¥)", prop: "wx_money" },
{ label: "支付宝支付(¥)", prop: "ali_money" }, { label: "支付宝支付(¥)", prop: "ali_money" },

View File

@@ -159,6 +159,11 @@ export function useData() {
const exportData = async (formData) => { const exportData = async (formData) => {
const { data, code } = await queryGiftGiveList({ const { data, code } = await queryGiftGiveList({
...formData, ...formData,
send_user: searchForm.value.send_user,
gift_user: searchForm.value.gift_user,
from_id: searchForm.value.from_id,
gift_id: searchForm.value.gift_id,
from: searchForm.value.from,
page: 1, page: 1,
page_limit: 20000 page_limit: 20000
}); });