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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.cshtml

@@ -17,8 +17,8 @@
         <div id="UserId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_borrowinfo">
-        <div class="lr-form-item-title">数量</div>
-        <input id="Amount" type="number" class="form-control" />
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="PositiveFloatint"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_borrowinfo">
         <div class="lr-form-item-title">借书证</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookBorrow/Form.js

@@ -39,11 +39,11 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
-        var Amount = $('#Amount').val();
-        if (Amount <= 0 || Math.floor(Amount) !== Amount) {
-            learun.alert.warning('数量请输入大于0的整数！');
-            return false;
-        }
+        //var Amount = $('#Amount').val();
+        //if (Amount <= 0 || Math.floor(Amount) !== Amount) {
+        //    learun.alert.warning('数量请输入大于0的整数！');
+        //    return false;
+        //}
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.cshtml

@@ -17,8 +17,8 @@
         <div id="UserId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_returninfo">
-        <div class="lr-form-item-title">数量</div>
-        <input id="Amount" type="number" class="form-control" />
+        <div class="lr-form-item-title">数量<font face="宋体">*</font></div>
+        <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="PositiveFloatint"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Book_returninfo">
         <div class="lr-form-item-title">借书证</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/BookReturn/Form.js

@@ -40,11 +40,11 @@ var bootstrap = function ($, learun) {
             return false;
         }
 
-        var Amount = $('#Amount').val();
-        if (Amount <= 0 || Math.floor(Amount) !== Amount) {
-            learun.alert.warning('数量请输入大于0的整数！');
-            return false;
-        }
+        //var Amount = $('#Amount').val();
+        //if (Amount <= 0 || Math.floor(Amount) !== Amount) {
+        //    learun.alert.warning('数量请输入大于0的整数！');
+        //    return false;
+        //}
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue

@@ -43,12 +43,12 @@
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">开始时间：</text>
-							{{ displayListItem(item, "StartTime") }}
+							{{ itmeDel(displayListItem(item, "StartTime"))}}
 						</view>
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">结束时间：</text>
-							{{ displayListItem(item, "EndTime") }}
+							{{ itmeDel(displayListItem(item, "EndTime"))  }}
 						</view>
 
 						<view class="customlist-item-field">
@@ -485,6 +485,10 @@
 			LeaveTypeItem(data) {
 
 			},
+			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');

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue

@@ -193,8 +193,8 @@ export default {
 		  CheckTime:{ type: 'text', title: '审核人' },
 		  CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' },
 		  LeaveType: { type: 'select', title: '请假类型', dataSource: '0' },
-          StartTime: { type: 'datetime', title: '开始时间', dateformat: '1'  },
-          EndTime: { type: 'datetime', title: '结束时间', dateformat: '1'  },
+          StartTime: { type: 'datetime', title: '开始时间', dateformat: '0'  },
+          EndTime: { type: 'datetime', title: '结束时间', dateformat: '0'  },
 		  LeaveDay: { type: 'number', title: '请假天数',verify:"NumOrNull" },
 		  LeaveReason: { type: 'texteditor', title: '请假事由' },
 		  CreateUserNo: { type: 'text', title: '学号' },

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentCheck/list.vue

@@ -45,7 +45,7 @@
 								{{ k.ClassRoomName }}
 							</view>
 						 <view class="studCheckStatue"
-								:class="k.Sort == '迟到'? 'studCheckStatue2' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue2' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' ">
+								:class="k.Sort == '迟到'? 'studCheckStatue5' : k.Sort == '早退'? 'studCheckStatue2' : k.Sort == '病假'? 'studCheckStatue4' : k.Sort == '事假'? 'studCheckStatue6' : k.Sort == '准时'? 'studCheckStatue1' : 'studCheckStatue3' ">
 								<text></text> {{ k.Sort }}
 							</view>
 						</view>
@@ -420,7 +420,23 @@
 	.studCheckStatue4 text {
 		background: #29cf41;
 	}
-
+	
+	.studCheckStatue5 {
+		color: #ad5151;
+	}
+	
+	.studCheckStatue5 text {
+		background: #ad5151;
+	}
+	
+	.studCheckStatue6 {
+		color: #84f193;
+	}
+	
+	.studCheckStatue6 text {
+		background: #84f193;
+	}
+	
 	.noHtml {
 		height: 100%;
 		line-height: 60px;