Skip to content

B
bill-manager-ui
Commit 18c2ec08 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加站点分类查询

parent b69285e9
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 16 deletions
admin/src/components/DataTable.vue
View file @ 18c2ec08
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
:prop="column.prop" :prop="column.prop"
:label="column.label" :label="column.label"
:width="column.width" :width="column.width"
v-if="column.show==null||column.show==true"
:sortable="column.sortable" :sortable="column.sortable"
:show-overflow-tooltip="column.tooltip" :show-overflow-tooltip="column.tooltip"
:align="column.align || 'left'" :align="column.align || 'left'"
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
:subColumns='column.subColumns' :subColumns='column.subColumns'
> >
<el-table-column <el-table-column
v-for='sunColumn in column.subColumns' v-for='sunColumn in column.subColumns'
:key='sunColumn.prop' :key='sunColumn.prop'
...@@ -114,7 +116,7 @@ export default { ...@@ -114,7 +116,7 @@ export default {
type: String, type: String,
required: false, required: false,
default: "table", default: "table",
} },
}, },
computed: { computed: {
emptyText() { emptyText() {
......
admin/src/components/SearchForm.vue
View file @ 18c2ec08
...@@ -28,6 +28,20 @@ ...@@ -28,6 +28,20 @@
> >
</el-checkbox-group> </el-checkbox-group>
<el-checkbox-group
v-model="form[item.name]"
v-if="item.type === 'groupList'"
>
<el-checkbox
v-for="(label, value) in table.dict[item.name]"
:label="value"
:key="value"
checked
>{{ label }}</el-checkbox
>
</el-checkbox-group>
<el-select <el-select
v-model="form[item.name]" v-model="form[item.name]"
:filterable="item.filterable" :filterable="item.filterable"
...@@ -124,24 +138,35 @@ ...@@ -124,24 +138,35 @@
> >
</el-date-picker> </el-date-picker>
<el-date-picker
v-model="form[item.name]"
v-if="item.type === 'year' && !item.valueFormat"
type="year"
value-format="yyyy"
placeholder="选择年份">
</el-date-picker>
<el-date-picker <el-date-picker
v-model="form[item.name]" v-model="form[item.name]"
v-if="item.type === 'month' && !item.valueFormat" v-if="item.type === 'month' && !item.valueFormat"
type="month" type="month"
value-format="yyyy-MM" format="M"
value-format="M"
placeholder="选择月份" placeholder="选择月份"
> >
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker
v-model="form[item.name]" v-model="form[item.name]"
v-if="item.type === 'month' && item.valueFormat" v-if="item.type === 'day' && !item.valueFormat"
type="month" type="date"
:value-format="item.valueFormat" format="d"
placeholder="选择月份" value-format="d"
placeholder="选择日期"
> >
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker
v-model="form[item.name]" v-model="form[item.name]"
v-if="item.type === 'datetime'" v-if="item.type === 'datetime'"
...@@ -150,6 +175,10 @@ ...@@ -150,6 +175,10 @@
:placeholder="item.label" :placeholder="item.label"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -194,12 +223,10 @@ export default { ...@@ -194,12 +223,10 @@ export default {
}, },
watch: { watch: {
$route(route) { $route(route) {
console.log(222)
this.initForm(route.query); this.initForm(route.query);
}, },
}, },
async created() { async created() {
console.log("1111")
this.initForm(this.$route.query); this.initForm(this.$route.query);
}, },
methods: { methods: {
...@@ -275,6 +302,7 @@ export default { ...@@ -275,6 +302,7 @@ export default {
this.form = Object.assign({}, this.form, newData); this.form = Object.assign({}, this.form, newData);
}, },
onSubmit() { onSubmit() {
console.log(this.$route)
let { path, query } = this.$route; let { path, query } = this.$route;
let data = this.decode(this.form); let data = this.decode(this.form);
console.log("data:",data) console.log("data:",data)
......
admin/src/views/ph/queue/stat/list.vue
View file @ 18c2ec08
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notDel :config="tableConfig"> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable> </LayoutTable>
...@@ -12,14 +12,19 @@ ...@@ -12,14 +12,19 @@
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import session from "@/assets/utils/session";
export default { export default {
name: "PhQueueStatList", name: "PhQueueStatList",
components: { components: {
drawerShow drawerShow
}, },
mixins: [table], mixins: [table],
created() { created() {
}, const siteid = session.getSession("siteid");
this.query["siteId"]=siteid?siteid:1;
this.query.groupList=["year","month","day"]
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
...@@ -39,6 +44,52 @@ ...@@ -39,6 +44,52 @@
return { return {
config: { config: {
search: [ search: [
{
name: "sectionNameList",
type: "select",
multiple:true,
label: "部门",
},
{
name: "hallNameList",
type: "select",
multiple:true,
label: "所属大厅",
},
{
name: "windowFromnumList",
type: "select",
multiple:true,
label: "窗口编号",
},
{
name: "businessList",
type: "select",
multiple:true,
label: "业务",
},
{
name: "year",
type: "year",
label: "年",
},
{
name: "month",
type: "month",
},
{
name: "day",
type: "day",
},
{
name: "groupList",
type: "groupList",
label: "分组",
},
], ],
columns: [ columns: [
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
...@@ -55,7 +106,7 @@ ...@@ -55,7 +106,7 @@
{label: "取号数量", prop: "phCount",formatter: this.formatter}, {label: "取号数量", prop: "phCount",formatter: this.formatter},
{label: "等待时间", prop: "waitTime",formatter: this.formatterDateSeconds}, {label: "平均等待时间", prop: "waitTime",formatter: this.formatterDateSeconds},
{label: "年", width: 80, prop: "year",formatter: this.formatter}, {label: "年", width: 80, prop: "year",formatter: this.formatter},
......
admin/src/views/pj/evaluate/stat/list.vue
View file @ 18c2ec08
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notDel :config="tableConfig"> <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
</LayoutTable> </LayoutTable>
...@@ -12,15 +13,22 @@ ...@@ -12,15 +13,22 @@
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import drawerShow from "./drawershow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import session from "@/assets/utils/session";
export default { export default {
name: "PjEvaluateStatList", name: "PjEvaluateStatList",
components: { components: {
drawerShow drawerShow
}, },
mixins: [table], mixins: [table],
created() { created() {
}, const siteid = session.getSession("siteid");
this.query["siteId"]=siteid?siteid:1;
this.query.groupList=["year","month","day"]
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.drawerform.add(row); this.$refs.drawerform.add(row);
...@@ -37,8 +45,59 @@ ...@@ -37,8 +45,59 @@
}, },
data() { data() {
return { return {
year:true,
month:true,
day:true,
groupList:[],
config: { config: {
search: [ search: [
{
name: "sectionNameList",
type: "select",
multiple:true,
label: "部门",
},
{
name: "hallNameList",
type: "select",
multiple:true,
label: "所属大厅",
},
{
name: "windowFromnumList",
type: "select",
multiple:true,
label: "窗口编号",
},
{
name: "pjOptionList",
type: "select",
multiple:true,
label: "评价选项",
},
{
name: "year",
type: "year",
label: "年",
},
{
name: "month",
type: "month",
},
{
name: "day",
type: "day",
},
{
name: "groupList",
type: "groupList",
label: "分组",
},
], ],
columns: [ columns: [
{type: "index",label: "序号",width: 50}, {type: "index",label: "序号",width: 50},
......
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