Commit e843e0f0 authored by zhengke's avatar zhengke

修改

parent 07e51137
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<q-select stack-label color="primary" dense filled label="消费类型" option-value="Id" option-label="Name" <q-select stack-label color="primary" dense filled label="消费类型" option-value="Id" option-label="Name"
:options="TypeList" v-model="msg.Type" @input="resetSearch" emit-value map-options /> :options="TypeList" v-model="msg.Type" @input="resetSearch" emit-value map-options />
</div> </div>
<div class="col-3"> <div class="col-2">
<q-select stack-label color="primary" dense filled label="使用类型" option-value="Id" option-label="Name" <q-select stack-label color="primary" dense filled label="使用类型" option-value="Id" option-label="Name"
:options="BuyTypeList" v-model="msg.BuyType" @input="resetSearch" emit-value map-options /> :options="BuyTypeList" v-model="msg.BuyType" @input="resetSearch" emit-value map-options />
</div> </div>
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
</template> </template>
<template v-slot:body-cell-BuyType="props"> <template v-slot:body-cell-BuyType="props">
<q-td :props="props"> <q-td :props="props">
<span v-if="props.row.BuyType==0">购买</span> <span v-if="props.row.BuyType==0">-</span>
<span v-if="props.row.BuyType==1">免费的</span> <span v-if="props.row.BuyType==1">赠送</span>
<span v-if="props.row.BuyType==2">使用购买的</span> <span v-if="props.row.BuyType==2">购买</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-EmpType="props"> <template v-slot:body-cell-EmpType="props">
...@@ -134,16 +134,16 @@ ...@@ -134,16 +134,16 @@
align: 'left', align: 'left',
field: 'UserIcon' field: 'UserIcon'
}, { }, {
name: 'BuyType', name: 'Type',
label: '使用类型', label: '使用类型',
field: 'BuyType', field: 'Type',
align: 'left' align: 'left'
}, { },{
name: 'Type', name: 'BuyType',
label: '消费类型', label: '消费类型',
field: 'Type', field: 'BuyType',
align: 'left' align: 'left'
}, },
{ {
name: 'EmpType', name: 'EmpType',
label: '员工类型', label: '员工类型',
......
...@@ -16,13 +16,13 @@ ...@@ -16,13 +16,13 @@
<div class="page-body"> <div class="page-body">
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-2">
<q-select stack-label color="primary" dense filled label="类型" option-value="Id" option-label="Name" <q-select stack-label color="primary" dense filled label="类型" option-value="Id" option-label="Name"
:options="SelectList" v-model="msg.SelectType" ref="SelectType" @input="getSelectType(msg.SelectType)" :options="SelectList" v-model="msg.SelectType" ref="SelectType" @input="getSelectType(msg.SelectType)"
emit-value map-options /> emit-value map-options />
</div> </div>
<template v-if="msg.SelectType==1"> <template v-if="msg.SelectType==1">
<div class="col-3 Sysuser_Date"> <div class="col-2 Sysuser_Date">
<q-field filled dense> <q-field filled dense>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" :clearable="false" type="date" <el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" :clearable="false" type="date"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3 Sysuser_Date"> <div class="col-2 Sysuser_Date">
<q-field filled dense> <q-field filled dense>
 <template v-slot:control>  <template v-slot:control>
<el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" :clearable="false" type="date" <el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" :clearable="false" type="date"
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
</template> </template>
<template v-if="msg.SelectType==2"> <template v-if="msg.SelectType==2">
<div class="col-3"> <div class="col-2">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" type="month" :clearable="false" <el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" type="month" :clearable="false"
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-2">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" type="month" :clearable="false" <el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" type="month" :clearable="false"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</div> </div>
</template> </template>
<template v-if="msg.SelectType==3"> <template v-if="msg.SelectType==3">
<div class="col-3"> <div class="col-2">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" type="year" :clearable="false" <el-date-picker v-model="msg.StartTime" size="mini" style="width:100%" type="year" :clearable="false"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-3"> <div class="col-2">
<q-field filled dense> <q-field filled dense>
<template v-slot:control> <template v-slot:control>
<el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" type="year" :clearable="false" <el-date-picker v-model="msg.EndTime" size="mini" style="width:100%" type="year" :clearable="false"
...@@ -81,12 +81,11 @@ ...@@ -81,12 +81,11 @@
</q-field> </q-field>
</div> </div>
</template> </template>
</div> </div>
</div> </div>
<div class="page-content"> <div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
class="sticky-column-table no-bottom-table" separator="none" :data="dataList" :columns="columns"> separator="none" :data="dataList" :columns="columns">
<template v-slot:top> <template v-slot:top>
<div class="col-2 q-table__title">咖啡劵统计</div> <div class="col-2 q-table__title">咖啡劵统计</div>
<q-space /> <q-space />
...@@ -150,6 +149,8 @@ ...@@ -150,6 +149,8 @@
</template> </template>
</q-tr> </q-tr>
</template> </template>
<template v-slot:bottom>
</template>
</q-table> </q-table>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment