This commit is contained in:
faiz 2024-05-24 09:53:27 +08:00
parent 11caa29bb8
commit 4378b6ecd7
14 changed files with 57 additions and 45 deletions

View File

@ -3,7 +3,7 @@
<div class="selCard mb14"> <div class="selCard mb14">
<el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px"> <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" /> <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd HH:mm:ss" format="yyyy/MM/dd HH:mm:ss" size="small" type="datetimerange" placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
</el-form-item> </el-form-item>
<el-form-item label="是否支付:" prop="paid"> <el-form-item label="是否支付:" prop="paid">
<el-select <el-select

View File

@ -3,7 +3,11 @@
<div class="selCard"> <div class="selCard">
<el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px"> <el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" type="daterange" placement="bottom-end" clearable placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" /> <el-date-picker v-model="timeVal"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
size="small"
type="datetimerange" placement="bottom-end" clearable placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions" @change="onchangeTime" />
</el-form-item> </el-form-item>
<el-form-item label="明细类型:" prop="type"> <el-form-item label="明细类型:" prop="type">
<el-select v-model="tableFrom.type" class="selWidth" filterable clearable placeholder="请选择" @change="getList(1)"> <el-select v-model="tableFrom.type" class="selWidth" filterable clearable placeholder="请选择" @change="getList(1)">

View File

@ -5,9 +5,10 @@
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="daterange" size="small"
type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"

View File

@ -27,9 +27,10 @@
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="daterange" size="small"
type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px" style="width: 280px"

View File

@ -5,12 +5,13 @@
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
type="daterange" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd HH:mm:ss"
size="small"
type="datetimerange"
align="right" align="right"
unlink-panels unlink-panels
clearable clearable
format="yyyy/MM/dd"
value-format="yyyy/MM/dd"
@change="onchangeTime" @change="onchangeTime"
style="width: 280px" style="width: 280px"
/> />

View File

@ -5,10 +5,10 @@
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
size="small" size="small"
type="daterange" type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"

View File

@ -19,10 +19,10 @@
<el-form-item label="申请时间:"> <el-form-item label="申请时间:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
type="daterange"
placeholder="选择日期" placeholder="选择日期"
format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="datetimerange"
:picker-options="pickerOptions" :picker-options="pickerOptions"
@change="onchangeTime" @change="onchangeTime"
style="width: 280px" style="width: 280px"
@ -31,10 +31,10 @@
<el-form-item label="审核时间:"> <el-form-item label="审核时间:">
<el-date-picker <el-date-picker
v-model="timeVals" v-model="timeVals"
type="daterange"
placeholder="选择日期" placeholder="选择日期"
format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="datetimerange"
:picker-options="pickerOptions" :picker-options="pickerOptions"
@change="onchangeTimes" @change="onchangeTimes"
style="width: 280px" style="width: 280px"

View File

@ -5,9 +5,10 @@
<el-form-item label="创建时间:"> <el-form-item label="创建时间:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="daterange" size="small"
type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"
@ -19,10 +20,10 @@
<el-form-item label="分账时间:"> <el-form-item label="分账时间:">
<el-date-picker <el-date-picker
v-model="timeVal2" v-model="timeVal2"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
size="small" size="small"
type="daterange" type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"

View File

@ -5,10 +5,10 @@
<el-form-item label="选择时间:"> <el-form-item label="选择时间:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
type="daterange"
placeholder="选择日期" placeholder="选择日期"
format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="datetimerange"
@change="onchangeTime" @change="onchangeTime"
clearable clearable
:picker-options="pickerOptions" :picker-options="pickerOptions"

View File

@ -11,10 +11,10 @@
<el-form-item label="选择时间:"> <el-form-item label="选择时间:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
type="daterange"
placeholder="选择日期" placeholder="选择日期"
format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
value-format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="datetimerange"
range-separator="-" range-separator="-"
style="width: 280px" style="width: 280px"
:picker-options="pickerOptions" :picker-options="pickerOptions"

View File

@ -583,7 +583,9 @@ export default {
// }else{ // }else{
// work = createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); // work = createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
// } // }
//
pageCount = Math.ceil(lebData.count/excelData.limit) pageCount = Math.ceil(lebData.count/excelData.limit)
//
if (lebData.export.length) { if (lebData.export.length) {
data = data.concat(lebData.export) data = data.concat(lebData.export)
excelData.page++ excelData.page++

View File

@ -5,10 +5,10 @@
<el-form-item label="核销时间:"> <el-form-item label="核销时间:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
size="small" size="small"
type="daterange" type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"

View File

@ -25,10 +25,10 @@
<el-form-item label="时间选择:"> <el-form-item label="时间选择:">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
size="small" size="small"
type="daterange" type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
style="width: 280px;" style="width: 280px;"

View File

@ -155,9 +155,10 @@
<el-form-item label="时间选择:" prop="create_time"> <el-form-item label="时间选择:" prop="create_time">
<el-date-picker <el-date-picker
v-model="timeVal" v-model="timeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="daterange" size="small"
type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -168,12 +169,13 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="更新选择" prop="update_date"> <el-form-item label="更新时间" prop="update_date">
<el-date-picker <el-date-picker
v-model="updateTimeVal" v-model="updateTimeVal"
value-format="yyyy/MM/dd" value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd" format="yyyy/MM/dd HH:mm:ss"
type="daterange" size="small"
type="datetimerange"
placement="bottom-end" placement="bottom-end"
placeholder="自定义时间" placeholder="自定义时间"
start-placeholder="开始日期" start-placeholder="开始日期"