Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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,

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 '作废';
 				}
 			}
 

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 = [