From 6104e2e221aa0deec543ed6e9444b9be07fb22e8 Mon Sep 17 00:00:00 2001 From: lb01 Date: Sat, 26 Nov 2022 15:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E5=80=BC=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=AD=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JournalSend/single.vue | 5 +- .../IndexInStudent/list.vue | 2 +- .../StuAttendanceLeave/list.vue | 53 +++++++++++++++---- .../StuLeaveManagement/list.vue | 25 +++++++-- .../StuLeaveManagement/single.vue | 25 +++++++-- .../pages/Payslip/recruitPayslip/single.vue | 8 +-- .../pages/Payslip/welfarePayslip/single.vue | 18 ++++--- 7 files changed, 103 insertions(+), 33 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue index dba55ef53..d6879ea3d 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue @@ -6,7 +6,7 @@ + :value="getValue('JournalSend.JReceiveId')" :readonly="!edit" type="user" title="接收人" /> @@ -85,8 +85,7 @@ JReceiveId: { type: 'organize', title: '接收人', - dataType: 'user', - verify: "NotNull" + dataType: 'user' }, JContent: { type: 'textarea', 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 690e07f87..6edf63635 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 @@ -334,7 +334,7 @@ pagination: { rows: 10, page: this.page, - sidx: 'Id', + sidx: 'UpdateDate', sord: 'DESC' }, queryJson: JSON.stringify(Object.assign(this.searchData, { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue index c120f80ee..d5222ee32 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue @@ -10,7 +10,23 @@ - + + + + 申请时间: + {{ displayListItem(item, 'UpdateDate') }} + + + + 审核状态: + {{ IsCheckitem(displayListItem(item, 'IsCheck')) }} + + + + 原上课时间: + {{itmeDel(displayListItem(item, 'LessonDate')) }} + + 学年度: {{ displayListItem(item, 'AcademicYearNo') }} @@ -62,7 +78,7 @@ - + @@ -97,7 +113,7 @@ - + @@ -131,6 +147,9 @@ export default { return { // 数据项的数据类型、结构 scheme: { + UpdateDate:{type: 'text'}, + IsCheck:{type: 'text'}, + LessonDate:{type: 'text'}, AcademicYearNo: { type: 'text' }, Semester: { type: 'text' }, StuNo: { type: 'text' }, @@ -138,8 +157,8 @@ export default { Grade: { type: 'text' }, DeptNo: { type: 'text' }, DeptName: { type: 'text' }, - MajorNo: { type: 'text' }, - MajorName: { type: 'text' }, + MajorNo: { type: "text" }, + MajorName: { type: "text" }, ClassNo: { type: 'text' }, }, @@ -153,6 +172,7 @@ export default { // 数据源 dataSource: { + MajorNo:[] }, // 页面相关参数 @@ -183,8 +203,9 @@ export default { // 拉取加载列表和数据源 await Promise.all([ - - + this.FETCH_DATASOURCE('CdMajorInfo').then(result => { + this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) + }), () => {} ]) await this.fetchList() @@ -202,7 +223,7 @@ export default { { // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序) // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'UpdateDate', sord: 'DESC' }, queryJson: JSON.stringify(Object.assign(this.searchData,{ClassManagerNo:this.user.account})) }, '加载数据时出错' @@ -314,12 +335,24 @@ export default { default: return value === null || value === undefined ? '' : value } - } + }, + IsCheckitem(data){ + if(data){ + return data == 1?'同意':'不同意' + }else{ + return '待审核' + } + }, + itmeDel(data){ + var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(data) + return newDate[0] + } }, created() { this.user = this.GET_GLOBAL('loginUser'); - } + }, + } 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 index 0323cbf9f..b0c9f2d99 100644 --- 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 @@ -191,16 +191,16 @@ type: "text" }, ClassNo: { - type: "text" + type: "select",dataSource: '1', dataSourceId: 'ClassNo' }, DeptNo: { - type: "text" + type: "select",dataSource: '1', dataSourceId: 'DeptNo' }, MajorNo: { - type: "text" + type: "select",dataSource: '1', dataSourceId: 'MajorNo' }, ClassDiredctorNo: { - type: "text" + type: "select",dataSource: '1', dataSourceId: 'ClassDiredctorNo' }, ClassTutorNo: { type: "text" @@ -218,6 +218,10 @@ // 数据源 dataSource: { + ClassNo:[], + DeptNo:[], + MajorNo:[], + ClassDiredctorNo:[], LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text @@ -259,7 +263,18 @@ // 拉取加载列表和数据源 await Promise.all([ - + this.FETCH_DATASOURCE('bjsj').then(result => { + this.dataSource.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) + }), + this.FETCH_DATASOURCE('EmpInfo').then(result => { + this.dataSource.ClassDiredctorNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.empname, value: t.empno })); + }), + this.FETCH_DATASOURCE('CdDeptInfo').then(result => { + this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })); + }), + this.FETCH_DATASOURCE('CdMajorInfo').then(result => { + this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })); + }), ]); await this.fetchList(); // 初始化查询条件 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 index 9d0a60df1..14010c6b3 100644 --- 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 @@ -31,7 +31,21 @@ required :disabled="!edit" /> - + + - +