From b98fc925ce28cb8baa29600b4fce361bb7eb9056 Mon Sep 17 00:00:00 2001 From: lb01 Date: Thu, 17 Nov 2022 18:20:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=8C=89=E5=A4=A9?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=8C=89=E5=A4=A9?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E5=AE=A1=E6=A0=B8=EF=BC=8C=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E6=95=99=E5=B8=88=E4=B8=8E=E4=B8=AD=E5=B1=82=E9=A2=86=E5=AF=BC?= =?UTF-8?q?=E8=AF=B7=E5=81=87=E7=BB=9F=E8=AE=A1=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=BE=E8=A1=A8=E8=80=83=E5=8B=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LearunApp-2.2.0/pages.json | 37 + .../JournalSend/list.vue | 2 +- .../IndexInStudent/list.vue | 966 ++++++++++-------- .../StuAttendanceLeave/list.vue | 18 +- .../StuAttendanceLeave/single.vue | 14 +- .../StuLeaveManagement/Check/list.vue | 471 +++++++++ .../StuLeaveManagement/Check/single.vue | 329 ++++++ .../StuLeaveManagement/list.vue | 455 +++++++++ .../StuLeaveManagement/single.vue | 322 ++++++ .../CustmerLeave/LeaderLeave/list.vue | 431 ++++++++ .../CustmerLeave/TeacherLeave/list.vue | 434 ++++++++ .../pages/studentAttendance/list.vue | 11 +- .../pages/studentCheck/list.vue | 13 +- .../LearunApp-2.2.0/pages/timeTable/list.vue | 15 +- 14 files changed, 3047 insertions(+), 471 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index fd3dc1203..9f8498363 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -591,6 +591,43 @@ "navigationBarTitleText": "课表请假管理" } }, + // 按天请假管理 + { + "path": "pages/EducationalAdministration/StuLeaveManagement/list", + "style": { + "navigationBarTitleText": "按天请假管理" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/single", + "style": { + "navigationBarTitleText": "详情" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/Check/list", + "style": { + "navigationBarTitleText": "学生按天请假审核" + } + }, + { + "path": "pages/PersonnelManagement/CustmerLeave/TeacherLeave/list", + "style": { + "navigationBarTitleText": "普通教师请假统计" + } + }, + { + "path": "pages/PersonnelManagement/CustmerLeave/LeaderLeave/list", + "style": { + "navigationBarTitleText": "中层领导请假统计" + } + }, + { + "path": "pages/EducationalAdministration/StuLeaveManagement/Check/single", + "style": { + "navigationBarTitleText": "审核" + } + }, //疫情详细信息 { "path": "pages/PersonnelManagement/ContactsDetails/list", diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue index 53a913d5a..374ea45e0 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue @@ -3,7 +3,7 @@ - {{ tips }} + {{ tips }} diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue index 40d5c2d9f..0b8df7c32 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/IndexInStudent/list.vue @@ -1,453 +1,519 @@ - diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue new file mode 100644 index 000000000..0240f441d --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue @@ -0,0 +1,471 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue new file mode 100644 index 000000000..d03b67a11 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue @@ -0,0 +1,329 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue new file mode 100644 index 000000000..0323cbf9f --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/list.vue @@ -0,0 +1,455 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue new file mode 100644 index 000000000..e4c00d3f5 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue @@ -0,0 +1,322 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue new file mode 100644 index 000000000..bd6fd010d --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue @@ -0,0 +1,431 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue new file mode 100644 index 000000000..d3c00c2a9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue @@ -0,0 +1,434 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue index be691ca81..4fde22a67 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue @@ -196,15 +196,22 @@ this.HIDE_LOADING(); _this.semester = res.semester _this.dataArr = _this.ProcessingData(res.weekList); - console.log(_this.dataArr) + // console.log(_this.dataArr) // 回显日期 if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } }); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue index a496cd49a..50709ce63 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue @@ -191,15 +191,22 @@ // 回显日期 if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf(); _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } - console.log(res) + // console.log(res) _this.dataArr.length = 0; - for(let j = 1; j < 8; j++){ + for(let j = 1; j < 11; j++){ let dataFlag = true; var num = Math.floor(Math.random() * 100000000); res.results.forEach((n, i) => { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue index 7fca372e9..15927e262 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/timeTable/list.vue @@ -137,6 +137,7 @@ _this.todayWeek.SundayTime = _this.todayWeek.SundayTime + _this.weekDayTime; } _this.num = 0; + // console.log(_this.todayWeek.MondayTime) _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); _this.loadData(_this.todayWeek.Monday, _this.todayWeek.Sunday); @@ -160,14 +161,22 @@ this.HIDE_LOADING(); _this.semester = res.semester _this.dataArr = _this.ProcessingData(res.weekList); - // 回显日期 + // console.log(res) if (!start) { _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); - _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + _this.todayWeek.SundayTime = new Date(res.endDate).valueOf(); _this.num = 0; _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); } + // // 回显日期 + // if (!start) { + // _this.todayWeek.MondayTime = new Date(res.startDate).valueOf(); + // _this.todayWeek.SundayTime = new Date(res.endDate).valueOf() + _this.noClassTime; + // _this.num = 0; + // _this.todayWeek.Monday = common.fmtDate(_this.todayWeek.MondayTime); + // _this.todayWeek.Sunday = common.fmtDate(_this.todayWeek.SundayTime); + // } }); }, @@ -187,7 +196,7 @@ }, classTap(data) { // return "" - console.log(data) + // console.log(data) let _this = this; // console.log(_this.user) if (_this.user.Description == "教师") { From 9bd5e8728f95836467df55e27173f3e7ba22387e Mon Sep 17 00:00:00 2001 From: lb01 Date: Fri, 18 Nov 2022 10:20:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E6=95=99=E5=B8=88=E8=AF=B7=E5=81=87=E7=BB=9F=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E4=B8=AD=E5=B1=82=E9=A2=86=E5=AF=BC=E8=AF=B7=E5=81=87=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustmerLeave/LeaderLeave/list.vue | 98 ++++++++-------- .../CustmerLeave/TeacherLeave/list.vue | 105 ++++++++++-------- 2 files changed, 110 insertions(+), 93 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue index bd6fd010d..6fbf61b1b 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/LeaderLeave/list.vue @@ -11,7 +11,7 @@ - + 开始时间： @@ -23,15 +23,15 @@ {{ displayListItem(item, "EndDate") }} - + - + @@ -76,10 +76,12 @@ - - + + + @@ -89,7 +91,7 @@ - + @@ -128,16 +130,16 @@ EndDate: { type: "text" }, - F_CreateUserName: { - type: "select", - dataSource: '1', - dataSourceId: 'F_CreateUserName' - }, - F_BuMen: { - type: "select", - dataSource: '1', - dataSourceId: 'F_BuMen' - }, + // F_CreateUserName: { + // type: "select", + // dataSource: '1', + // dataSourceId: 'F_CreateUserName' + // }, + // F_BuMen: { + // type: "select", + // dataSource: '1', + // dataSourceId: 'F_BuMen' + // }, F_shangxiawu: { type: "select", dataSource: '1', @@ -165,8 +167,8 @@ searchData: {}, defaultQueryData: {}, queryData: { - F_CreateUserName: "", - F_BuMen: "", + // F_CreateUserName: "", + // F_BuMen: "", F_QJType: "" }, // 数据源 @@ -175,8 +177,8 @@ value: t.value, text: t.text })), - F_BuMen: [], - F_CreateUserName: [], + // F_BuMen: [], + // F_CreateUserName: [], F_shangxiawu: Object.values(this.GET_GLOBAL('dataDictionary').sxw).map(t => ({ value: t.value, text: t.text @@ -186,7 +188,8 @@ text: t.text })), }, - + // 时间查询参数 + dateRange: null, // 页面相关参数 ready: false, tips: "加载中...", @@ -218,21 +221,21 @@ // 拉取加载列表和数据源 await Promise.all([ - this.FETCH_DATASOURCE('classdata').then(result => { - // console.log(result.data) - this.dataSource.F_BuMen = result.data.map(t => ({ - text: t.name, - value: t.id - })); - }), - - this.FETCH_DATASOURCE('teacheruserdata').then(result => { - // console.log(result.data) - this.dataSource.F_CreateUserName = result.data.map(t => ({ - text: t.f_realname, - value: t.f_userid - })); - }), + // this.FETCH_DATASOURCE('classdata').then(result => { + // // console.log(result.data) + // this.dataSource.F_BuMen = result.data.map(t => ({ + // text: t.name, + // value: t.id + // })); + // }), + + // this.FETCH_DATASOURCE('teacheruserdata').then(result => { + // // console.log(result.data) + // this.dataSource.F_CreateUserName = result.data.map(t => ({ + // text: t.f_realname, + // value: t.f_userid + // })); + // }), ]); @@ -258,10 +261,10 @@ sidx: "startdate", sord: "DESC" }, - queryJson: JSON.stringify(this.searchData) - // queryJson: JSON.stringify(Object.assign(this.searchData, { - // StuNo: this.user.account - // })), + // queryJson: JSON.stringify(this.searchData) + queryJson: JSON.stringify(Object.assign(this.searchData, { + F_CreateUserName: this.user.userId + })), }, "加载数据时出错" ); @@ -300,7 +303,11 @@ // 设置搜索条件 async searchChange() { const result = {}; - + // 时间查询相关参数 + if (this.dateRange) { + result.StartTime = this.dateRange.start + result.EndTime = this.dateRange.end + } // 将其他查询项添加到查询 JSON 中 const queryObj = pickBy(this.queryData, (t) => Array.isArray(t) ? t.length > 0 : t @@ -316,6 +323,7 @@ // 点击「清空查询条件」按钮 reset() { + this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData); this.searchChange(); }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue index d3c00c2a9..d5c32ac72 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/CustmerLeave/TeacherLeave/list.vue @@ -11,7 +11,7 @@ - + 开始时间： @@ -23,16 +23,15 @@ {{ displayListItem(item, "EndDate") }} - + - + 上下午： @@ -60,9 +59,7 @@ - + @@ -76,10 +73,12 @@ - - + + + @@ -90,7 +89,7 @@ - + @@ -129,16 +128,16 @@ EndDate: { type: "text" }, - F_CreateUserName: { - type: "select", - dataSource: '1', - dataSourceId: 'F_CreateUserName' - }, - F_BuMen: { - type: "select", - dataSource: '1', - dataSourceId: 'F_BuMen' - }, + // F_CreateUserName: { + // type: "select", + // dataSource: '1', + // dataSourceId: 'F_CreateUserName' + // }, + // F_BuMen: { + // type: "select", + // dataSource: '1', + // dataSourceId: 'F_BuMen' + // }, F_shangxiawu: { type: "select", dataSource: '1', @@ -166,8 +165,8 @@ searchData: {}, defaultQueryData: {}, queryData: { - F_CreateUserName: "", - F_BuMen: "", + // F_CreateUserName: "", + // F_BuMen: "", F_QJType: "", F_Description: "", // CreateUser: "", @@ -178,8 +177,8 @@ value: t.value, text: t.text })), - F_BuMen: [], - F_CreateUserName: [], + // F_BuMen: [], + // F_CreateUserName: [], F_shangxiawu: Object.values(this.GET_GLOBAL('dataDictionary').sxw).map(t => ({ value: t.value, text: t.text @@ -189,7 +188,8 @@ text: t.text })), }, - + // 时间查询参数 + dateRange: null, // 页面相关参数 ready: false, tips: "加载中...", @@ -214,6 +214,7 @@ methods: { // 页面初始化 async init() { + this.ON( "PersonnelManagementCustmerLeaveTeacherLeave-list-change", this.refreshList @@ -221,21 +222,21 @@ // 拉取加载列表和数据源 await Promise.all([ - this.FETCH_DATASOURCE('classdata').then(result => { - // console.log(result.data) - this.dataSource.F_BuMen = result.data.map(t => ({ - text: t.name, - value: t.id - })); - }), - - this.FETCH_DATASOURCE('teacheruserdata').then(result => { - // console.log(result.data) - this.dataSource.F_CreateUserName = result.data.map(t => ({ - text: t.f_realname, - value: t.f_userid - })); - }), + // this.FETCH_DATASOURCE('classdata').then(result => { + // // console.log(result.data) + // this.dataSource.F_BuMen = result.data.map(t => ({ + // text: t.name, + // value: t.id + // })); + // }), + + // this.FETCH_DATASOURCE('teacheruserdata').then(result => { + // // console.log(result.data) + // this.dataSource.F_CreateUserName = result.data.map(t => ({ + // text: t.f_realname, + // value: t.f_userid + // })); + // }), ]); @@ -261,10 +262,10 @@ sidx: "startdate", sord: "DESC" }, - queryJson: JSON.stringify(this.searchData) - // queryJson: JSON.stringify(Object.assign(this.searchData, { - // StuNo: this.user.account - // })), + // queryJson: JSON.stringify(this.searchData) + queryJson: JSON.stringify(Object.assign(this.searchData, { + F_CreateUserName: this.user.userId + })), }, "加载数据时出错" ); @@ -304,6 +305,12 @@ async searchChange() { const result = {}; + // 时间查询相关参数 + if (this.dateRange) { + result.StartTime = this.dateRange.start + result.EndTime = this.dateRange.end + } + // 将其他查询项添加到查询 JSON 中 const queryObj = pickBy(this.queryData, (t) => Array.isArray(t) ? t.length > 0 : t @@ -319,6 +326,7 @@ // 点击「清空查询条件」按钮 reset() { + this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData); this.searchChange(); }, @@ -423,6 +431,7 @@ }, created() { this.user = this.GET_GLOBAL('loginUser'); + // console.log(this.user) } };