From d33141917388d4b0dd839ce0d9da75cbafe78a6b Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 2 Dec 2022 20:22:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=BA=A2=E7=89=9B=20=20?= =?UTF-8?q?=E6=88=91=E7=9A=84=E8=80=83=E5=8B=A4=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=B7=E5=81=87=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Learun.Application.WebApi/Modules/TeachAttendance.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TeachAttendance.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TeachAttendance.cs index 655f536e3..98627236d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TeachAttendance.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TeachAttendance.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web; +using Learun.Application.Base.SystemModule; using Learun.Application.TwoDevelopment.EducationalAdministration; using Learun.Util; using Nancy; @@ -21,6 +22,8 @@ namespace Learun.Application.WebApi.Modules private StuAttendanceIBLL stuAttendanceIBLL = new StuAttendanceBLL(); private ArrangeLessonTermOfElectiveIBLL arrangeLessonTermOfElectiveIBLL = new ArrangeLessonTermOfElectiveBLL(); private readonly TeachAttendanceIBLL teachAttendanceIBLL = new TeachAttendanceBLL(); + private DataItemIBLL dataItemIBLL = new DataItemBLL(); + public Response GetList(dynamic _) { var result = teachAttendanceIBLL.GetAttendanceByEmpNo(userInfo.account); @@ -36,11 +39,17 @@ namespace Learun.Application.WebApi.Modules if (queryParam["LessonSortNo"].ToString() == "1")//必修课 { data = arrangeLessonTermIBLL.AttendanceStudents(parameter.pagination, parameter.queryJson).ToList(); + foreach (var item in data) + { + + item.kqType = dataItemIBLL.GetDetailListByParentId("ktkqlx", "0").Find(a => a.F_ItemName == item.Sort).F_ItemValue; + } } else if (queryParam["LessonSortNo"].ToString() == "2")//选修课 { data = arrangeLessonTermOfElectiveIBLL.AttendanceStudents(parameter.pagination, parameter.queryJson).ToList(); } + var jsonData = new { rows = data, From e3f1c532a7dcc1d010bcc1111c50d9c86f91460f Mon Sep 17 00:00:00 2001 From: lb01 Date: Fri, 2 Dec 2022 20:33:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BD=9C=E5=BA=9F=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA0=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=90=E8=A1=A8=E8=87=AA=E5=8A=A8=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetManagementSystem/FundsApply/list.vue | 2 +- .../FundsApply/single.vue | 20 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue index 7ace56299..96f4f6441 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/list.vue @@ -379,7 +379,7 @@ } else if (data == '2') { return '审批通过' } else { - return data; + return '作废'; } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue index acc3eb81a..9a4348ac7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue @@ -148,7 +148,8 @@ }, UpperAmount: { type: 'text', - title: '总金额' + title: '总金额', + verify: 'NotNull' }, Status: { type: 'text', @@ -207,6 +208,7 @@ // this.dataSource.FundsApply.CheckStatus = result.data.map(t => ({ text: t.name, value: t.id })) // }), ]) + // console.log(this.dataSource.FundsApply.ApplyUser) await this.fetchForm() this.ready = true @@ -221,7 +223,7 @@ // this.EnCode = result.EnCode const source = { ApplyDept: this.user.departmentId, - ApplyUser: this.user.account, + ApplyUser: this.user.userId, ApplyTime: new Date().getTime() }; let resultres = Object.assign(result, source) @@ -358,9 +360,15 @@ }, del(str, num) { console.log(str) + let _this = this this.FundsApplyDetail.splice(num, 1) console.log(this.FundsApplyDetail) - // this.queryData[str].splice(num, 1) + let Amounts = _this.FundsApplyDetail.map(item => { + return item.Amount + }) + + _this.current.FundsApply.SumAmount = _this.sum(Amounts) + _this.current.FundsApply.UpperAmount = _this.smalltoBIG(_this.current.FundsApply.SumAmount) }, SumAmountChange(item) { console.log(item) @@ -381,6 +389,9 @@ }, sum(args) { + if(args == 0){ + return '' + } // var args = arguments,//获取所有的参数 var d = 0, //定义小数位的初始长度，默认为整数，即小数位为0 sum = 0; //定义sum来接收所有数据的和 @@ -405,6 +416,9 @@ return sum / m; }, smalltoBIG(n) { + if(n == 0){ + return '' + } var fraction = ['角', '分']; var digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖']; var unit = [