Commit e15077b5 authored by zhengke's avatar zhengke

修改

parent 33b41592
...@@ -3,23 +3,23 @@ ...@@ -3,23 +3,23 @@
<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-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.MenuName" <q-input @change="resetSearch" clearable standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuName"
label="菜单名称" /> label="菜单名称" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable standout="bg-primary text-white" v-model="msg.MenuUrl" <q-input @change="resetSearch" clearable standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuUrl"
label="菜单地址" /> label="菜单地址" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.MenuType" :options="MenuTypeOpts" <q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.MenuType" class="col-6 q-pr-lg q-pr-lg" :options="MenuTypeOpts"
emit-value map-options label="菜单类型" /> emit-value map-options label="菜单类型" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.MenuLevel" <q-select @input="resetSearch" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.MenuLevel"
:options="MenuLevelOpts" emit-value map-options label="菜单等级" /> :options="MenuLevelOpts" emit-value map-options label="菜单等级" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" standout="bg-primary text-white" v-model="msg.Status" :options="ShowOpts" <q-select @input="resetSearch" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="msg.Status" :options="ShowOpts"
emit-value map-options label="状态" /> emit-value map-options label="状态" />
</div> </div>
</div> </div>
......
...@@ -73,6 +73,12 @@ ...@@ -73,6 +73,12 @@
font-size: 14px; font-size: 14px;
margin-left: 5px; margin-left: 5px;
} }
.Sysuser_Date .el-range-editor .el-range-input{
background-color:transparent;
}
.Sysuser_Date .el-range-editor.el-input__inner{
background-color:transparent;
}
</style> </style>
<template> <template>
...@@ -87,37 +93,25 @@ ...@@ -87,37 +93,25 @@
<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-3">
<q-input clearable @change="getList" standout="bg-primary text-white" v-model="waterMsg.ReceiverName" <q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.ReceiverName"
label="收信人/电话" /> label="收信人/电话" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-input clearable @change="getList" standout="bg-primary text-white" v-model="waterMsg.SendContent" <q-input clearable @change="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.SendContent"
label="内容" /> label="内容" />
</div> </div>
<div class="col-3"> <div class="col-3 Sysuser_Date">
<q-input filled v-model="waterMsg.StartDate" mask="date" label="开始日期"> <q-field filled class="col-6 q-pr-lg q-pb-lg">
<template v-slot:append>             <template v-slot:control>
<q-icon name="event" class="cursor-pointer">               <el-date-picker v-model="dateListOne" @change="getList()" value-format="yyyy-MM-dd" type="daterange"
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">  style="border:none;"
<q-date v-model="waterMsg.StartDate" @input="getList(),() => $refs.qDateProxy.hide()" />                 range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
</q-popup-proxy>               </el-date-picker>
</q-icon>             </template>
</template>           </q-field>
</q-input>
</div>
<div class="col-3">
<q-input filled v-model="waterMsg.EndDate" mask="date" label="结束日期">
<template v-slot:append>
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy2" transition-show="scale" transition-hide="scale">
<q-date v-model="waterMsg.EndDate" @input="getList(),() => $refs.qDateProxy2.hide()" />
</q-popup-proxy>
</q-icon>
</template>
</q-input>
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="getList" standout="bg-primary text-white" v-model="waterMsg.SendStatus" <q-select @input="getList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="waterMsg.SendStatus"
:options="ShowOpts" emit-value map-options label="发送状态" /> :options="ShowOpts" emit-value map-options label="发送状态" />
</div> </div>
</div> </div>
...@@ -148,7 +142,7 @@ ...@@ -148,7 +142,7 @@
<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-3">
<q-select @input="getConfigList" standout="bg-primary text-white" v-model="ConfigMsg.StoreType" <q-select @input="getConfigList" standout="bg-primary text-white" class="col-6 q-pr-lg q-pr-lg" v-model="ConfigMsg.StoreType"
:options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" /> :options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" />
</div> </div>
</div> </div>
...@@ -196,7 +190,7 @@ ...@@ -196,7 +190,7 @@
<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-3">
<q-select @input="getSetingMsg" standout="bg-primary text-white" v-model="setMsg.StoreType" <q-select @input="getSetingMsg" class="col-6 q-pr-lg q-pr-lg" standout="bg-primary text-white" v-model="setMsg.StoreType"
:options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" /> :options="statusData" option-value="Id" option-label="Name" emit-value map-options label="类型" />
</div> </div>
</div> </div>
...@@ -451,6 +445,7 @@ ...@@ -451,6 +445,7 @@
moduleList: [], //配置类型列表 moduleList: [], //配置类型列表
setUpData: [], //短信设置数据 setUpData: [], //短信设置数据
setDataCount: 0, //短信设置页数 setDataCount: 0, //短信设置页数
dateListOne:[], //日期
} }
}, },
mounted() { mounted() {
...@@ -471,6 +466,14 @@ ...@@ -471,6 +466,14 @@
//获取短信流水数据 //获取短信流水数据
getList() { getList() {
this.loading = false; this.loading = false;
if (this.dateListOne && this.dateListOne.length > 0) {
this.waterMsg.StartDate = this.dateListOne[0];
this.waterMsg.EndDate = this.dateListOne[1];
} else {
this.waterMsg.StartDate = '';
this.waterMsg.EndDate = '';
}
getMsgPage(this.waterMsg).then(res => { getMsgPage(this.waterMsg).then(res => {
this.data = res.Data.PageData; this.data = res.Data.PageData;
this.loading = false; this.loading = false;
......
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