Commit 0d7c1759 authored by 姬鋆屾's avatar 姬鋆屾

tui

parent d82a6745
...@@ -19,6 +19,14 @@ export default { ...@@ -19,6 +19,14 @@ export default {
watch: { watch: {
$route(route) { $route(route) {
this.query = Object.assign({}, this.query, route.query); this.query = Object.assign({}, this.query, route.query);
if (this.query.yearmonth == undefined) {
delete this.query.month;
delete this.query.year;
}
if (this.query.createTimeMonth == undefined) {
delete this.query.createTimeStart;
delete this.query.createTimeEnd;
}
this.getData(); this.getData();
}, },
}, },
......
...@@ -332,11 +332,30 @@ export default { ...@@ -332,11 +332,30 @@ export default {
newData[item.name] = item.multiple ? [] : ""; newData[item.name] = item.multiple ? [] : "";
} }
}); });
delete this.$route.query.yearmonth;
delete this.$route.query.createTimeMonth;
this.form = Object.assign({}, this.form, newData); this.form = Object.assign({}, this.form, newData);
this.onSubmit(); this.onSubmit();
}, },
onSubmit() { onSubmit() {
let { path, query } = this.$route; let { path, query } = this.$route;
if (this.form.yearmonth) {
let arr = this.form.yearmonth.split("-");
this.form.year = arr[0];
this.form.month = arr[1];
} else {
this.form.year = undefined;
this.form.month = undefined;
}
if (this.form.createTimeMonth) {
this.form.createTimeStart = this.form.createTimeMonth + "-01";
this.form.createTimeEnd = this.form.createTimeMonth + "-31";
} else {
this.form.createTimeStart = undefined;
this.form.createTimeEnd = undefined;
}
if (this.form.attendanceDateStart && this.form.attendanceDateEnd) { if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
let startValue = Date.parse(this.form.attendanceDateStart); let startValue = Date.parse(this.form.attendanceDateStart);
let endValue = Date.parse(this.form.attendanceDateEnd); let endValue = Date.parse(this.form.attendanceDateEnd);
...@@ -375,9 +394,21 @@ export default { ...@@ -375,9 +394,21 @@ export default {
delete this.form.summaryTimeEnd; delete this.form.summaryTimeEnd;
} }
let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据 let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
console.log(this.form, "form参数");
let data = this.decode(params); let data = this.decode(params);
// Object.assign({}, query, data) // Object.assign({}, query, data)
console.log({
...query,
...data,
});
if (!query.yearmonth) {
query.year = undefined;
query.month = undefined;
}
if (!query.createTimeMonth) {
query.createTimeEnd = undefined;
query.createTimeStart = undefined;
}
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
......
...@@ -182,9 +182,9 @@ export default { ...@@ -182,9 +182,9 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -189,9 +189,9 @@ export default { ...@@ -189,9 +189,9 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -184,9 +184,9 @@ export default { ...@@ -184,9 +184,9 @@ export default {
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择开始日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -183,9 +183,9 @@ export default { ...@@ -183,9 +183,9 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -182,9 +182,9 @@ export default { ...@@ -182,9 +182,9 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -188,9 +188,9 @@ export default { ...@@ -188,9 +188,9 @@ export default {
fuzzy: false, fuzzy: false,
}, },
{ {
name: "createTime", name: "createTimeMonth",
type: "datetime", type: "month",
label: "请选择日期", label: "请选择月份",
fuzzy: false, fuzzy: false,
}, },
{ {
......
...@@ -27,6 +27,7 @@ export default { ...@@ -27,6 +27,7 @@ export default {
}, },
mixins: [table], mixins: [table],
created() {}, created() {},
methods: { methods: {
/** 导出Excel */ /** 导出Excel */
doExport() { doExport() {
...@@ -65,9 +66,9 @@ export default { ...@@ -65,9 +66,9 @@ export default {
isshowTabPane: true, isshowTabPane: true,
search: [ search: [
{ {
name: "createTimeStart", name: "yearmonth",
type: "date", type: "month",
label: "月份", label: "请选择月份",
fuzzy: false, fuzzy: 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