合并master

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -1,5 +1,5 @@
-var config = {
-    webapi: 'http://localhost:8088/',
+var config = {
+    webapi: 'http://123.57.209.16:31173/',
     web: "http://localhost:8087/"//web地址，用于配置logo
 };
 //var config = {
@@ -16,13 +16,18 @@
 //    webapi: 'http://localhost:8081/',
 //    web: "http://localhost:8080/"//web地址，用于配置logo
 //}; 
-//var config = {
-//    webapi: 'http://123.57.209.16:31174/',
+// var config = {
+//    webapi: 'http://123.57.209.16:31173/',
 //    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
-//}; 
+// }; 
 
 //金隅
 //var config = {
 //    webapi: 'http://192.168.100.225:31173/',
 //    web:"http://192.168.100.225:8081/"//web地址，用于配置logo
-//};
+//};
+
+// var config = {
+//    webapi: 'http://123.57.209.16:31174/',
+//    web: "http://123.57.209.16:31175/"//web地址，用于配置logo
+// }; 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.html

@@ -1,4 +1,4 @@
-<div class="lr-page lr-Ask-page"> 
+<div class="lr-page lr-Ask-page"> 
     <div class="lr-page-tool"> 
         <div class="lr-tool-left"> 
             总共<span class="lr-badge lr-badge-primary">0</span>条 
@@ -16,7 +16,4 @@
         </div> 
     </div> 
     <div class="lr-page-content" id="lr_Ask_list"></div> 
-    <!--<div class="lr-list-addbtn" id="lr_Ask_btn"> 
-        <i class="iconfont icon-add1"></i> 
-    </div>--> 
 </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/Ask.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var multipleData = null;
     var page = {
         grid: null,
@@ -26,6 +26,7 @@
         },
         lclass: 'lr-list',
         loadData: function (param, callback, $page) {// 列表加载后台数据 
+			console.log(param)
             var _postParam = {
                 pagination: {
                     rows: param.rows,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/Ask/AskPaper/AskPaper.js

@@ -2,6 +2,7 @@
 	var page = {
 		isScroll: true,
 		init: function($page, param) {
+			console.log(param)
             var path = config.webapi;
             learun.layer.loading(true,"加载数据中...");
 			learun.httpget(path + "/learun/ask/paper", {
@@ -10,6 +11,7 @@
                 learun.layer.loading(false);
 				$page.find('.inSecTitle').html(res.VTitle).end().find('.inSecTime').html(res.VStartTime + ' - ' + res.VStopTime)
 				var dataList = res.Ask_Questions;
+				console.log(dataList)
 				var otherHtml = '<div class="shenInput shenInput3">'+
 									'<span>其他</span>'+
 									'<div class="shenInputBox shenInputBox1">'+
@@ -92,7 +94,7 @@
 					return
 				}
 				// return
-				learun.httpget(path + "/learun/ask/savepaper",
+				learun.httppost(path + "/learun/ask/savepaper",
 				   {
 				       VID: param.VID,
 				       LessonNo: param.LessonNo,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Ass_InventoryItemList.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
  * Copyright (c) 2013-2018 北京泉江科技有限公司  
  * 创建人：超级管理员 
  * 日  期：2019-10-17 17:22 
@@ -144,6 +144,7 @@
                 });
             }
             learun.httpget(config.webapi + 'learun/AssetManagementSystem/InventoryItem/pagelist', _postParam, (data) => {
+				console.log(data)
                 $page.find('.lr-badge').text('0');
                 if (data) {
                     $page.find('.lr-badge').text(data.records);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/AssetManagementSystem/Ass_InventoryResult/Ass_InventoryItemList/Form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
  * Copyright (c) 2013-2018 北京泉江科技有限公司  
  * 创建人：超级管理员 
  * 日  期：2019-10-24 16:51 
@@ -89,6 +89,7 @@
                 var _postData = {}
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+				console.log(_postData)
                 learun.layer.loading(true, '正在提交数据');
                 learun.httppost(config.webapi + 'learun/AssetManagementSystem/InventoryItem/save', _postData, (data) => {
                     learun.layer.loading(false);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form/form.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var keyValue = '';
     var weekChina = ["一", "二", "三", "四", "五", "六", "日"];
     var $header = null;
@@ -31,11 +31,11 @@
                                 config.webapi +
                                 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/GetApplyResult',
                                 _postData,
-                                (
-                                    dataresult, inforesult) => {
+                                (dataresult, inforesult) => {
                                     learun.layer.loading(false);
                                     clearInterval(timer);
-                                    learun.layer.toast(inforesult);
+                                    //learun.layer.toast(inforesult);
+                                    learun.layer.toast(dataresult.msg);
                                     learun.nav.closeCurrent();
                                     var prepage = learun.nav.getpage('EducationalAdministration/OpenLessonPlanOfElectiveStudent');
                                     prepage.grid.reload();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/OpenLessonPlanOfElectiveStudentPre.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var weekChina = ["一", "二", "三", "四", "五", "六", "日"];
     var begin = '';
     var end = '';
@@ -13,6 +13,7 @@
                 lclass: page.lclass,
                 rows: 10,                            // 每页行数 
                 getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调 
+					console.log(param)
                     param.multipleData = multipleData;
                     page.loadData(param, callback, $page);
                 },
@@ -48,6 +49,7 @@
                 _postParam.queryJson = JSON.stringify({ StuNo: JSON.parse(localStorage.userinfo).baseinfo.account, StuMajorNo: JSON.parse(localStorage.userinfo).baseinfo.majorno, StuGrade: JSON.parse(localStorage.userinfo).baseinfo.grade });
             }
             learun.httpget(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/pagelist', _postParam, (data) => {
+				console.log(data)
                 $page.find('.lr-badge').text('0');
                 if (data) {
                     $page.find('.lr-badge').text(data.records);
@@ -116,9 +118,15 @@
                     _postData.keyValue = item.Id;
                     _postData.StuNo = JSON.parse(localStorage.userinfo).baseinfo.account;
                     learun.layer.loading(true, '正在取消报名...');
+                    console.log(123);
                     learun.httppost(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/CancelPre', _postData, (data, info) => {
+						console.log(data)
+						console.log(info)
                         if (data) {// 成功 
-                            learun.layer.toast(info);
+						console.log(1111111111)
+						console.log(data)
+						console.log(info)
+                            //learun.layer.toast(info);
                             page.grid.reload();
                         }
                         learun.layer.loading(false);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/OpenLessonPlanOfElectiveStudentPre/form/form.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var keyValue = '';
     var weekChina = ["一", "二", "三", "四", "五", "六", "日"];
     var $header = null;
@@ -26,7 +26,8 @@
                 learun.httppost(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/SignInPre', _postData, (data,info) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功
-                        learun.layer.toast(info);
+                        //learun.layer.toast(info);
+                        learun.layer.toast(data.msg);
                         learun.nav.closeCurrent();
                         var prepage = learun.nav.getpage('EducationalAdministration/OpenLessonPlanOfElectiveStudentPre');
                         prepage.grid.reload();
@@ -35,10 +36,12 @@
             });
             page.bind($page, param);
             if (keyValue) {
+			console.log(keyValue)
                 $page.find('.lr-form-container').setFormRead();
                 // 获取表单数据 
                 learun.layer.loading(true, '获取表单数据');
                 learun.httpget(config.webapi + 'learun/EducationalAdministration/OpenLessonPlanOfElectiveStudent/form', keyValue, (data) => {
+					console.log(data)
                     if (data) {
                         for (var id in data) {
                             if (data[id].length) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterBuilding/R_EnterBuilding.js

@@ -1,104 +1,99 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-04-21 09:23
  * 描  述：扫码入教学楼统计
  */
-(function () {
-    var page = {
-        grid: null,
-        init: function ($page) {
-
-
-
-
-            var ua = navigator.userAgent.toLowerCase();
-            if (/(html5plus)/i.test(ua)) {
-                //if (false) {
-                $('.bcidBox').css('display', 'block');
-                var scan = new plus.barcode.Barcode('bcid');
-                scan.onmarked = function onmarked(type, result) {
-                    scan.close();
-                    $('.bcidBox').css('display', 'none');
-
-                    var loginInfo = learun.storage.get('userinfo');
-                    var buildEntity = {};
-                    buildEntity.SId = loginInfo.baseinfo.account;
-
-                    buildEntity.BId = result;//'1d13cb80-d66a-4c55-a633-f88dc0b80df7';
-
-                    var param = {};
-                    param.keyValue = '';
-                    param.strEntity = JSON.stringify(buildEntity);
-
-
-                    learun.layer.loading(true, '正在提交数据');
-                    learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => {
-                        learun.layer.loading(false);
-                        if (data) {// 表单数据保存成功
-                            learun.layer.toast("扫描成功");
-                            learun.nav.closeCurrent();
-                            //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding');
-                            //prepage.grid.reload();
-                        }
-                    });
-                };
-                scan.start();
-            } else if (/micromessenger/.test(ua)) {
-                $.ajax({
-                    url: config.webapi + "weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href),
-                    type: "get",
-                    success: function (res) {
-                        wx.config({
-                            debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
-                            appId: res.data.appid, // 必填，公众号的唯一标识
-                            timestamp: res.data.timestamp, // 必填，生成签名的时间戳
-                            nonceStr: res.data.noncestr, // 必填，生成签名的随机串
-                            signature: res.data.certificate, // 必填，签名
-                            jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表
-                        });
-
-                        wx.ready(function () {
-                            wx.scanQRCode({
-                                needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-                                scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-                                success: function (res) {
-                                    learun.layer.toast(res);
-                                    //res.resultStr
-                                    var loginInfo = learun.storage.get('userinfo');
-                                    var buildEntity = {};
-                                    buildEntity.SId = loginInfo.baseinfo.account;
-
-                                    buildEntity.BId = res.resultStr;//'1d13cb80-d66a-4c55-a633-f88dc0b80df7';
-
-                                    var param = {};
-                                    param.keyValue = '';
-                                    param.strEntity = JSON.stringify(buildEntity);
-
-
-                                    learun.layer.loading(true, '正在提交数据');
-                                    learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => {
-                                        learun.layer.loading(false);
-                                        if (data) {// 表单数据保存成功
-                                            learun.layer.toast("扫描成功");
-                                            learun.nav.closeCurrent();
-                                            //var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding');
-                                            //prepage.grid.reload();
-                                        }
-                                    });
-                                }
-                            });
-                        })
-
-
-                    }
-                });
-
-
-            } else {
-                learun.layer.warning('请下载app或者到微信浏览器打开网页');
-            }
-        }
-    };
-    return page;
+(function() {
+	var page = {
+		grid: null,
+		init: function($page) {
+			var ua = navigator.userAgent.toLowerCase();
+			if (/(html5plus)/i.test(ua)) {
+				//if (false) {
+				$('.bcidBox').css('display', 'block');
+				var scan = new plus.barcode.Barcode('bcid');
+				scan.onmarked = function onmarked(type, result) {
+					scan.close();
+					$('.bcidBox').css('display', 'none');
+
+					var loginInfo = learun.storage.get('userinfo');
+					var buildEntity = {};
+					buildEntity.SId = loginInfo.baseinfo.account;
+
+					buildEntity.BId = result; //'1d13cb80-d66a-4c55-a633-f88dc0b80df7';
+
+					var param = {};
+					param.keyValue = '';
+					param.strEntity = JSON.stringify(buildEntity);
+
+
+					learun.layer.loading(true, '正在提交数据');
+					learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (data) => {
+						learun.layer.loading(false);
+						if (data) { // 表单数据保存成功
+							learun.layer.toast("扫描成功");
+							learun.nav.closeCurrent();
+							//var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding');
+							//prepage.grid.reload();
+						}
+					});
+				};
+				scan.start();
+			} else if (/micromessenger/.test(ua)) {
+				$.ajax({
+					url: config.webapi + "weixinapi/getweixinwebaccess_token?url=" + encodeURIComponent(window.location.href),
+					type: "get",
+					success: function(res) {
+						wx.config({
+							debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+							appId: res.data.appid, // 必填，公众号的唯一标识
+							timestamp: res.data.timestamp, // 必填，生成签名的时间戳
+							nonceStr: res.data.noncestr, // 必填，生成签名的随机串
+							signature: res.data.certificate, // 必填，签名
+							jsApiList: ["scanQRCode"] // 必填，需要使用的JS接口列表
+						});
+
+						wx.ready(function() {
+							wx.scanQRCode({
+								needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+								scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+								success: function(res) {
+									learun.layer.toast(res);
+									//res.resultStr
+									var loginInfo = learun.storage.get('userinfo');
+									var buildEntity = {};
+									buildEntity.SId = loginInfo.baseinfo.account;
+
+									buildEntity.BId = res.resultStr; //'1d13cb80-d66a-4c55-a633-f88dc0b80df7';
+
+									var param = {};
+									param.keyValue = '';
+									param.strEntity = JSON.stringify(buildEntity);
+
+
+									learun.layer.loading(true, '正在提交数据');
+									learun.httppost(config.webapi + 'learun/EducationalAdministration/R_EnterBuilding/save', param, (
+										data) => {
+										learun.layer.loading(false);
+										if (data) { // 表单数据保存成功
+											learun.layer.toast("扫描成功");
+											learun.nav.closeCurrent();
+											//var prepage = learun.nav.getpage('EducationalAdministration/R_EnterBuilding');
+											//prepage.grid.reload();
+										}
+									});
+								}
+							});
+						})
+					}
+				});
+
+
+			} else {
+				learun.layer.warning('请下载app或者到微信浏览器打开网页');
+			}
+		}
+	};
+	return page;
 })();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/R_EnterSchool/R_EnterSchool.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
  * Copyright (c) 2013-2018 北京泉江科技有限公司
  * 创建人：超级管理员
  * 日  期：2020-04-21 09:27

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2019-12-26 14:43
@@ -71,6 +71,8 @@
             if (param.begin && param.end) {
                 _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end });
             }
+			console.log(param.multipleData)
+			// return
             learun.httpget(config.webapi + 'StuInfoFresh/pageList', _postParam, (data) => {
                 $page.find('.lr-badge').text('0');
                 if (data) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2019-12-26 14:43
@@ -91,6 +91,8 @@
                 var _postData = {}
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify(data);
+				console.log(_postData)
+				// return
                 learun.layer.loading(true, '正在提交数据');
                 learun.httppost(config.webapi + 'StuInfoFresh/save', _postData, (data) => {
                     learun.layer.loading(false);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalSerious/AbNormalSerious.css

@@ -1,149 +1,149 @@
-#sQrCode {
-    height: 100%;
-    background-color: #EEF2F3;
-    padding-bottom: 30px;
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
 }
 
 .sQrLogo {
-    background-image: url(images/xcBg.jpg);
-    background-size: 100% 100%;
-    text-align: center;
-    line-height: 0;
-    padding: 20px 0 70px;
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
 }
 
 .sQrLogoImg1 img {
-    width: 20%;
+	width: 20%;
 }
 
 .sQrLogoImg1 {
-    margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .sQrLogoImg2 img {
-    width: 50%;
+	width: 50%;
 }
 
 .sQrBox {
-    margin: -50px 20px 0;
-    background-color: #fff;
-    padding: 30px 38px;
-    border-radius: 10px;
-    -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    /* overflow: hidden; */
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 38px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	/* overflow: hidden; */
 }
 
 .sQrT2 {
-    font-weight: bold;
-    text-align: center;
-    font-size: 24px;
-    margin-bottom: 20px;
-    color: #CC0000;
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #CC0000;
 }
 
 .sQrList {
-    background-color: #F8F8F8;
-    margin: 0 10px;
-    padding: 10px 30px;
-    border-radius: 4px
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
 }
 
-    .sQrList div {
-        padding: 7px 10px;
-        font-size: 14px;
-        color: #000;
-        border-top: 1px solid #D7D7D7;
-    }
+.sQrList div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
 
-        .sQrList div:first-child {
-            border: 0;
-        }
+.sQrList div:first-child {
+	border: 0;
+}
 
-        .sQrList div span {
-            color: #AEAEAE;
-            margin-right: 10px;
-        }
+.sQrList div span {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
 
 .sQrType3 {
-    background-color: #CC0000;
-    padding: 20px 0;
-    text-align: center;
-    color: #fff;
-    margin: 30px -38px -30px;
-    border-radius: 0 0 10px 10px;
+	background-color: #CC0000;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
 }
 
-    .sQrType3 > * {
-        display: inline-block;
-        vertical-align: middle;
-        text-align: left;
-    }
+.sQrType3>* {
+	display: inline-block;
+	vertical-align: middle;
+	text-align: left;
+}
 
 .sQrTypeT {
-    font-size: 14px;
+	font-size: 14px;
 }
 
 .sQrTypeTxt {
-    font-size: 24px;
-    font-weight: bold;
-    margin-top: 3px;
+	font-size: 24px;
+	font-weight: bold;
+	margin-top: 3px;
 }
 
 .sQrTypeImg {
-    margin-left: 15px;
-    width: 43px;
-    line-height: 0;
+	margin-left: 15px;
+	width: 43px;
+	line-height: 0;
 }
 
-    .sQrTypeImg img {
-        width: 100%;
-    }
+.sQrTypeImg img {
+	width: 100%;
+}
 
 .sQrTxt1 {
-    margin: 30px 50px 20px;
-    font-size: 14px;
-    color: #AEAEAE;
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
 }
 
 .sQrBtn2 {
-    margin: 20px 20px 0;
-    background-color: #CED0D0;
-    /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	margin: 20px 20px 0;
+	background-color: #CED0D0;
+	/* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
 	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
 	box-shadow: 0 0 10px rgba(0, 0, 0, .1); */
-    border-radius: 8px;
-    height: 50px;
-    line-height: 50px;
-    font-weight: bold;
-    color: #fff;
-    font-size: 16px;
-    text-align: center;
-}
-
-    .sQrBtn2 img {
-        width: 23px;
-        margin-right: 10px;
-        position: relative;
-        top: 2px;
-    }
+	border-radius: 8px;
+	height: 50px;
+	line-height: 50px;
+	font-weight: bold;
+	color: #fff;
+	font-size: 16px;
+	text-align: center;
+}
+
+.sQrBtn2 img {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
 
 .sQrType3 .sQrTypePhoto {
-    border: 4px solid #CC0000;
-    border-radius: 4px;
-    width: 85px;
-    margin: -30px 10px -30px 0;
-    background: #fff;
+	border: 4px solid #CC0000;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
 }
 
 .sQrTypePhoto div {
-    height: 0;
-    overflow: hidden;
-    padding-bottom: 139.516129%;
-    line-height: 0;
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
 }
 
 .sQrTypePhoto img {
-    width: 100%;
+	width: 100%;
 }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.css

@@ -1,149 +1,149 @@
-#sQrCode {
-    height: 100%;
-    background-color: #EEF2F3;
-    padding-bottom: 30px;
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
 }
 
 .sQrLogo {
-    background-image: url(images/xcBg.jpg);
-    background-size: 100% 100%;
-    text-align: center;
-    line-height: 0;
-    padding: 20px 0 70px;
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
 }
 
 .sQrLogoImg1 img {
-    width: 20%;
+	width: 20%;
 }
 
 .sQrLogoImg1 {
-    margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .sQrLogoImg2 img {
-    width: 50%;
+	width: 50%;
 }
 
 .sQrBox {
-    margin: -50px 20px 0;
-    background-color: #fff;
-    padding: 30px 38px;
-    border-radius: 10px;
-    -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    /* overflow: hidden; */
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 38px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	/* overflow: hidden; */
 }
 
 .sQrT2 {
-    font-weight: bold;
-    text-align: center;
-    font-size: 24px;
-    margin-bottom: 20px;
-    color: #F8B500;
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #F8B500;
 }
 
 .sQrList {
-    background-color: #F8F8F8;
-    margin: 0 10px;
-    padding: 10px 30px;
-    border-radius: 4px
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
 }
 
-    .sQrList div {
-        padding: 7px 10px;
-        font-size: 14px;
-        color: #000;
-        border-top: 1px solid #D7D7D7;
-    }
+.sQrList div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
 
-        .sQrList div:first-child {
-            border: 0;
-        }
+.sQrList div:first-child {
+	border: 0;
+}
 
-        .sQrList div span {
-            color: #AEAEAE;
-            margin-right: 10px;
-        }
+.sQrList div span {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
 
 .sQrType2 {
-    background-color: #F8B500;
-    padding: 20px 0;
-    text-align: center;
-    color: #fff;
-    margin: 30px -38px -30px;
-    border-radius: 0 0 10px 10px;
+	background-color: #F8B500;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
 }
 
-    .sQrType2 > * {
-        display: inline-block;
-        vertical-align: middle;
-        text-align: left;
-    }
+.sQrType2>* {
+	display: inline-block;
+	vertical-align: middle;
+	text-align: left;
+}
 
 .sQrTypeT {
-    font-size: 14px;
+	font-size: 14px;
 }
 
 .sQrTypeTxt {
-    font-size: 24px;
-    font-weight: bold;
-    margin-top: 3px;
+	font-size: 24px;
+	font-weight: bold;
+	margin-top: 3px;
 }
 
 .sQrTypeImg {
-    margin-left: 15px;
-    width: 43px;
-    line-height: 0;
+	margin-left: 15px;
+	width: 43px;
+	line-height: 0;
 }
 
-    .sQrTypeImg img {
-        width: 100%;
-    }
+.sQrTypeImg img {
+	width: 100%;
+}
 
 .sQrTxt1 {
-    margin: 30px 50px 20px;
-    font-size: 14px;
-    color: #AEAEAE;
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
 }
 
 .sQrBtn3 {
-    margin: 20px 20px 0;
-    background-color: #CED0D0;
-    /* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	margin: 20px 20px 0;
+	background-color: #CED0D0;
+	/* -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
 	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
 	box-shadow: 0 0 10px rgba(0, 0, 0, .1); */
-    border-radius: 8px;
-    height: 50px;
-    line-height: 50px;
-    font-weight: bold;
-    color: #fff;
-    font-size: 16px;
-    text-align: center;
-}
-
-    .sQrBtn3 img {
-        width: 23px;
-        margin-right: 10px;
-        position: relative;
-        top: 2px;
-    }
+	border-radius: 8px;
+	height: 50px;
+	line-height: 50px;
+	font-weight: bold;
+	color: #fff;
+	font-size: 16px;
+	text-align: center;
+}
+
+.sQrBtn3 img {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
 
 .sQrType2 .sQrTypePhoto {
-    border: 4px solid #F8B500;
-    border-radius: 4px;
-    width: 85px;
-    margin: -30px 10px -30px 0;
-    background: #fff;
+	border: 4px solid #F8B500;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
 }
 
 .sQrTypePhoto div {
-    height: 0;
-    overflow: hidden;
-    padding-bottom: 139.516129%;
-    line-height: 0;
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
 }
 
 .sQrTypePhoto img {
-    width: 100%;
+	width: 100%;
 }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/AbNormalWeak/AbNormalWeak.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var $header = null;
     var stuNo = '';
     var page = {
@@ -7,7 +7,7 @@
             stuNo = param.stuNo;
             // 添加头部按钮列表 
             $header = $page.parents('.f-page').find('.f-page-header');
-            learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail',stuNo, function (data) {
                 console.log(data);
                 $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
                 $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
@@ -19,7 +19,6 @@
                     $('.sQrTypePhoto img').attr('src', config.web + data.stuInfo.Photo);
                 } else {
                     if (data.stuInfo.GenderNo) {
-
                         $('.sQrTypePhoto img').attr('src', '/images/on-boy.jpg');
                     } else {
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/Normal/Normal.css

@@ -1,149 +1,149 @@
-#sQrCode {
-    height: 100%;
-    background-color: #EEF2F3;
-    padding-bottom: 30px;
+#sQrCode {
+	height: 100%;
+	background-color: #EEF2F3;
+	padding-bottom: 30px;
 }
 
 .sQrLogo {
-    background-image: url(images/xcBg.jpg);
-    background-size: 100% 100%;
-    text-align: center;
-    line-height: 0;
-    padding: 20px 0 70px;
+	background-image: url(images/xcBg.jpg);
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
 }
 
 .sQrLogoImg1 img {
-    width: 20%;
+	width: 20%;
 }
 
 .sQrLogoImg1 {
-    margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .sQrLogoImg2 img {
-    width: 50%;
+	width: 50%;
 }
 
 .sQrBox {
-    margin: -50px 20px 0;
-    background-color: #fff;
-    padding: 30px 38px;
-    border-radius: 10px;
-    -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
-    /* overflow: hidden; */
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 38px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+	/* overflow: hidden; */
 }
 
 .sQrT2 {
-    font-weight: bold;
-    text-align: center;
-    font-size: 24px;
-    margin-bottom: 20px;
-    color: #21A737;
+	font-weight: bold;
+	text-align: center;
+	font-size: 24px;
+	margin-bottom: 20px;
+	color: #21A737;
 }
 
 .sQrList {
-    background-color: #F8F8F8;
-    margin: 0 10px;
-    padding: 10px 30px;
-    border-radius: 4px
+	background-color: #F8F8F8;
+	margin: 0 10px;
+	padding: 10px 30px;
+	border-radius: 4px
 }
 
-    .sQrList div {
-        padding: 7px 10px;
-        font-size: 14px;
-        color: #000;
-        border-top: 1px solid #D7D7D7;
-    }
+.sQrList div {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #D7D7D7;
+}
 
-        .sQrList div:first-child {
-            border: 0;
-        }
+.sQrList div:first-child {
+	border: 0;
+}
 
-        .sQrList div span {
-            color: #AEAEAE;
-            margin-right: 10px;
-        }
+.sQrList div span {
+	color: #AEAEAE;
+	margin-right: 10px;
+}
 
 .sQrType1 {
-    background-color: #21A737;
-    padding: 20px 0;
-    text-align: center;
-    color: #fff;
-    margin: 30px -38px -30px;
-    border-radius: 0 0 10px 10px;
+	background-color: #21A737;
+	padding: 20px 0;
+	text-align: center;
+	color: #fff;
+	margin: 30px -38px -30px;
+	border-radius: 0 0 10px 10px;
 }
 
-    .sQrType1 > * {
-        display: inline-block;
-        vertical-align: middle;
-        text-align: left;
-    }
+.sQrType1>* {
+	display: inline-block;
+	vertical-align: middle;
+	text-align: left;
+}
 
 .sQrTypeT {
-    font-size: 14px;
+	font-size: 14px;
 }
 
 .sQrTypeTxt {
-    font-size: 24px;
-    font-weight: bold;
-    margin-top: 3px;
+	font-size: 24px;
+	font-weight: bold;
+	margin-top: 3px;
 }
 
 .sQrTypeImg {
-    margin-left: 15px;
-    width: 43px;
-    line-height: 0;
+	margin-left: 15px;
+	width: 43px;
+	line-height: 0;
 }
 
-    .sQrTypeImg img {
-        width: 100%;
-    }
+.sQrTypeImg img {
+	width: 100%;
+}
 
 .sQrTxt1 {
-    margin: 30px 50px 20px;
-    font-size: 14px;
-    color: #AEAEAE;
+	margin: 30px 50px 20px;
+	font-size: 14px;
+	color: #AEAEAE;
 }
 
 .sQrBtn1 {
-    margin: 20px 20px 0;
-    background-color: #fff;
-    -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
-    -moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
-    box-shadow: 0 0 10px rgba(0, 0, 0, .1);
-    border-radius: 8px;
-    height: 50px;
-    line-height: 50px;
-    font-weight: bold;
-    color: #339933;
-    font-size: 16px;
-    text-align: center;
-}
-
-    .sQrBtn1 img {
-        width: 23px;
-        margin-right: 10px;
-        position: relative;
-        top: 2px;
-    }
+	margin: 20px 20px 0;
+	background-color: #fff;
+	-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	-moz-box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+	border-radius: 8px;
+	height: 50px;
+	line-height: 50px;
+	font-weight: bold;
+	color: #339933;
+	font-size: 16px;
+	text-align: center;
+}
+
+.sQrBtn1 img {
+	width: 23px;
+	margin-right: 10px;
+	position: relative;
+	top: 2px;
+}
 
 .sQrType1 .sQrTypePhoto {
-    border: 4px solid #21A737;
-    border-radius: 4px;
-    width: 85px;
-    margin: -30px 10px -30px 0;
-    background: #fff;
+	border: 4px solid #21A737;
+	border-radius: 4px;
+	width: 85px;
+	margin: -30px 10px -30px 0;
+	background: #fff;
 }
 
 .sQrTypePhoto div {
-    height: 0;
-    overflow: hidden;
-    padding-bottom: 139.516129%;
-    line-height: 0;
+	height: 0;
+	overflow: hidden;
+	padding-bottom: 139.516129%;
+	line-height: 0;
 }
 
 .sQrTypePhoto img {
-    width: 100%;
+	width: 100%;
 }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.html

@@ -1,11 +1,6 @@
-<div class="lr-form-container" id="sQrCode">
+<div class="lr-form-container" id="sQrCode">
     <div class="sQrCode">
         <div class="sQrLogo">
-            <!-- <div class="sTabBox">
-                <div id="aa">正常</div>
-                <div id="bb">异常微弱</div>
-                <div id="cc">异常严重</div>
-            </div> -->
             <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
             <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
         </div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StudentQRCode/StudentQRCode.js

@@ -1,4 +1,4 @@
-(function () {
+(function () {
     var keyValue = '';
     var $header = null;
     var page = {
@@ -22,18 +22,18 @@
             var logininfo = learun.storage.get('userinfo');
             
             //learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail',logininfo.baseinfo.account, function (data) {
-            ////learun.httpget(config.webapi + 'learun/EducationalAdministration/StuInfoBasic/stuinfoDetail','2018010108', function (data) {
-            //    console.log(data);
-            //    $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
-            //    $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
-            //    $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
-            //    $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
-            //    $('.sQrList div strong').eq(4).html(data.roomInfo);
-            //    //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuInfoBasic/stuinfoDetail','2018010108', function (data) {
+               console.log(data);
+               $('.sQrList div strong').eq(0).html(data.stuInfo.StuName);
+               $('.sQrList div strong').eq(1).html(data.majorInfo.MajorName);
+               $('.sQrList div strong').eq(2).html(data.classInfo.ClassName);
+               $('.sQrList div strong').eq(3).html(data.stuInfo.StuNo);
+               $('.sQrList div strong').eq(4).html(data.roomInfo);
+               //$('.sQrList div strong').eq(4).html(data.stuInfo.Photo); //学生照片
 				
-            //    learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
-            //})
-            learun.code.encode({ id: 'lr_mycode_qrcode', text: '2019010211' });
+               learun.code.encode({ id: 'lr_mycode_qrcode', text: data.stuInfo.StuNo });
+            })
+            //learun.code.encode({ id: 'lr_mycode_qrcode', text: '2019010211' });
 
         },
         bind: function ($page, param) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/Thermography.html

@@ -1,7 +1,7 @@
-<div class="lr-page lr-EducationalAdministrationThermography-page">
+<div class="lr-page lr-EducationalAdministrationThermography-page">
     <div class="lr-page-tool">
         <div class="lr-tool-left">
-            总共<span class="lr-badge lr-badge-primary">0</span>条
+            总共1<span class="lr-badge lr-badge-primary">0</span>条
         </div>
         <div class="lr-tool-right">
             <div class="lr-tool-right-btn lr_multiple_search">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.css

@@ -1,76 +1,75 @@
 * {
-    box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 ul {
-    margin: 0px;
-    padding: 0px;
-    list-style: none;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
 }
 
 li {
-    list-style: none;
+	list-style: none;
 }
 
 #semester2 {
-    margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 #weekTime2 span {
-    margin: 0 10px;
+	margin: 0 10px;
 }
 
-#weekTime2 i {
-}
+#weekTime2 i {}
 
 
 .timeTable_sec2 {
-    margin-bottom: 30px;
-    background-color: #fff;
+	margin-bottom: 30px;
+	background-color: #fff;
 }
 
 .noHtml {
-    height: 100%;
-    line-height: 60px;
-    text-align: center;
-    font-size: 14px;
+	height: 100%;
+	line-height: 60px;
+	text-align: center;
+	font-size: 14px;
 }
 
 .timeTable_sec3 {
-    padding: 0px 12px 1px;
-    text-align: center;
-    background: #0C86D8;
-    height: 35px;
+	padding: 0px 12px 1px;
+	text-align: center;
+	background: #0C86D8;
+	height: 35px;
 }
 
 .tSec3Time {
-    text-align: center;
-    line-height: 24px;
-    font-size: 14px;
-    color: #fff;
-}
-
-    .tSec3Time span {
-        display: inline-block;
-        background-color: #B8E2FF;
-        width: 6px;
-        height: 6px;
-        border-radius: 50%;
-        vertical-align: middle;
-        position: relative;
-        top: -2px;
-        margin: 0 10px;
-    }
+	text-align: center;
+	line-height: 24px;
+	font-size: 14px;
+	color: #fff;
+}
+
+.tSec3Time span {
+	display: inline-block;
+	background-color: #B8E2FF;
+	width: 6px;
+	height: 6px;
+	border-radius: 50%;
+	vertical-align: middle;
+	position: relative;
+	top: -2px;
+	margin: 0 10px;
+}
 
 .timeTable_sec4 {
-    padding: 0 12px;
-    /* margin-top: -65px; */
-    margin-bottom: 10px;
-    background: #0075C4;
+	padding: 0 12px;
+	/* margin-top: -65px; */
+	margin-bottom: 10px;
+	background: #0075C4;
 }
 
 .tSec4Box {
-    /* background: #fff;
+	/* background: #fff;
 	padding: 20px 0;
 	text-align: center;
 	font-size: 0;
@@ -78,12 +77,12 @@ li {
 }
 
 .tSec4T {
-    /* text-align: center; */
-    margin-bottom: 10px;
-    overflow: hidden;
-    font-size: 16px;
-    color: #fff;
-    padding-top: 10px;
+	/* text-align: center; */
+	margin-bottom: 10px;
+	overflow: hidden;
+	font-size: 16px;
+	color: #fff;
+	padding-top: 10px;
 }
 
 /* .tSec4T div:first-child {
@@ -96,60 +95,60 @@ li {
 
 
 .tSec4Con {
-    padding-bottom: 10px;
+	padding-bottom: 10px;
 }
 
-    .tSec4Con > * {
-        /* display: inline-block;
+.tSec4Con>* {
+	/* display: inline-block;
 	vertical-align: middle; */
-    }
-
-    .tSec4Con .studSeeSec2Line {
-        height: 25px;
-        width: 1px;
-        background: #D6DFE2;
-        margin: 0 40px;
-    }
-
-    .tSec4Con .studSeeSec2Txt {
-        color: #4FB1F3;
-        font-size: 14px;
-    }
-
-        .tSec4Con .studSeeSec2Txt i {
-            margin-right: 5px;
-        }
-
-        .tSec4Con .studSeeSec2Txt div {
-            float: right;
-            font-size: 20px;
-            margin-top: -2px;
-        }
-
-            .tSec4Con .studSeeSec2Txt div span {
-                display: inline-block;
-                line-height: 20px;
-                font-size: 12px;
-                padding: 0 10px;
-                position: relative;
-                background: #4FB1F3;
-                color: #0075C4;
-                border-radius: 2px;
-                top: -3px;
-                margin-right: 5px;
-            }
-
-                .tSec4Con .studSeeSec2Txt div span:after {
-                    content: '';
-                    position: absolute;
-                    border: 3px solid #4FB1F3;
-                    border-right-color: transparent;
-                    border-top-color: transparent;
-                    border-bottom-color: transparent;
-                    right: -6px;
-                    top: 50%;
-                    margin-top: -3px;
-                }
+}
+
+.tSec4Con .studSeeSec2Line {
+	height: 25px;
+	width: 1px;
+	background: #D6DFE2;
+	margin: 0 40px;
+}
+
+.tSec4Con .studSeeSec2Txt {
+	color: #4FB1F3;
+	font-size: 14px;
+}
+
+.tSec4Con .studSeeSec2Txt i {
+	margin-right: 5px;
+}
+
+.tSec4Con .studSeeSec2Txt div {
+	float: right;
+	font-size: 20px;
+	margin-top: -2px;
+}
+
+.tSec4Con .studSeeSec2Txt div span {
+	display: inline-block;
+	line-height: 20px;
+	font-size: 12px;
+	padding: 0 10px;
+	position: relative;
+	background: #4FB1F3;
+	color: #0075C4;
+	border-radius: 2px;
+	top: -3px;
+	margin-right: 5px;
+}
+
+.tSec4Con .studSeeSec2Txt div span:after {
+	content: '';
+	position: absolute;
+	border: 3px solid #4FB1F3;
+	border-right-color: transparent;
+	border-top-color: transparent;
+	border-bottom-color: transparent;
+	right: -6px;
+	top: 50%;
+	margin-top: -3px;
+}
 
 /* .tSec4Con .studSeeSec2Txt div:first-child span {
 	font-size: 20px;
@@ -162,39 +161,39 @@ li {
 } */
 
 .timeTableList {
-    overflow: hidden;
-    padding: 3px 7px 18px;
-}
-
-    .timeTableList li {
-        width: 33.333333%;
-        float: left;
-        font-size: 14px;
-        line-height: 16px;
-        margin-top: 14px;
-        padding: 0 7px;
-    }
-
-    .timeTableList div {
-        border: 1px solid #DAEFFD;
-        padding: 13px 0;
-        text-align: center;
-        overflow: hidden;
-    }
-
-    .timeTableList span {
-        color: #fff;
-        font-size: 12px;
-        border: 1px solid #cacaca;
-        border-radius: 50%;
-        height: 14px;
-        width: 14px;
-        line-height: 12px;
-        /* margin-right: 5px; */
-        position: relative;
-        top: -1px;
-        margin-left: 6px;
-    }
+	overflow: hidden;
+	padding: 3px 7px 18px;
+}
+
+.timeTableList li {
+	width: 33.333333%;
+	float: left;
+	font-size: 14px;
+	line-height: 16px;
+	margin-top: 14px;
+	padding: 0 7px;
+}
+
+.timeTableList div {
+	border: 1px solid #DAEFFD;
+	padding: 13px 0;
+	text-align: center;
+	overflow: hidden;
+}
+
+.timeTableList span {
+	color: #fff;
+	font-size: 12px;
+	border: 1px solid #cacaca;
+	border-radius: 50%;
+	height: 14px;
+	width: 14px;
+	line-height: 12px;
+	/* margin-right: 5px; */
+	position: relative;
+	top: -1px;
+	margin-left: 6px;
+}
 
 /* .timeTableList li.active span {
 	color: #9D9E9E !important;
@@ -202,176 +201,177 @@ li {
 	border-color: #cacaca !important;
 } */
 
-.timeTableBtn,.submitBtn {
-    font-size: 16px;
-    margin: 20px 12px;
-    background: #0C86D8;
-    border-radius: 4px;
-    text-align: center;
-    line-height: 40px;
-    height: 40px;
-    color: #fff;
-    cursor:pointer;
+.timeTableBtn,
+.submitBtn {
+	font-size: 16px;
+	margin: 20px 12px;
+	background: #0C86D8;
+	border-radius: 4px;
+	text-align: center;
+	line-height: 40px;
+	height: 40px;
+	color: #fff;
+	cursor: pointer;
 }
 
 .statusType {
-    padding: 10px 12px;
-    background: #fff;
-    overflow: hidden;
-    margin-bottom: 10px;
-}
-
-    .statusType li {
-        width: 16.666667%;
-        float: left;
-        /* text-align: center; */
-        font-size: 14px;
-        line-height: 16px;
-    }
-
-    .statusType span {
-        display: inline-block;
-        color: #fff;
-        line-height: 14px;
-        font-size: 12px;
-        border: 1px solid #cacaca;
-        border-radius: 50%;
-        height: 9px;
-        width: 9px;
-        line-height: 12px;
-        margin-right: 5px;
-        position: relative;
-        top: 0px;
-    }
+	padding: 10px 12px;
+	background: #fff;
+	overflow: hidden;
+	margin-bottom: 10px;
+}
+
+.statusType li {
+	width: 16.666667%;
+	float: left;
+	/* text-align: center; */
+	font-size: 14px;
+	line-height: 16px;
+}
+
+.statusType span {
+	display: inline-block;
+	color: #fff;
+	line-height: 14px;
+	font-size: 12px;
+	border: 1px solid #cacaca;
+	border-radius: 50%;
+	height: 9px;
+	width: 9px;
+	line-height: 12px;
+	margin-right: 5px;
+	position: relative;
+	top: 0px;
+}
 
 /*未检测*/
 .sStatue1 span {
-    background: #0089FE;
-    color: #0089FE;
-    border-color: #0089FE;
+	background: #0089FE;
+	color: #0089FE;
+	border-color: #0089FE;
 }
 
 /*正常*/
 .sStatue2 span {
-    background: #F2B60A;
-    color: #F2B60A;
-    border-color: #F2B60A;
+	background: #F2B60A;
+	color: #F2B60A;
+	border-color: #F2B60A;
 }
 
 /*异常*/
 .sStatue3 span {
-    background: #E24545;
-    color: #E24545;
-    border-color: #E24545;
+	background: #E24545;
+	color: #E24545;
+	border-color: #E24545;
 }
 
 /*病假*/
 .sStatue4 span {
-    background: #29CF41;
-    color: #29CF41;
-    border-color: #29CF41;
+	background: #29CF41;
+	color: #29CF41;
+	border-color: #29CF41;
 }
 
 /*迟到*/
 .sStatue5 span {
-    background: #ad5151;
-    color: #ad5151;
-    border-color: #ad5151;
+	background: #ad5151;
+	color: #ad5151;
+	border-color: #ad5151;
 }
 
 /*事假*/
 .sStatue6 span {
-    background: #84f193;
-    color: #84f193;
-    border-color: #84f193;
+	background: #84f193;
+	color: #84f193;
+	border-color: #84f193;
 }
 
 .timeTableAlertZ {
-    width: 100%;
-    height: 100%;
-    z-index: 99;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, .5);
-    display: none;
+	width: 100%;
+	height: 100%;
+	z-index: 99;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background-color: rgba(0, 0, 0, .5);
+	display: none;
 }
 
 .timeTableAlert {
-    z-index: -1;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 80%;
-    height: 70%;
-    background: #fff;
-    border-radius: 4px;
-    filter: alpha(opacity=0);
-    -moz-opacity: 0;
-    -khtml-opacity: 0;
-    opacity: 0;
-    transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -ms-transition: all 0.3s;
-    -o-transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    overflow: hidden;
-}
-
-    .timeTableAlert.active {
-        z-index: 999;
-        filter: alpha(opacity=100);
-        -moz-opacity: 1;
-        -khtml-opacity: 1;
-        opacity: 1;
-    }
+	z-index: -1;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	margin: auto;
+	width: 80%;
+	height: 70%;
+	background: #fff;
+	border-radius: 4px;
+	filter: alpha(opacity=0);
+	-moz-opacity: 0;
+	-khtml-opacity: 0;
+	opacity: 0;
+	transition: all 0.3s;
+	-moz-transition: all 0.3s;
+	-ms-transition: all 0.3s;
+	-o-transition: all 0.3s;
+	-webkit-transition: all 0.3s;
+	overflow: hidden;
+}
+
+.timeTableAlert.active {
+	z-index: 999;
+	filter: alpha(opacity=100);
+	-moz-opacity: 1;
+	-khtml-opacity: 1;
+	opacity: 1;
+}
 
 .timeTableAlertTop {
-    background-color: #0C86D8;
-    padding: 10px 12px;
+	background-color: #0C86D8;
+	padding: 10px 12px;
 }
 
 .timeTableAlertT {
-    color: #fff;
-    font-size: 16px;
+	color: #fff;
+	font-size: 16px;
 }
 
 .timeTableAlertTxt {
-    font-size: 14px;
-    color: #B8E2FF;
-    text-align: right;
-    margin-top: 5px;
+	font-size: 14px;
+	color: #B8E2FF;
+	text-align: right;
+	margin-top: 5px;
 }
 
 .timeTableAlertList {
-    overflow: auto;
-    max-height: calc(100% - 62px);
+	overflow: auto;
+	max-height: calc(100% - 62px);
 }
 
-    .timeTableAlertList li {
-        line-height: 40px;
-        text-align: center;
-        font-size: 14px;
-        color: #1A1A1A;
-    }
+.timeTableAlertList li {
+	line-height: 40px;
+	text-align: center;
+	font-size: 14px;
+	color: #1A1A1A;
+}
 
-        .timeTableAlertList li.active {
-            background-color: #D1ECFF !important;
-        }
+.timeTableAlertList li.active {
+	background-color: #D1ECFF !important;
+}
 
-        .timeTableAlertList li:nth-child(2n) {
-            background-color: #FBFDFF;
-        }
+.timeTableAlertList li:nth-child(2n) {
+	background-color: #FBFDFF;
+}
 
-        .timeTableAlertList li:nth-child(2n - 1) {
-            background-color: #FFFFFF;
-        }
+.timeTableAlertList li:nth-child(2n - 1) {
+	background-color: #FFFFFF;
+}
 
 #MeasureTime {
-    text-align: center;
+	text-align: center;
 }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Thermography/measure/measure.js

@@ -4,6 +4,7 @@
         isScroll: false,
         init: function ($page, param) {
             //console.log(param) 传过来的参数 在param上
+			//console.log(param)
             //测温时间段
             $page.find('#MeasureTime').lrpickerex({
                 code: 'MeasureTime',
@@ -52,41 +53,6 @@
                 $('.timeTableAlert').removeClass('active');
             }
 
-            //弹框确定按钮：单个学生提交测温
-            //$page.find(".timeTableBtn").on('tap',
-            //    function () {
-            //        // 获取表单数据
-            //        if (!$page.find('.lr-form-container').lrformValid()) {
-            //            return false;
-            //        }
-            //        var data = JSON.parse($(this).siblings('.timeTableAlertTop').attr('student'));
-            //        data.Status = $page.find('#Status').lrpickerGet();
-            //        data.Temperature = $page.find('#Temperature').val();
-            //        data.ProcessingResult = $page.find('#ProcessingResult').val();
-            //        data.Remark = $page.find('#Remark').val();
-            //        data.MeasureTime = $page.find('#MeasureTime').lrpickerGet();
-            //        learun.layer.confirm('是否确认提交测温？',
-            //            function (_index) {
-            //                if (_index === '1') {
-            //                    learun.layer.loading(true, '正在提交');
-            //                    learun.httppost(
-            //                        config.webapi + '/learun/adms/EducationalAdministration/Thermography/save',
-            //                        {
-            //                            keyValue: data.ID,
-            //                            strEntity: JSON.stringify(data)
-            //                        },
-            //                        (data) => {
-            //                            learun.layer.loading(false);
-            //                            if (data) {
-            //                                learun.layer.toast("提交成功");
-            //                                timeTableAlertFn();
-            //                                loadData($page, param);
-            //                            }
-            //                        });
-            //                }
-            //            });
-            //    });
-
             //弹框确定按钮：弹框数据绑定到学生列表上
             $page.find(".timeTableBtn").on('tap',
                 function () {
@@ -95,11 +61,13 @@
                         return false;
                     }
                     var data = JSON.parse($(this).siblings('.timeTableAlertTop').attr('student'));
+					
                     data.Status = $page.find('#Status').lrpickerGet();
                     data.Temperature = $page.find('#Temperature').val();
                     data.ProcessingResult = $page.find('#ProcessingResult').val();
                     data.Remark = $page.find('#Remark').val();
                     data.MeasureTime = $page.find('#MeasureTime').lrpickerGet();
+					
                     $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').attr('student', JSON.stringify(data));
                     var classTemp = !data.Status ? 'sStatue1' : data.Status == "0" ? 'sStatue1' : data.Status == "1" ? 'sStatue2' : 'sStatue3';
                     $page.find('.timeTableList').find('li[stuNo="' + data.PersonBeingMeasured + '"]').removeClass().addClass(classTemp);
@@ -139,6 +107,7 @@
     };
 
     function loadData($page, param) {
+		console.log($page.find('#MeasureTime').lrpickerGet())
         var _postParam = {
             queryJson: JSON.stringify({
                 MeasurerID: learun.storage.get('userinfo').baseinfo.account,

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -18,6 +18,7 @@
                 lclass: page.lclass,
                 rows: 10,                            // 每页行数
                 getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+					console.log(param)
                     param.multipleData = multipleData;
                     page.loadData(param, callback, $page);
                 },
@@ -37,6 +38,8 @@
             // 多条件查询
             var $multiple = $page.find('.lr_multiple_search').multiplequery({
                 callback: function (data) {
+					console.log(11)
+					console.log(data)
                     begin = '';
                     end = '';
                     multipleData = data || {};
@@ -63,14 +66,20 @@
                 queryJson: '{}'
             };
             var userInfo = learun.storage.get('userinfo');
+			//console.log(param)
+			var aaa='';
             if (param.multipleData) {
+				multipleData.Creater = userInfo.baseinfo.userId;
                 _postParam.queryJson = JSON.stringify(multipleData);
-            }
-            if (param.begin && param.end) {
-                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end });
-            }
+            }else{
+				_postParam.queryJson=JSON.stringify({Creater:userInfo.baseinfo.userId})
+			}
+            // if (param.begin && param.end) {
+            //     _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end,Creater:userInfo.baseinfo.userId });
+            // }
             _postParam.queryJson=JSON.stringify({Creater:userInfo.baseinfo.userId})
             learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/pagelist', _postParam, (data) => {
+				// console.log(data)
                 $page.find('.lr-badge').text('0');
                 if (data) {
                     $page.find('.lr-badge').text(data.records);
@@ -90,55 +99,13 @@
                 keyId:'f_userid',
                 text:'f_realname'
             }));
-            //_$item.append($('<p class="lr-ellipsis"><span>单位名称:</span></p>').dataFormatter({ value: _item.UnitName            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>返工人员:</span></p>').dataFormatter({ value: _item.BackUser            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>类别:</span></p>').dataFormatter({ value: _item.Type,
-            //    type: 'dataItem',
-            //    code: 'EUserType'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>所在部门:</span></p>').dataFormatter({ value: _item.Department            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>关系:</span></p>').dataFormatter({ value: _item.RelationShip,
-            //    type: 'dataItem',
-            //    code: 'ERelationship'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>性别:</span></p>').dataFormatter({
-            //    value: _item.Gender,
-            //    type: 'dataItem',
-            //    code: 'usersex'
-            //}));
-            _$item.append($('<p class="lr-ellipsis"><span>填报时间:</span></p>').dataFormatter({ value: _item.CreateTime,
+
+            _$item.append($('<p class="lr-ellipsis"><span>填报时间:</span></p>').dataFormatter({ 
+				value: _item.CreateTime,
                 type: 'datetime',
                 dateformat: 'yyyy-MM-dd'
             }));
-            //_$item.append($('<p class="lr-ellipsis"><span>身份证号:</span></p>').dataFormatter({ value: _item.IDCard            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>家庭住址:</span></p>').dataFormatter({ value: _item.HomeAddress            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>联系方式:</span></p>').dataFormatter({ value: _item.Mobile            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>前往省份:</span></p>').dataFormatter({ value: _item.Provice,
-            //    type: 'dataSource',
-            //    code: 'DIC_PROVINCE',
-            //    keyId: 'pcode',
-            //    text: 'pname'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>前往详细地址:</span></p>').dataFormatter({ value: _item.Objective            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>外出原因:</span></p>').dataFormatter({
-            //    value: _item.OutReason,
-            //    type: 'dataItem',
-            //    code: 'OutReason'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>外出时间:</span></p>').dataFormatter({ value: _item.OutTime,
-            //    type: 'datetime',
-            //    dateformat: 'yyyy-MM-dd'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>返回时间:</span></p>').dataFormatter({ value: _item.BackHomeTime,
-            //    type: 'datetime',
-            //    dateformat: 'yyyy-MM-dd'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>交通工具:</span></p>').dataFormatter({ value: _item.Vehicle,
-            //    type: 'dataItem',
-            //    code: 'Vehicle'
-            //}));
-            //_$item.append($('<p class="lr-ellipsis"><span>交通工具号码:</span></p>').dataFormatter({ value: _item.VehicleNum            }));
-            //_$item.append($('<p class="lr-ellipsis"><span>返回抵达目的地:</span></p>').dataFormatter({ value: _item.BackAddress            }));
+
             return '';
         },
         rowClick: function (item, $item, $page) {// 列表行点击触发方法

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>填报人员</label>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -12,6 +12,7 @@
         isScroll: true,
         init: function ($page, param) {
             keyValue = param.keyValue;
+			// console.log(param)
             // 添加头部按钮列表
             var _html = '\
                 <div class="lr-form-header-cancel" >取消</div>\
@@ -80,6 +81,7 @@
                 });
             });
             // 提交
+			
             $header.find('.lr-form-header-submit').on('tap', function () {
                 // 获取表单数据
                 if (!$page.find('.lr-form-container').lrformValid()) {
@@ -87,9 +89,10 @@
                 }
                 var _postData = {}
                 _postData.keyValue = keyValue;
-
                 var pageForm = $page.find('[data-table="EpidemicSituation"]').lrformGet();
                 var allArea = $page.find('#ProvinceArea').lrpickerGet();
+				console.log($page.find('#ProvinceArea'))
+				console.log(allArea)
                 if (allArea) {
                     var list = allArea.split(',');
 
@@ -97,7 +100,7 @@
                     pageForm.OutArea = list[1] || '';
                     pageForm.City = list[2] || '';
                 }
-
+				console.log(pageForm)
                 _postData.strEntity = JSON.stringify(pageForm);
                 if ($page.find('#HasFamily').lrpickerGet() == '1') {
 
@@ -146,6 +149,8 @@
 
                     _postData.strpeopleDetailsList = '[]';
                 }
+				console.log(_postData)
+				return
                 learun.layer.loading(true, '正在提交数据');
                 learun.httppost(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/save', _postData, (data) => {
                     learun.layer.loading(false);
@@ -174,6 +179,8 @@
                 $header.find('.lr-form-header-btnlist').show();
                 // 获取表单数据
                 learun.layer.loading(true, '获取表单数据');
+				// console.log(11)
+				// console.log(keyValue)
                 learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/form', keyValue, (data) => {
                     if (data) {
                         //省市区数据处理
@@ -194,8 +201,6 @@
                                 $page.find('[data-table="' + id + '"]').lrformSet(data[id]);
                             }
                         }
-
-
                     }
                     learun.layer.loading(false);
                 });
@@ -322,6 +327,7 @@
 
             //新建时获取登陆人信息
             var userInfo = learun.storage.get('userinfo');
+			//console.log(userInfo)
             if (!keyValue) {
 
 
@@ -340,6 +346,7 @@
                     learun.httpget(config.webapi + 'learun/PersonnelManagement/EpidemicSituationCopy/getStuSource',
                         userInfo.baseinfo.account,
                         (data) => {
+							console.log(data)
                             if (data) {
                                 $page.find('#HomeAddress').val(data.Address);
                                 $page.find('#StudentSource').val(data.res);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/attendance/attendance.js

@@ -630,7 +630,7 @@
     }
 
     function ajaxData(jqs) {
-        var html = '<div class="attendBoxT">2019年3月11日   星期三</div><div class="attendBoxTime">';
+        var html = '<div class="attendBoxT">'+ jqs.day +'</div><div class="attendBoxTime">';
         $.each(jqs.list, function (i, n) {
             var times = '', timeTxt = '', attendConStatus = '';
             if (i == 0) {
@@ -663,7 +663,7 @@
             dataK = data;
 
         }
-        );
+   );
 
 
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/examArrangement/examArrangement.js

@@ -99,8 +99,7 @@
             var weekData2 = ProcessingData(weekData);
             var tSec2List = $('.tSec2List');
             weekTimeSpan.eq(0).text(todayWeek.Monday).end().eq(1).text(todayWeek.Sunday);
-            $.each(weekData2,
-                function (i, n) {
+            $.each(weekData2,function (i, n) {
                     var html = '';
                     n.lessonData.sort(compare('sectionTime'));
                     if (n.lessonData.length == 0) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/myAttendance.js

@@ -67,8 +67,7 @@
                     if (n.lessonData.length == 0) {
                         html += '<li><div class="noHtml">该时间段没有课程</div></li>';
                     } else {
-                        $.each(n.lessonData,
-                            function (j, k) {
+                        $.each(n.lessonData,function (j, k) {
                                 var lessonInfo = JSON.stringify(k);
                                 console.log(lessonInfo);
                                 html += '<li lessonInfo=\'' + lessonInfo + '\' id="' + k.id + '">' +

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/myAttendance/studentAtten/studentAtten.js

@@ -5,7 +5,7 @@
     var page = {
         isScroll: false,
         init: function ($page, param) {
-
+			console.log(param)
             loadData(param);
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html

@@ -174,53 +174,6 @@
 		按照公安部有关规定，户口迁移遵循自愿原则。
 	</div>
 	
-	<!--<div class="noticeTitle">七、报到程序（一站式服务）</div>
-	<div class="noticeTxt">（一）新生凭录取通知书和身份证到学校招生就业处报到，确认考生信息、移交考生档案，领取新生报到流程单。</div>
-	<div class="noticeTxt">（二）新生持报到流程单到学校财务处回执缴费事宜。（网上缴费凭证、银行托收凭证。校内生活广场和综合楼均设有农行、凉山商业银行自助存取款机）。</div>
-	<div class="noticeBox">
-		<div class="noticeTxt">网上缴费：</div>
-		<div class="noticeTxt">
-			<span>单位名称</span><span>西昌民族幼儿师范高等专科学校</span>
-		</div>
-		<div class="noticeTxt">
-			<span>账 号</span><span>5105 0181 0042 0900 0666</span>
-		</div>
-		<div class="noticeTxt">
-			<span>开户银行</span><span>建行西昌西客站支行</span>
-		</div>
-		<div class="noticeTxt">
-			<span>行 号</span><span>105684078019</span>
-		</div>
-	</div>
-	<div class="noticeTxt">（三）新生凭学校财务处确认单到所在系部登记入班，至学生公寓入住。</div>
-
-	<div class="noticeTitle">八、助学贷款</div>
-	<div class="noticeTxt">
-		需申请助学贷款的同学，可向户籍所在地教育局新生资助办公室咨询办理（详见高校本专科学生资助政策简介)；学生助学贷款回执单开学后交回学校财务处。
-	</div>
-	
-	<div class="noticeTitle">九、乘车路线</div>
-	<div class="noticeTxt">我校在火车站、长途汽车站均设有新生接待处，也可自驾或到市区乘107路、118路公交车至西昌学院北校区站下车。</div>
-	<div class="noticeTxt">特别提示：新生报到时持录取通知书到当地火车站购买到校普速车票，可享受半价优惠；动车二等座可享受7.5折优惠。</div>
-
-	<div class="noticeTxt">温馨提示</div>
-	<div class="noticeTxt">（一）旅途中请注意人身安全，妥善保管好各种证件、行李不要让不相识的人代为保管行李；</div>
-	<div class="noticeTxt">（二）到校后自行办理缴费等入学，谨防上当受骗；</div>
-	<div class="noticeTxt">（三）学生家长可在学校附近入住；</div>
-	<div class="noticeTxt">（四）自驾车可在百度地图和高德地图搜索“西昌民族幼儿师范高等专科学校”前往。</div>
-	
-	<div class="noticeTitle">十、学校地址</div>
-	<div class="noticeTxt">
-		四川省凉山州西昌市西乡乡园丁路1号 <br />  邮政编码：615013
-	</div>
-	
-	<div class="noticeTitle">十一、登录学校网址</div>
-	<div class="noticeTxt">
-		http://www.xcmzyz.com，查询录取情况并记录学号（8月20日可查询），使用学号登录学校“数字校园”系统（初始密码：123456），完善个人信息并修改密码。
-	</div>
-	
-	<div class="noticeTitle">十二、咨询电话：</div>-->
-	
 	<div class="noticeText">西昌民族幼儿师范高等专科学校</div>
 	<div class="noticeText">二0一九年九月一日</div>
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js

@@ -18,9 +18,11 @@
                         $('#ClassNo').html(entity.ClassNo);
                         $('#ClassTutorName').html(entity.ClassTutorName);
                         $('#ClassTutorMobile').html(entity.ClassTutorMobile);
+						
                         $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费");
                         $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交");
                         $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取");
+						
                         $('#IsCompleteInfo').html(entity.IsCompleteInfo);
                         $('#Dormitory').html(entity.DormitoryName);
                     }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js

@@ -19,21 +19,25 @@
                     } else {
                         notCompleteStyle("#IsCompleteInfo", "images/enter2-1.png");
                     }
+					
                     if (data["StuInfoFreshEntity"].PayFeeStatus == "1") {
                         completeStyle("#PayFeeStatus", "images/enter1-2.png");
                     } else {
                         notCompleteStyle("#PayFeeStatus", "images/enter2-2.png");
                     }
+					
                     if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") {
                         completeStyle("#StudentLoan", "images/enter1-3.png");
                     } else {
                         notCompleteStyle("#StudentLoan", "images/enter2-3.png");
                     }
+					
                     if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") {
                         completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png");
                     } else {
                         notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png");
                     }
+					
                     if (data["StuInfoFreshEntity"].RegisterStatus == "1") {
                         completeStyle("#RegisterStatus", "images/enter1-5.png");
                     } else {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/stuExamArrangement/stuExamArrangement.js

@@ -95,19 +95,21 @@
         judgeDate(todayWeek.SundayTime);
         var param = { startTime: start, endTime: end };
         learun.httpget(config.webapi + "arrangeExam/stuList", param, (data) => {
+			//console.log(data)
             weekData = data;
             var weekData2 = ProcessingData(weekData);
             var tSec2List = $('.tSec2List');
             weekTimeSpan.eq(0).text(todayWeek.Monday).end().eq(1).text(todayWeek.Sunday);
-            $.each(weekData2,
-                function (i, n) {
+			//console.log(weekData2)
+            $.each(weekData2, function (i, n) {
+					// console.log(n)
                     var html = '';
                     n.lessonData.sort(compare('sectionTime'));
+					
                     if (n.lessonData.length == 0) {
                         html += '<li><div class="noHtml">该时间段没有考试</div></li>';
                     } else {
-                        $.each(n.lessonData,
-                            function (j, k) {
+                        $.each(n.lessonData, function (j, k) {
                                 html += '<li>' +
                                     '<div class="tSec2ListL">第' +
                                     k.sectionTime +
@@ -132,7 +134,8 @@
                     }
                     tSec2List.eq(n.weekTime - 1).html(html);
                 });
-        }
+        
+		}
         );
     }
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentAttendance/form/form.js

@@ -5,7 +5,6 @@
         init: function ($page, param) {
             //console.log(param) 传过来的参数 在param上
             //初始化
-            console.log(param);
             loadData(param);
             $('.tSec3Time').html('<span></span>' + param.LessonDate + ' 第' + param.LessonTime.substring(1) + '节<span></span>');
             $('.tSec4T').html('<div>' +
@@ -18,7 +17,6 @@
                 function () {
                     var that = $(this);
                     var jsons = JSON.parse(that.attr('student'));
-                    // console.log(jsons)
                     var type = that.attr('class');
                     type = type.length == 0 ? 'sStatue1' : type;
                     that.addClass('active');
@@ -48,20 +46,19 @@
 
                     $(".timeTableList li").each(function () {
                         var keType = $(this).attr("kqtype") ? $(this).attr("kqtype") : "0";
+                        console.log(keType);
                         var object = JSON.parse($(this).attr("student"));
                         object.kqType = keType;
-
                         rowData.push(object);
                     })
 
                     var jsonObj = JSON.parse(JSON.stringify(rowData));
-                    console.log(JSON.stringify(jsonObj));
 
                     learun.layer.confirm('是否确认提交考勤？',
                         function (num) {
                             learun.layer.loading(true, '正在提交');
                             learun.httppost(
-                                config.webapi + '/Learun/EducationalAdministration/StuAttendanceLeave/apply',
+                                config.webapi + '/Learun/adms/EducationalAdministration/StuAttendanceLeave/apply',
                                 {
                                     lessonTime: param.LessonTime,
                                     lessonDate: param.LessonDate,
@@ -103,7 +100,6 @@
             )
         };
         learun.httpget(config.webapi + "/teachattendance/students", _postParam, (data) => {
-            console.log(data);
             studentCheckData(data, param)
         })
     }
@@ -115,7 +111,9 @@
         } else {
             $.each(weekData2.rows, function (j, k) {
                 var statusName = !k.Sort ? 'sStatue1' : k.Sort == "准时" ? 'sStatue1' : k.Sort == "早退" ? 'sStatue2' : k.Sort == "旷课" ? 'sStatue3' : k.Sort == "病假" ? 'sStatue4' : k.Sort == "迟到" ? 'sStatue5' : 'sStatue6';
-                html += '<li student=' + JSON.stringify(k) + ' class="' + statusName + '"><div>' +
+                var sktype = !k.Sort ? '0' : k.Sort == "准时" ? '0' : k.Sort == "早退" ? '2' : k.Sort == "旷课" ? '5' : k.Sort == "病假" ? '3' : k.Sort == "迟到" ? '1' : '4';
+                k.kqType=sktype;
+                html += '<li student=' + JSON.stringify(k) + ' class="' + statusName + '" kqtype="'+sktype+'"><div>' +
                     k.StuName + '<span class="iconfont icon-check"></span>' +
                     '</div></li>';
             })

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentCheck/studentCheck.js

@@ -85,7 +85,8 @@
     };
     function studentCheckData(Monday, Sunday) {
         var studCheckList = $('.studCheckList');
-        learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", {}, (data) => {
+        var param = { StartDate: Monday, EndDate: Sunday };
+        learun.httpget(config.webapi + "learun/adms/timetable/StuLessonInfo", param, (data) => {
             console.log(data);
             $.each(data, function (i, n) {
                 var html = '';
@@ -131,8 +132,6 @@
                 }
                 studCheckList.eq(parseInt(n.week) - 1).html(html)
             })
-
-
         })
 
 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/studentSee/studentSee.js

@@ -25,6 +25,7 @@
             //获取学年学期列表
             learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "scoreSearch/academicAndSemesterList", {}, (data) => {
+				console.log(data)
                 if (data == null || data.length <= 0) {
                     $('.studSeeSec2 .studSeeSec2Top').hide();
                     $('.studSeeSec2 .tips').show();
@@ -52,6 +53,7 @@
     function studentSeeAjax(id) {
         var param = { value: id };
         learun.httpget(config.webapi + "scoreSearch/scoreList", param, (data) => {
+			console.log(data)
             if(data != null){
                 var html1 = '<div class="studSeeSec2Txt">' +
                     '<div><span>' + data.Rank + '</span>名</div><div>班级排名</div>' +

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.html

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <div class="lr-form-row  " hidden data-table="StuAttendanceLeave">
 
         <label>学年度</label>
@@ -109,5 +109,4 @@
         <label>备注</label>
         <textarea id="Remark" style="height:100px;"></textarea>
     </div>
-   
 </div> 

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)  
  * Copyright (c) 2013-2018 北京泉江科技有限公司  
  * 创建人：超级管理员 
  * 日  期：2019-06-24 14:40 
@@ -50,35 +50,7 @@
                 $header.find('.f-page-title').text('请假');
                 $page.find('.lr-form-container').setFormWrite();
             });
-            //// 更多 
-            //$header.find('.lr-form-header-more').on('tap', function () { 
-            //    learun.actionsheet({ 
-            //        id: 'more', 
-            //        data: [ 
-            //            { 
-            //                text: '删除', 
-            //                mark: true, 
-            //                event: function () {// 删除当前条信息 
-            //                    learun.layer.confirm('确定要删除该笔数据吗？', function (_index) { 
-            //                        if (_index === '1') { 
-            //                            learun.layer.loading(true, '正在删除该笔数据'); 
-            //                            learun.httppost(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/delete', keyValue, (data) => { 
-            //                                learun.layer.loading(false); 
-            //                                if (data) {// 删除数据成功 
-            //                                    learun.nav.closeCurrent(); 
-            //                                    var prepage = learun.nav.getpage('EducationalAdministration/StuAttendanceLeave'); 
-            //                                    prepage.grid.reload(); 
-            //                                } 
-            //                            }); 
-            //                        } 
-            //                    }, '智慧校园提示', ['取消', '确定']); 
-            //                } 
-            //            } 
-            //        ], 
-            //        cancel: function () { 
-            //        } 
-            //    }); 
-            //}); 
+
             // 提交 
             $header.find('.lr-form-header-submit').on('tap', function () {
                 // 获取表单数据 
@@ -88,6 +60,9 @@
                 var _postData = {}
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
+				console.log($page.find('.lr-form-container').lrformGet())
+				console.log(_postData)
+				return
                 learun.layer.loading(true, '正在提交数据');
                 learun.httppost(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/save', _postData, (data) => {
                     learun.layer.loading(false);
@@ -115,10 +90,9 @@
             $header.find('.lr-form-header-btnlist').show();
             // 获取表单数据 
             learun.layer.loading(true, '获取表单数据');
-            learun.httpget(config.webapi + 'learun/EducationalAdministration/StuAttendanceLeave/leaveform', keyValue, (data) => {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/StuAttendanceLeave/leaveform', {}, (data) => {
                 console.log(data);
                 if (data) {
-
                     for (var id in data) {
                         if (data[id]) {
                             if (data[id].length) {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/timeTable/timeTable.js

@@ -94,6 +94,7 @@
     function loadData(start, end) {
         judgeDate(todayWeek.SundayTime);
         var param = { StartDate: start, EndDate: end };
+		// let param = { StartDate: '2018-11-05', EndDate: '2018-11-11' };
         learun.httpget(config.webapi + "learun/adms/timetable/list", param, (data) => {
             weekData = data;
             var weekData2 = ProcessingData(weekData);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js

@@ -216,6 +216,8 @@
                     StuInfoFreshFamilyEntities: family(),
                     StuInfoFreshEmergePeopleEntities: emergePeople()
                 };
+				console.log(postdata)
+				// return
                 learun.layer.loading(true, '正在提交数据');
                 learun.httpget(config.webapi + "StuInfoFresh/saveStuInfoFresh", postdata, (data) => {
                     learun.layer.loading(false);

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/lrmuiex.js

@@ -1,4 +1,4 @@
-/*
+/*
  * 版 本 Learun-ADMS V7.0.0 数字化智慧校园(http://www.learun.cn)
  * Copyright (c) 2013-2017 北京泉江科技有限公司
  * 创建人：数字化智慧校园-前端开发组

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -857,7 +857,7 @@ namespace Learun.Application.Organization
         /// 重置密码
         /// </summary>
         /// <param name="keyValue">账号主键</param>
-        public void ResetPassword(string keyValue)
+        public void ResetPassword(string keyValue, string defaultpwd)
         {
             try
             {
@@ -871,7 +871,7 @@ namespace Learun.Application.Organization
                 {
                     cache.Remove(cacheKeyId + item, CacheId.user);
                 }
-                string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["defaultpwd"], 32).ToLower();
+                string password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();
                 userService.RevisePasswordBatch(keyValue, password);
             }
             catch (Exception ex)
@@ -908,7 +908,7 @@ namespace Learun.Application.Organization
         /// 重置密码(八位)
         /// </summary>
         /// <param name="keyValue">账号主键</param>
-        public void ResetPasswordEight(string keyValue)
+        public void ResetPasswordEight(string keyValue, string defaultpwd)
         {
             try
             {
@@ -916,7 +916,7 @@ namespace Learun.Application.Organization
                 {
                     cache.Remove(cacheKeyId + item, CacheId.user);
                 }
-                string password = Md5Helper.Encrypt(ConfigurationManager.AppSettings["defaultpwdeight"], 32).ToLower();
+                string password = Md5Helper.Encrypt(defaultpwd, 32).ToLower();
                 userService.RevisePasswordBatch(keyValue, password);
             }
             catch (Exception ex)
@@ -1201,6 +1201,31 @@ namespace Learun.Application.Organization
             }
         }
 
+
+        /// <summary>
+        /// 修改用户的允许登录结束时间
+        /// </summary>
+        /// <param name="keyValue">主键值</param>
+        /// <param name="state">状态：1-赋值；0-重置</param>
+        public void UpdateAllowEndTime(string keyValue, int state)
+        {
+            try
+            {
+                userService.UpdateAllowEndTime(keyValue, state);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         ///// <summary>
         ///// 获取用户头像
         ///// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserIBLL.cs

@@ -130,12 +130,12 @@ namespace Learun.Application.Organization
         /// 重置密码
         /// </summary>
         /// <param name="keyValue">账号主键</param>
-        void ResetPassword(string keyValue);
+        void ResetPassword(string keyValue, string defaultpwd);
         /// <summary>
         /// 重置密码(八位)
         /// </summary>
         /// <param name="keyValue">账号主键</param>
-        void ResetPasswordEight(string keyValue);
+        void ResetPasswordEight(string keyValue, string defaultpwd);
         /// <summary>
         /// 修改用户状态
         /// </summary>
@@ -179,7 +179,7 @@ namespace Learun.Application.Organization
         /// <param name="userId">用户ID</param>
         void GetImg(string userId);
 
-        void setPassword(string userid,string pwd);
+        void setPassword(string userid, string pwd);
         List<UserEntity> GetStudents();
         #endregion
 
@@ -195,5 +195,12 @@ namespace Learun.Application.Organization
         void UpdateIp(string ip, string id);
         void GetImgForDC(string userId);
         UserEntity GetEntityByWeixinOpenIdPC(string openId);
+
+        /// <summary>
+        /// 修改用户的允许登录结束时间
+        /// </summary>
+        /// <param name="keyValue">主键值</param>
+        /// <param name="state">状态：1-赋值；0-重置</param>
+        void UpdateAllowEndTime(string keyValue, int state);
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserService.cs

@@ -128,7 +128,7 @@ namespace Learun.Application.Organization
         {
             try
             {
-                return this.BaseRepository().FindList<UserEntity>(a => a.F_Description == "教师").ToList().Count() > 0 ? true : false;
+                return this.BaseRepository().FindList<UserEntity>(a =>a.F_Description == "教师"&&a.F_DeleteMark==1&&a.F_EnabledMark==1).ToList().Count() > 0 ? true : false;
             }
             catch (Exception ex)
             {
@@ -848,6 +848,38 @@ namespace Learun.Application.Organization
                 }
             }
         }
+
+        /// <summary>
+        /// 修改用户的允许登录结束时间
+        /// </summary>
+        /// <param name="keyValue">主键值</param>
+        /// <param name="state">状态：1-赋值；0-重置</param>
+        public void UpdateAllowEndTime(string keyValue, int state)
+        {
+            try
+            {
+                if (state == 0)
+                {
+                    this.BaseRepository().ExecuteBySql("update LR_Base_User set F_AllowEndTime=null where F_UserId='" + keyValue + "'");
+                }
+                else
+                {
+                    this.BaseRepository().ExecuteBySql("update LR_Base_User set F_AllowEndTime='" + DateTime.Now + "' where F_UserId='" + keyValue + "'");
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
     }
 
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_DefaultPwdConfigController.cs

@@ -0,0 +1,131 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-01-19 11:14
+    /// 描 述：默认密码配置
+    /// </summary>
+    public class Sys_DefaultPwdConfigController : MvcControllerBase
+    {
+        private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sys_DefaultPwdConfigIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var Sys_DefaultPwdConfigData = sys_DefaultPwdConfigIBLL.GetSys_DefaultPwdConfigEntity( keyValue );
+            var jsonData = new {
+                Sys_DefaultPwdConfig = Sys_DefaultPwdConfigData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sys_DefaultPwdConfigIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            Sys_DefaultPwdConfigEntity entity = strEntity.ToObject<Sys_DefaultPwdConfigEntity>();
+            entity.IsEnabled = false;
+            sys_DefaultPwdConfigIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 启用
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoEnabled(string keyValue)
+        {
+            sys_DefaultPwdConfigIBLL.DoEnabled(keyValue);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -151,10 +151,10 @@
             <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
             <div id="F_DepartmentId" checkexpession="NotNull"></div>
         </div>
-        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        @*<div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">系部</div>
             <div id="DeptNo"></div>
-        </div>
+        </div>*@
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">岗位类别</div>
             <div id="EmpSortNo"></div>

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

@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
                 $("#ForeignLanguageNo").parent().hide();
                 $("#EmpSortNo").parent().hide();
                 $("#EmpFullTimeNo").parent().hide();
-                $("#DeptNo").parent().hide();
+                //$("#DeptNo").parent().hide();
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
@@ -128,7 +128,7 @@ var bootstrap = function ($, learun) {
             $('#EmpSortNo').lrDataItemSelect({ code: 'jsgw' });
             $('#EmpFullTimeNo').lrDataItemSelect({ code: 'EmpFullTime' });
             $('#ObtainWay').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#PostRank').lrDataSourceSelect({ code: 'BCdTitleOfTechPost', value: 'titleoftechpostno', text: 'titleoftechpost' });
             $('#Photo').lrUploader();
             $('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.cshtml

@@ -11,10 +11,10 @@
         <div class="lr-form-item-title">部门</div>
         <div id="F_DepartmentId"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
+    @*<div class="col-xs-12 lr-form-item" data-table="EmpInfo">
         <div class="lr-form-item-title">系部</div>
         <div id="DeptNo"></div>
-    </div>
+    </div>*@
 </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/FormEdit.js

@@ -35,7 +35,7 @@ var bootstrap = function ($, learun) {
                 }
             });
             $('#F_DepartmentId').lrselect();
-            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            //$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -22,10 +22,10 @@
                                     <div class="lr-form-item-title">联系电话</div>
                                     <input id="mobile" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
+                                @*<div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="F_DepartmentId"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -373,19 +373,19 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "系部", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: "系部", name: "DeptNo", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                    //            key: value,
+                    //            keyId: 'deptno',
+                    //            callback: function (_data) {
+                    //                callback(_data['deptname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "性别", name: "GenderNo", width: 80, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml

@@ -36,7 +36,7 @@
                     <td>政治面貌</td>
                     <td>@Model.PartyFaceNo</td>
                     <td>入党时间</td>
-                    <td>@Model.JoinPartyTime</td>
+                    <td>@(Model.JoinPartyTime != "" && Model.JoinPartyTime != null ? Model.JoinPartyTime.Replace("/", "-") : "")</td>
                     <td>最高学历（学位）</td>
                     <td>@Model.HighestRecord</td>
                 </tr>

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

@@ -0,0 +1,15 @@
+@{
+    ViewBag.Title = "默认密码配置";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_DefaultPwdConfig" >
+        <div class="lr-form-item-title">密码名称<font face="宋体">*</font></div>
+        <input id="PwdName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Sys_DefaultPwdConfig" >
+        <div class="lr-form-item-title">密码<font face="宋体">*</font></div>
+        <input id="Pwd" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Form.js")

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

@@ -0,0 +1,51 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-01-19 11:14
+ * 描  述：默认密码配置
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "默认密码配置";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">密码名称</div>
+                                    <input id="PwdName" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_enabled" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_DefaultPwdConfig/Index.js

@@ -0,0 +1,112 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-01-19 11:14
+ * 描  述：默认密码配置
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enabled').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var IsEnabled = $('#gridtable').jfGridValue('IsEnabled');
+                    if (IsEnabled == true) {
+                        learun.alert.warning("当前项已启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/DoEnabled', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/Sys_DefaultPwdConfig/GetPageList',
+                headData: [
+                    { label: "密码名称", name: "PwdName", width: 150, align: "left"},
+                    { label: "密码", name: "Pwd", width: 150, align: "left"},
+                    {
+                        label: "是否启用", name: "IsEnabled", width: 100, align: "left",
+                        formatter: function (cellvalue, rowObject) {
+                            return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                        }
+                    },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_CardSortManageController.cs

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:54
+    /// 描 述：网上办事大厅拖拽版-卡片块排序管理
+    /// </summary>
+    public class SSO_Drag_CardSortManageController : MvcControllerBase
+    {
+        private SSO_Drag_CardSortManageIBLL sSO_Drag_CardSortManageIBLL = new SSO_Drag_CardSortManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sSO_Drag_CardSortManageIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sSO_Drag_CardSortManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = sSO_Drag_CardSortManageIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sSO_Drag_CardSortManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,SSO_Drag_CardSortManageEntity entity)
+        {
+            sSO_Drag_CardSortManageIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/SSO_Drag_DesktopManageController.cs

@@ -0,0 +1,121 @@
+using Learun.Application.TwoDevelopment.LR_Desktop;
+using Learun.Util;
+using System.Data;
+using System.Web.Mvc;
+
+namespace Learun.Application.Web.Areas.LR_Desktop.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-18 09:47
+    /// 描 述：网上办事大厅拖拽版-桌面管理
+    /// </summary>
+    public class SSO_Drag_DesktopManageController : MvcControllerBase
+    {
+        private SSO_Drag_DesktopManageIBLL sSO_Drag_DesktopManageIBLL = new SSO_Drag_DesktopManageBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList( string queryJson )
+        {
+            var data = sSO_Drag_DesktopManageIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取列表分页数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = sSO_Drag_DesktopManageIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var data = sSO_Drag_DesktopManageIBLL.GetEntity(keyValue);
+            return Success(data);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            sSO_Drag_DesktopManageIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue,SSO_Drag_DesktopManageEntity entity)
+        {
+            sSO_Drag_DesktopManageIBLL.SaveEntity(keyValue, entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">用户<font face="宋体">*</font></div>
+        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式<font face="宋体">*</font></div>
+        <input id="ModelCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面Id<font face="宋体">*</font></div>
+        <input id="DesktopId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">卡片块排序<font face="宋体">*</font></div>
+        <input id="CardSort" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Form.js

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:54
+ * 描  述：网上办事大厅拖拽版-卡片块排序管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-卡片块排序管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">树形目录</div>
+            <div id="tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">标题</div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_CardSortManage/Index.js

@@ -0,0 +1,94 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:54
+ * 描  述：网上办事大厅拖拽版-卡片块排序管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_CardSortManage/GetPageList',
+                headData: [
+                        { label: '主键', name: 'Id', width: 200, align: "left" },
+                        { label: '用户', name: 'UserId', width: 200, align: "left" },
+                        { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" },
+                        { label: '桌面Id', name: 'DesktopId', width: 200, align: "left" },
+                        { label: '卡片块排序', name: 'CardSort', width: 200, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-桌面管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">主键<font face="宋体">*</font></div>
+        <input id="Id" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">用户<font face="宋体">*</font></div>
+        <input id="UserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式<font face="宋体">*</font></div>
+        <input id="ModelCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面名称<font face="宋体">*</font></div>
+        <input id="DesktopName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">桌面编号<font face="宋体">*</font></div>
+        <input id="DesktopCode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">排序号<font face="宋体">*</font></div>
+        <input id="Sort" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Form.js

@@ -0,0 +1,38 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:47
+ * 描  述：网上办事大厅拖拽版-桌面管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
+    var page = {
+        init: function () {
+            page.initData();
+        },
+        bind: function () {
+        },
+        initData: function () {
+            if (!!selectedRow) {
+                $('#form').lrSetFormData(selectedRow);
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "网上办事大厅拖拽版-桌面管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout lr-layout-left-center" id="lr_layout">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">树形目录</div>
+            <div id="tree" class="lr-layout-body"></div>
+        </div>
+    </div>
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap">
+            <div class="lr-layout-title">标题</div>
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/SSO_Drag_DesktopManage/Index.js

@@ -0,0 +1,95 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-18 09:47
+ * 描  述：网上办事大厅拖拽版-桌面管理
+ */
+var selectedRow;
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                selectedRow = null;
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form',
+                    width: 700,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                selectedRow = $('#gridtable').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/Form?keyValue=' + keyValue,
+                        width: 700,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/DeleteForm', { keyValue: keyValue}, function () {
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_Desktop/SSO_Drag_DesktopManage/GetPageList',
+                headData: [
+                        { label: '主键', name: 'Id', width: 200, align: "left" },
+                        { label: '用户', name: 'UserId', width: 200, align: "left" },
+                        { label: '模式编号：0办事大厅模式，1效率优先模式，2管理驾驶舱模式', name: 'ModelCode', width: 200, align: "left" },
+                        { label: '桌面名称', name: 'DesktopName', width: 200, align: "left" },
+                        { label: '桌面编号', name: 'DesktopCode', width: 200, align: "left" },
+                        { label: '排序号', name: 'Sort', width: 200, align: "left" },
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs

@@ -245,6 +245,34 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             return View();
         }
 
+        /// <summary>
+        /// 流程时间统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticTimeIndex()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 流程时间统计-饼图 
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticTimeForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 流程次数统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult StatisticCountIndex()
+        {
+            return View();
+        }
+
         #endregion
 
 
@@ -856,5 +884,74 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers
             return Success("添加成功");
         }
         #endregion
+
+        #region 流程效率分析
+
+        /// <summary>
+        /// 获取审批时间统计数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public ActionResult GetStatisticTimeData(string processId)
+        {
+            var taskdata = nWFTaskIBLL.GetALLTaskList(processId).OrderByDescending(x => x.F_CreateDate);
+
+            var legendData = new List<string>();
+            var seriesData = new List<WfSchemeReportModelOfPie2>();
+            foreach (var item in taskdata)
+            {
+                legendData.Add(item.F_ModifyUserName);
+                seriesData.Add(new WfSchemeReportModelOfPie2()
+                {
+                    name = item.F_ModifyUserName,
+                    value = (item.F_ModifyDate - item.F_CreateDate).HasValue ? (item.F_ModifyDate - item.F_CreateDate).Value.TotalMinutes.ToDecimal(2).ToString() : "0"
+                });
+            }
+
+            var jsonData = new
+            {
+                legendData = legendData,
+                seriesData = seriesData
+            };
+
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取审批次数统计数据
+        /// </summary>
+        /// <param name="queryJson"></param>
+        /// <returns></returns>
+        public ActionResult GetStatisticCountData()
+        {
+            var taskdata = nWFTaskIBLL.GetFinishTaskList();
+            var taskgroup = taskdata.GroupBy(x => new { x.F_ModifyUserId, x.F_ModifyUserName }).Select(x => new
+            {
+                userId = x.Key.F_ModifyUserId,
+                userName = x.Key.F_ModifyUserName,
+                count = x.Select(y => y.F_Id).Count()
+            });
+
+            var legendData = new List<string>();
+            var seriesData = new List<WfSchemeReportModelOfPie>();
+            foreach (var item in taskgroup)
+            {
+                legendData.Add(item.userName);
+                seriesData.Add(new WfSchemeReportModelOfPie()
+                {
+                    value = item.count,
+                    name = item.userName
+                });
+            }
+
+            var jsonData = new
+            {
+                legendData = legendData,
+                seriesData = seriesData
+            };
+
+            return Success(jsonData);
+        }
+        #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/NWFContainerForm.js

@@ -778,8 +778,9 @@ var bootstrap = function ($, learun) {
                                             // 审批流程
                                             learun.loading(true, '流程加签...');
                                             var postData = {
-                                                //des: formdata.des,
-                                                des: $('#des').val(),
+                                                des: formdata.des,
+                                                //liangkun 2020-12-30改 第一次加签的时候没取到备注
+                                                //des: $('#des').val(),
                                                 userId: formdata.auditorId,
                                                 processId: nwflow.processId,
                                                 taskId: nwflow.taskId

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/SelectUserForm.js

@@ -26,7 +26,8 @@ var bootstrap = function ($, learun) {
                         type: 'multiple',
                         data: _list,
                         value: 'Id',
-                        text: 'Name'
+                        text: 'Name',
+                        allowSearch:true
                     });
                 }
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.cshtml

@@ -0,0 +1,25 @@
+
+@{
+    ViewBag.Title = "流程次数统计";
+    Layout = "~/Views/Shared/_ReportTemplate.cshtml";
+}
+
+<div class="lr-layout ui-report">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-right">
+                    <div class="btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr-replace" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlt">刷新</span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-grid" style="overflow:auto;">
+                <div id="main" style="float: left; margin-right: 20px; width: 650px; height: 350px;border: 1px solid #ccc;">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="~/Content/echarts/echarts.js"></script>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticCountIndex.js

@@ -0,0 +1,60 @@
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initChart();
+        },
+        bind: function () {
+            // 刷新
+            $('#lr-replace').on('click', function () {
+                location.reload();
+            });
+        },
+        initChart: function () {
+            var myChart1 = echarts.init(document.getElementById('main'));
+            learun.httpAsyncPost(top.$.rootUrl + "/LR_NewWorkFlow/NWFProcess/GetStatisticCountData", { }, function (res) {
+                if (res.code == 200) {
+                    var option1 = {
+                        title: {
+                            text: '审批次数分析图',
+                            x: 'center'
+                        },
+                        tooltip: {
+                            trigger: 'item',
+                            formatter: "{a} <br/>{b} : {c}次 ({d}%)"
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left',
+                            data: res.data.legendData
+                        },
+                        series: [
+                            {
+                                name: '审批人',
+                                type: 'pie',
+                                radius: '55%',
+                                center: ['50%', '60%'],
+                                data: res.data.seriesData,
+                                itemStyle: {
+                                    emphasis: {
+                                        shadowBlur: 10,
+                                        shadowOffsetX: 0,
+                                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                    }
+                                }
+                            }
+                        ]
+                    };
+                    myChart1.setOption(option1);
+
+                }
+            });
+        },
+        
+    };
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.cshtml

@@ -0,0 +1,18 @@
+
+@{
+    ViewBag.Title = "审批时间统计";
+    Layout = "~/Views/Shared/_WorkFlowNewForm.cshtml";
+}
+
+<div class="lr-layout ui-report">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-grid" style="overflow:auto;">
+                <div id="main" style="float: left; margin: 20px; width: 650px; height: 350px;border: 1px solid #ccc;">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="~/Content/echarts/echarts.js"></script>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeForm.js

@@ -0,0 +1,58 @@
+var processId = request('processId');      // 流程实例主键
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initChart();
+        },
+        bind: function () {
+           
+        },
+        initChart: function () {
+            var myChart1 = echarts.init(document.getElementById('main'));
+            learun.httpAsyncPost(top.$.rootUrl + "/LR_NewWorkFlow/NWFProcess/GetStatisticTimeData", { processId: processId }, function (res) {
+                if (res.code == 200) {
+                    var option1 = {
+                        title: {
+                            text: '审批时间分析图',
+                            x: 'center'
+                        },
+                        tooltip: {
+                            trigger: 'item',
+                            formatter: "{a} <br/>{b} : {c}分 ({d}%)"
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left',
+                            data: res.data.legendData
+                        },
+                        series: [
+                            {
+                                name: '审批人',
+                                type: 'pie',
+                                radius: '55%',
+                                center: ['50%', '60%'],
+                                data: res.data.seriesData,
+                                itemStyle: {
+                                    emphasis: {
+                                        shadowBlur: 10,
+                                        shadowOffsetX: 0,
+                                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                    }
+                                }
+                            }
+                        ]
+                    };
+                    myChart1.setOption(option1);
+
+                }
+            });
+        },
+        
+    };
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.cshtml

@@ -0,0 +1,40 @@
+@{
+    ViewBag.Title = "流程时间统计";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div id="lr_layout" class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_statistic" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;<span class="lrlg">审批时间统计</span></a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="lr-layout-body" id="gridtable">
+            </div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js")
+
+
+
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/StatisticTimeIndex.js

@@ -0,0 +1,129 @@
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2018 上海力软信息技术有限公司
+ * 创建人：力软-前端开发组
+ * 日 期：2018.12.19
+ * 描 述：流程时间统计
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var categoryId = '2';
+    var logbegin = '';
+    var logend = '';
+
+    var page = {
+        init: function () {
+            page.initGrid();
+            page.bind();
+        },
+        bind: function () {
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                selectfn: function (begin, end) {
+                    logbegin = begin;
+                    logend = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 审批时间统计
+            $('#lr_statistic').on('click', function () {
+                var processId = $('#gridtable').jfGridValue('F_Id');
+                if (learun.checkrow(processId)) {
+                    learun.layerForm({
+                        id: 'StatisticTimeForm',
+                        title: '审批时间统计',
+                        url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/StatisticTimeForm?processId=' + processId,
+                        height: 600,
+                        width: 1000,
+                        btn:null
+                    });
+                }
+            });
+        },
+        initGrid: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/GetPorcessList',
+                headData: [
+                    {
+                        label: "标题", name: "F_Title", width: 300, align: "left", formatter: function (cellvalue, row) {
+                            if (row.F_SchemeName != row.F_Title && row.F_Title) {
+                                return row.F_SchemeName + "(" + row.F_Title + ")";
+                            }
+                            else {
+                                return row.F_SchemeName;
+                            }
+                        }
+                    },
+                    {
+                        label: "状态", name: "F_EnabledMark", width: 70, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (row.F_IsFinished == 0) {
+                                if (cellvalue == 1) {
+                                    if (row.F_IsUrge == "1" && categoryId == '2') {
+                                        return "<span class=\"label label-danger\">催办加急</span>";
+                                    }
+                                    return "<span class=\"label label-success\">运行中</span>";
+                                } else if (cellvalue == 2) {
+                                    return "<span class=\"label label-primary\">草稿</span>";
+                                } else {
+                                    return "<span class=\"label label-danger\">作废</span>";
+                                }
+                            }
+                            else {
+                                return "<span class=\"label label-warning\">结束</span>";
+                            }
+
+                        }
+                    },
+                    { label: "发起者", name: "F_CreateUserName", width: 80, align: "center" },
+                    {
+                        label: "时间", name: "F_CreateDate", width: 150, align: "left",
+                        formatter: function (cellvalue) {
+                            return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss');
+                        }
+                    }
+                ],
+                mainId: 'F_Id',
+                isPage: true,
+                sidx: 'F_CreateDate DESC'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.StartTime = logbegin;
+            param.EndTime = logend;
+            param.categoryId = categoryId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Controllers/NoticeController.cs

@@ -477,7 +477,7 @@ namespace Learun.Application.Web.Areas.LR_OAModule.Controllers
                                 string access_token = weixintokenobj.access_token;
                                 string jsondata = "{\"touser\":\"" + userinfo.OpenIdForWeixin + "\"," +
                                 "\"template_id\":\"" + weixintasktempid + "\"," +
-                                "\"url\":\"" + weixintaskurl + "\"," +
+                                "\"url\":\"" + weixintaskurl + "/#/?page=notice\"," +
                                 "\"data\":{" +
                                 "\"first\": {\"value\":\"您有新的未读通知公告\",\"color\":\"#173177\"}," +
                                 "\"keyword1\":{\"value\":\"未读通知公告\",\"color\":\"#173177\"}," +

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/ResourceFile/UploadifyForm.js

@@ -31,7 +31,7 @@ var bootstrap = function ($, learun) {
                 dnd: '#lr_form_file_queue',
                 paste: 'document.body',
                 accept: {
-                    extensions: "jpg,gif,png,bmp,jpeg,doc,docx,ppt,pptx,xls,xlsx,pdf,txt,rar,zip,csv"
+                    extensions: "*"
                 },
                 multiple: true,
                 // 上传参数

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/UserController.cs

@@ -6,6 +6,8 @@ using Learun.Application.Base.AuthorizeModule;
 using System.Linq;
 using System;
 using Learun.Application.Base.SystemModule;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Configuration;
 
 namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
 {
@@ -23,6 +25,8 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         private UserRelationIBLL userRelationIBLL = new UserRelationBLL();
         private RoleIBLL roleIBLL = new RoleBLL();
 
+        private Sys_DefaultPwdConfigIBLL sys_DefaultPwdConfigIBLL = new Sys_DefaultPwdConfigBLL();
+
 
         #region  获取视图
 
@@ -334,7 +338,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [AjaxOnly]
         public ActionResult ResetPassword(string keyValue)
         {
-            userIBLL.ResetPassword(keyValue);
+            string defpwd = ConfigurationManager.AppSettings["defaultpwd"];
+            //读取默认密码配置中已启用的密码
+            if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null)
+            {
+                defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd;
+            }
+            userIBLL.ResetPassword(keyValue, defpwd);
             return Success("操作成功！");
         }
         /// <summary>
@@ -346,7 +356,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [AjaxOnly]
         public ActionResult ResetPasswordEight(string keyValue)
         {
-            userIBLL.ResetPasswordEight(keyValue);
+            string defpwd = ConfigurationManager.AppSettings["defaultpwdeight"];
+            //读取默认密码配置中已启用的密码
+            if (sys_DefaultPwdConfigIBLL.GetEnabledEntity() != null)
+            {
+                defpwd = sys_DefaultPwdConfigIBLL.GetEnabledEntity().Pwd;
+            }
+            userIBLL.ResetPasswordEight(keyValue, defpwd);
             return Success("操作成功！");
         }
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Controllers/ReportTemplateController.cs

@@ -66,6 +66,15 @@ namespace Learun.Application.Web.Areas.LR_ReportModule.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 新版流程报表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult NWFSchemeReport()
+        {
+            return View();
+        }
         #endregion
 
         #region  获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.cshtml

@@ -0,0 +1,40 @@
+
+@{
+    ViewBag.Title = "流程报表";
+    Layout = "~/Views/Shared/_ReportTemplate.cshtml";
+}
+
+<div class="lr-layout ui-report">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <input id="year" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy',onpicked: function () { $('#year').trigger('change'); }  })" placeholder="请选择年"/>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlt">查询</span></a>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class="btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr-replace" class="btn btn-default"><i class="fa fa-refresh"></i>&nbsp;<span class="lrlt">刷新</span></a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-grid" style="overflow:auto;">
+                <div class="grid-title">
+                    <div style="overflow: hidden; padding-bottom: 20px; text-align: center; margin-left: auto; margin-right: auto;">
+                        <div id="main" style="float: left; margin-right: 20px; width: 650px; height: 350px;border: 1px solid #ccc;">
+                        </div>
+                        <div id="main1" style="float: left; margin-right: 20px; width: 750px; height: 350px;border: 1px solid #ccc;">
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-body" id="gridtable"></div>
+            </div>
+        </div>
+    </div>
+</div>
+<script src="~/Content/echarts/echarts.js"></script>
+@Html.AppendJsFile("/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_ReportModule/Views/ReportTemplate/NWFSchemeReport.js

@@ -0,0 +1,132 @@
+var bootstrap = function ($, learun) {
+    "use strict";
+    var year = "";
+    var page = {
+        init: function () {
+            page.bind();
+            page.initGrid();
+            page.initChart();
+        },
+        bind: function () {
+            //当前年
+            var now = learun.formatDate(new Date(), 'yyyy');
+            $('#year').val(now);
+            year = now;
+            // 刷新
+            $('#lr-replace').on('click', function () {
+                location.reload();
+            });
+            //查询
+            $('#btn_Search').on('click', function () {
+                year = $('#year').val();
+                page.search();
+            });
+        },
+        initGrid: function () {
+            $(".lr-layout-grid").height($(window).height() - 110);
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/LR_ReportModule/ReportTemplate/GetWfSchemeReportList',
+                headData: [
+                    { name: "category", label: "分类", width: 100, align: "center" },
+                    { name: "name", label: "名称", width: 150, align: "center" },
+                    {
+                        name: "kind", label: "类型", width: 100, align: "center",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-warning\" style=\"cursor: pointer;\">系统流程</span>';
+                            } else {
+                                return '<span class=\"label label-primary\" style=\"cursor: pointer;\">自定义流程</span>';
+                            }
+                        }
+                    },
+                    { name: "total", label: "次数", width: 200, align: "center" }
+                ]
+            });
+            page.search();
+        },
+        initChart: function () {
+            var myChart1 = echarts.init(document.getElementById('main'));
+            var myChart2 = echarts.init(document.getElementById('main1'));
+            var queryJson = { year: year };
+            learun.httpAsyncPost(top.$.rootUrl + "/LR_ReportModule/ReportTemplate/GetWfSchemeUseList", { queryJson: JSON.stringify(queryJson) }, function (res) {
+                if (res.code == 200) {
+                    var option1 = {
+                        title: {
+                            text: year + '年流程使用分析图',
+                            x: 'center'
+                        },
+                        tooltip: {
+                            trigger: 'item',
+                            formatter: "{a} <br/>{b} : {c}次 ({d}%)"
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left',
+                            data: res.data.legendData
+                        },
+                        series: [
+                            {
+                                name: '流程分类',
+                                type: 'pie',
+                                radius: '55%',
+                                center: ['50%', '60%'],
+                                data: res.data.seriesData,
+                                itemStyle: {
+                                    emphasis: {
+                                        shadowBlur: 10,
+                                        shadowOffsetX: 0,
+                                        shadowColor: 'rgba(0, 0, 0, 0.5)'
+                                    }
+                                }
+                            }
+                        ]
+                    };
+                    myChart1.setOption(option1);
+
+                    var option2 = {
+                        title: {
+                            text: year + '年流程使用趋势图',
+                            x: 'center'
+                        },
+                        legend: {
+                            orient: 'vertical',
+                            left: 'left',
+                            data: res.data.legendData
+                        },
+                        tooltip: {
+                            trigger: 'axis'
+                        },
+                        grid: {
+                            left: '15%',
+                            right: '3%',
+                            bottom: '3%',
+                            containLabel: true
+                        },
+                        xAxis: {
+                            type: 'category',
+                            boundaryGap: false,
+                            data: res.data.xAxis
+                        },
+                        yAxis: {
+                            type: 'value',
+                            name: '次数'
+
+                        },
+                        series: res.data.seriesLineData
+                    };
+                    myChart2.setOption(option2);
+                }
+            });
+
+        },
+        search: function (param) {
+            param = param || {};
+            param.year = year;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+            page.initChart();
+        }
+    };
+    page.init();
+}
+
+

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DataItem/ClassifyForm.js

@@ -6,13 +6,13 @@
  * 描 述：分类管理	
  */
 var parentId = request('parentId');
-var selectedRow = top.layer_ClassifyIndex.selectedRow;
+//var selectedRow = top.layer_ClassifyIndex.selectedRow;
 
 var keyValue = '';
 var acceptClick;
 var bootstrap = function ($, learun) {
     "use strict";
-
+    var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
             page.bind();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.js

@@ -119,9 +119,9 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'f_departmentid',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['f_fullname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ConferenceRoomController.cs

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -61,6 +61,19 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList()
+        {
+            var data = conferenceRoomIBLL.GetList();
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>
@@ -69,8 +82,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity( keyValue );
-            var jsonData = new {
+            var ConferenceRoomData = conferenceRoomIBLL.GetConferenceRoomEntity(keyValue);
+            var jsonData = new
+            {
                 ConferenceRoom = ConferenceRoomData,
             };
             return Success(jsonData);
@@ -102,9 +116,21 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             ConferenceRoomEntity entity = strEntity.ToObject<ConferenceRoomEntity>();
-            conferenceRoomIBLL.SaveEntity(keyValue,entity);
+            conferenceRoomIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 启用禁用实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoEnable(string keyValue, string status)
+        {
+            conferenceRoomIBLL.DoEnable(keyValue, status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingManagementController.cs

@@ -3,21 +3,22 @@ using System.Data;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
 using System.Web.Mvc;
 using System.Collections.Generic;
+using System;
 
 namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
 {
     /// <summary>
-    /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 
-    /// Copyright (c) 2013-2018 北京泉江科技有限公司 
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
     /// 创 建：超级管理员
-    /// 日 期：2020-03-23 15:04
-    /// 描 述：会议室管理
+    /// 日 期：2021-02-21 10:07
+    /// 描 述：会议管理
     /// </summary>
     public class MeetingManagementController : MvcControllerBase
     {
         private MeetingManagementIBLL meetingManagementIBLL = new MeetingManagementBLL();
 
-        #region  视图功能
+        #region 视图功能
 
         /// <summary>
         /// 主页面
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,15 +36,43 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页-查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面-我申请的会议
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfMyApply()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面-我申请的会议
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfMyJoin()
+        {
+            return View();
         }
         #endregion
 
-        #region  获取数据
+        #region 获取数据
 
         /// <summary>
-        /// 获取页面显示列表数据
+        /// 获取页面显示列表分页数据
         /// <summary>
+        /// <param name="pagination">分页参数</param>
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         [HttpGet]
@@ -62,6 +91,18 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return Success(jsonData);
         }
         /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingManagementIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
         /// 获取表单数据
         /// <summary>
         /// <returns></returns>
@@ -69,15 +110,31 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity( keyValue );
-            var jsonData = new {
+            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity(keyValue);
+            var jsonData = new
+            {
+                MeetingManagement = MeetingManagementData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntityByProcessId(processId);
+            var jsonData = new
+            {
                 MeetingManagement = MeetingManagementData,
             };
             return Success(jsonData);
         }
         #endregion
 
-        #region  提交数据
+        #region 提交数据
 
         /// <summary>
         /// 删除实体数据
@@ -101,10 +158,41 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            UserInfo userInfo = LoginUserInfo.Get();
             MeetingManagementEntity entity = strEntity.ToObject<MeetingManagementEntity>();
-            meetingManagementIBLL.SaveEntity(keyValue,entity);
+            entity.CreateUser = userInfo.userId;
+            entity.CreateTime = DateTime.Now;
+            entity.CheckStatus = "0";
+            meetingManagementIBLL.SaveEntity(userInfo, keyValue, entity);
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 审核实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoCheck(string keyValue, string status)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            meetingManagementIBLL.DoCheck(userInfo, keyValue, status);
+            return Success("操作成功！");
+        }
+
+        /// <summary>
+        /// 提交实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSubmit(string keyValue, string status, string processId)
+        {
+            meetingManagementIBLL.DoSubmit(keyValue, status, processId);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs

@@ -0,0 +1,128 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议纪要
+    /// </summary>
+    public class MeetingMinutesController : MvcControllerBase
+    {
+        private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = meetingMinutesIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingMinutesIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue );
+            var jsonData = new {
+                MeetingMinutes = MeetingMinutesData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingMinutesIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            MeetingMinutesEntity entity = strEntity.ToObject<MeetingMinutesEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUser = userInfo.userId;
+            meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingNoticeController.cs

@@ -0,0 +1,128 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-08 10:36
+    /// 描 述：会议通知
+    /// </summary>
+    public class MeetingNoticeController : MvcControllerBase
+    {
+        private MeetingNoticeIBLL meetingNoticeIBLL = new MeetingNoticeBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = meetingNoticeIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingNoticeIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingNoticeData = meetingNoticeIBLL.GetMeetingNoticeEntity( keyValue );
+            var jsonData = new {
+                MeetingNotice = MeetingNoticeData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingNoticeIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get();
+            MeetingNoticeEntity entity = strEntity.ToObject<MeetingNoticeEntity>();
+            entity.CreateTime = DateTime.Now;
+            entity.CreateUser = userInfo.userId;
+            meetingNoticeIBLL.SaveEntity(userInfo,keyValue,entity);
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingSignInRecordController.cs

@@ -0,0 +1,138 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-02-21 10:16
+    /// 描 述：会议签到记录
+    /// </summary>
+    public class MeetingSignInRecordController : MvcControllerBase
+    {
+        private MeetingSignInRecordIBLL meetingSignInRecordIBLL = new MeetingSignInRecordBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表分页数据
+        /// <summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = meetingSignInRecordIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList(string queryJson)
+        {
+            var data = meetingSignInRecordIBLL.GetList(queryJson);
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var MeetingSignInRecordData = meetingSignInRecordIBLL.GetMeetingSignInRecordEntity(keyValue);
+            var jsonData = new
+            {
+                MeetingSignInRecord = MeetingSignInRecordData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            meetingSignInRecordIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            UserInfo userInfo = LoginUserInfo.Get(); MeetingSignInRecordEntity entity = strEntity.ToObject<MeetingSignInRecordEntity>();
+            meetingSignInRecordIBLL.SaveEntity(userInfo, keyValue, entity);
+            return Success("保存成功！");
+        }
+
+        /// <summary>
+        /// 签到实体数据
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DoSignIn(string keyValue, bool isSignIn)
+        {
+            meetingSignInRecordIBLL.DoSignIn(keyValue, isSignIn);
+            return Success("操作成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.cshtml

@@ -3,25 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">名称</div>
-        <input id="Name" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">场地名称<font face="宋体">*</font></div>
+        <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
-        <div class="lr-form-item-title">地点</div>
-        <input id="Address" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">地点<font face="宋体">*</font></div>
+        <input id="Address" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">状态</div>
-        <input id="Status" type="text" class="form-control"  />
+        <div id="Status"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">可容纳人数</div>
-        <input id="Scale" type="text" class="form-control"  />
+        <input id="Scale" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ConferenceRoom" >
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ConferenceRoom">
+        <div class="lr-form-item-title">添加时间<font face="宋体">*</font></div>
+        <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#CreateTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Form.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.cshtml

@@ -11,12 +11,12 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">名称</div>
+                                    <div class="lr-form-item-title">场地名称</div>
                                     <input id="Name" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">状态</div>
-                                    <input id="Status" type="text" class="form-control" />
+                                    <div id="Status"></div>
                                 </div>
                             </div>
                         </div>
@@ -31,6 +31,10 @@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_enable" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;启用</a>
+                        <a id="lr_disable" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;禁用</a>
+                    </div>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ConferenceRoom/Index.js

@@ -16,18 +16,19 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $("#Status").lrDataItemSelect({ code: 'EnableStatus' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
+                learun.layerForm({
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +42,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -53,9 +54,45 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 启用
+            $('#lr_enable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == "1") {
+                        learun.alert.warning("当前项已启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "1" }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 禁用
+            $('#lr_disable').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != "1") {
+                        learun.alert.warning("当前项未启用！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认禁用该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/DoEnable', { keyValue: keyValue, status: "0" }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -68,20 +105,25 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetPageList',
                 headData: [
-                    { label: "名称", name: "Name", width: 100, align: "left"},
-                    { label: "地点", name: "Address", width: 100, align: "left"},
-                    { label: "状态", name: "Status", width: 100, align: "left"},
-                    { label: "可容纳人数", name: "Scale", width: 100, align: "left"},
-                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                    { label: "场地名称", name: "Name", width: 200, align: "left" },
+                    { label: "地点", name: "Address", width: 200, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == 1 ? "启用" : "禁用";
+                        }
+                    },
+                    { label: "可容纳人数", name: "Scale", width: 100, align: "left" },
+                    { label: "添加时间", name: "CreateTime", width: 100, align: "left" },
                 ],
-                mainId:'ID',
-                isPage: true
+                mainId: 'ID',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.cshtml

@@ -1,31 +1,55 @@
 @{
-    ViewBag.Title = "会议室管理";
+    ViewBag.Title = "会议管理";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议室<font face="宋体">*</font></div>
-        <input id="MeetingName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="MeetingTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">预约时间<font face="宋体">*</font></div>
-        <input id="OrderTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#OrderTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校内参入人员<font face="宋体">*</font></div>
+        <div id="InternalParticipants"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">使用时间</div>
-        <input id="UseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#UseTime').trigger('change'); } })"   />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校外参入人员</div>
+        <textarea class="form-control" id="ExternalParticipants" placeholder="多个参与人员用英文半角逗号分隔"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">纪要记录人</div>
-        <input id="RecordPerson" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议场地<font face="宋体">*</font></div>
+        <div id="MeetingPlace" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">会议纪要</div>
-        <textarea id="Content" class="form-control" style="height:100px;"  ></textarea>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#BeginTime').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="MeetingManagement" >
-        <div class="lr-form-item-title">附件</div>
-        <div id="Files"  ></div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#EndTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议记录者</div>
+        <div id="RecordPerson"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+        <textarea class="form-control" id="Content" style="height:150px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+            <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+            <div id="Content" style="height:150px;" isvalid="yes" checkexpession="NotNull"></div>
+        </div>*@
+    @*<div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+            <div class="lr-form-item-title">附件上传</div>
+            <div id="Files"></div>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系人<font face="宋体">*</font></div>
+        <input id="Linkman" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Form.js

@@ -1,13 +1,41 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2020-03-23 15:04
- * 描  述：会议室管理
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
  */
 var acceptClick;
 var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+
 var bootstrap = function ($, learun) {
     "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
@@ -15,7 +43,16 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Files').lrUploader();
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#RecordPerson').lrUserSelect(0);
+            //var ContentUE =  UE.getEditor('Content');
+            //$('#Content')[0].ue =  ContentUE;            $('#Files').lrUploader();
+            $('#InternalParticipants').lrUserSelect(1);
         },
         initData: function () {
             if (!!keyValue) {
@@ -32,18 +69,45 @@ var bootstrap = function ($, learun) {
             }
         }
     };
-    // 保存数据
-    acceptClick = function (callBack) {
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'MeetingManagement' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
         if (!$('body').lrValidform()) {
             return false;
         }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
         var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
+            strEntity: JSON.stringify(formData)
         };
         $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
-                callBack();
+                callBack(res, i);
             }
         });
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.cshtml

@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<script src="~/Content/jquery/qrcode.min.js"></script>
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议主题<font face="宋体">*</font></div>
+        <input id="MeetingTitle" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校内参入人员<font face="宋体">*</font></div>
+        <div id="InternalParticipants"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">校外参入人员</div>
+        <textarea class="form-control" readonly="readonly" id="ExternalParticipants" placeholder="多个参与人员用英文半角逗号分隔"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议场地<font face="宋体">*</font></div>
+        <div id="MeetingPlace" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议开始时间<font face="宋体">*</font></div>
+        <input id="BeginTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议结束时间<font face="宋体">*</font></div>
+        <input id="EndTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议记录者</div>
+        <div id="RecordPerson" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">会议内容<font face="宋体">*</font></div>
+        <textarea class="form-control" id="Content" style="height:150px;" readonly="readonly" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系人<font face="宋体">*</font></div>
+        <input id="Linkman" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
+        <input id="LinkPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="MeetingManagement">
+        <div class="lr-form-item-title">扫码签到</div>
+        <div id="qrCode"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js

@@ -0,0 +1,123 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#RecordPerson').lrUserSelect(0);
+            $('#InternalParticipants').lrUserSelect(1);
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                        //扫码签到
+                        makeCode(data[id].Id);           
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'MeetingManagement' && data[id]) {
+                            keyValue = data[id].Id;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}
+//扫码签到
+var qrcode = new QRCode(document.getElementById("qrCode"), {
+        width: 150,
+        height: 150
+    });
+function makeCode(urls) {
+        qrcode.makeCode(urls);
+    }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml

@@ -1,8 +1,10 @@
 @{
-    ViewBag.Title = "会议室管理";
+    /**/
+
+    ViewBag.Title = "会议管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div class="lr-layout "  >
+<div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
@@ -11,8 +13,16 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">会议室</div>
-                                    <input id="MeetingName" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">会议主题</div>
+                                    <input id="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议场地</div>
+                                    <div id="MeetingPlace"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="CreateUser"></div>
                                 </div>
                             </div>
                         </div>
@@ -23,9 +33,18 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
+                        <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
+                        <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
+                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.js

@@ -1,12 +1,13 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
- * Copyright (c) 2013-2018 北京泉江科技有限公司 
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
- * 日  期：2020-03-23 15:04
- * 描  述：会议室管理
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var processId = '';
     var page = {
         init: function () {
             page.initGird();
@@ -16,20 +17,36 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#CreateUser').lrUserSelect(0);
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
             // 新增
             $('#lr_add').on('click', function () {
-               learun.layerForm({
-                    id: 'form',
+                learun.layerForm({
+                    id: 'addform',
                     title: '新增',
                     url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
-                    width: 600,
-                    height: 400,
+                    width: 1000,
+                    height: 800,
                     callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
                     }
                 });
             });
@@ -37,14 +54,31 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
                     learun.layerForm({
-                        id: 'form',
+                        id: 'editform',
                         title: '编辑',
                         url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 1000,
+                        height: 800,
                         callBack: function (id) {
-                            return top[id].acceptClick(refreshGirdData);
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
                         }
                     });
                 }
@@ -53,9 +87,115 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('Id');
                 if (learun.checkrow(keyValue)) {
-                   learun.layerConfirm('是否确认删除该项！', function (res) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已审核或审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '查看会议工作',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 考勤
+            // 纪要
+            $('#lr_minutes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingMinutesIndex',
+                        title: '会议纪要',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn:null
+                    });
+                }
+            });
+            // 通知
+            $('#lr_notice').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'MeetingNoticeIndex',
+                        title: '会议通知',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingNotice/Index?MeetID=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            // 审核通过
+            $('#lr_checkyes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '1') {
+                        learun.alert.warning("该项已审核通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_checkno').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '2') {
+                        learun.alert.warning("该项已审核不通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -68,24 +208,81 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList',
                 headData: [
-                    { label: "会议室", name: "MeetingName", width: 100, align: "left"},
-                    { label: "预约时间", name: "OrderTime", width: 130, align: "left"},
-                    { label: "使用时间", name: "UseTime", width: 130, align: "left"},
-                    { label: "纪要记录人", name: "RecordPerson", width: 100, align: "left"},
-                    { label: "会议纪要", name: "Content", width: 100, align: "left"},
-                    { label: "附件", name: "Files", width: 100, align: "left"},
+                    { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" },
+                    { label: "开始时间", name: "BeginTime", width: 120, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 120, align: "left" },
+                    {
+                        label: "会议记录者", name: "RecordPerson", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系人", name: "Linkman", width: 100, align: "left" },
+                    { label: "联系电话", name: "LinkPhone", width: 100, align: "left" },
+                    {
+                        label: "申请人", name: "CreateUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "CreateTime", width: 120, align: "left" },
+                    {
+                        label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已通过</span>" : cellvalue == "2" ? "<span class=\"label label-danger\">未通过</span>" : cellvalue == "3" ? "<span class=\"label label-warning\">审核中</span>" : "<span class=\"label label-default\">未审核</span>";
+                        }
+                    },
+                    {
+                        label: "审核人", name: "CheckUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    //callback(_data.name);
+                                    return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) {
+                            return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value;
+                        }
+                    },
                 ],
-                mainId:'Id',
-                isPage: true
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
-    refreshGirdData = function () {
+    refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+        }
         page.search();
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml

@@ -0,0 +1,55 @@
+@{
+    /**/
+
+    ViewBag.Title = "会议管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议主题</div>
+                                    <input id="MeetingTitle" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">会议场地</div>
+                                    <div id="MeetingPlace"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">申请人</div>
+                                    <div id="CreateUser"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;查看</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_attendance" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;考勤</a>
+                        <a id="lr_minutes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;纪要</a>
+                        <a id="lr_notice" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;通知</a>
+                        <a id="lr_checkyes" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核通过</a>
+                        <a id="lr_checkno" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核不通过</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js

@@ -0,0 +1,264 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-02-21 10:07
+ * 描  述：会议管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#MeetingPlace').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/ConferenceRoom/GetList',
+                value: "ID",
+                text: "Name"
+            });
+            $('#CreateUser').lrUserSelect(0);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'addform',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form',
+                    width: 1000,
+                    height: 800,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
+                    learun.layerForm({
+                        id: 'editform',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/Form?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus != "0") {
+                        learun.alert.warning("当前项已审核或审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'viewform',
+                        title: '查看会议工作',
+                        url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == "1") {
+                        learun.alert.warning("当前项已审核通过！");
+                        return false;
+                    } else if (CheckStatus == "3") {
+                        learun.alert.warning("当前项审核中！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            processId = learun.newGuid();
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoSubmit', { keyValue: keyValue, status: '3', processId: processId }, function (res) {
+                                refreshGirdData(res, {});
+                            });
+                        }
+                    });
+                }
+            });
+            // 考勤
+            // 纪要
+            // 通知
+            // 审核通过
+            $('#lr_checkyes').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '1') {
+                        learun.alert.warning("该项已审核通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 审核不通过
+            $('#lr_checkno').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckStatus = $('#gridtable').jfGridValue('CheckStatus');
+                    if (CheckStatus == '2') {
+                        learun.alert.warning("该项已审核不通过！");
+                        return false;
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/DoCheck', { keyValue: keyValue, status: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/MeetingManagement/GetPageList',
+                headData: [
+                    { label: "会议主题", name: "MeetingTitle", width: 150, align: "left" },
+                    { label: "会议场地", name: "ConferenceRoomName", width: 100, align: "left" },
+                    { label: "开始时间", name: "BeginTime", width: 120, align: "left" },
+                    { label: "结束时间", name: "EndTime", width: 120, align: "left" },
+                    {
+                        label: "会议记录者", name: "RecordPerson", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "联系人", name: "Linkman", width: 100, align: "left" },
+                    { label: "联系电话", name: "LinkPhone", width: 100, align: "left" },
+                    {
+                        label: "申请人", name: "CreateUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "申请时间", name: "CreateTime", width: 120, align: "left" },
+                    {
+                        label: "会议状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已通过</span>" : cellvalue == "2" ? "<span class=\"label label-danger\">未通过</span>" : cellvalue == "3" ? "<span class=\"label label-warning\">审核中</span>" : "<span class=\"label label-default\">未审核</span>";
+                        }
+                    },
+                    {
+                        label: "审核人", name: "CheckUser", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    //callback(_data.name);
+                                    return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "审核时间", name: "CheckTime", width: 120, align: "left", formatter: function (value, row) {
+                            return row.CheckStatus != "1" && row.CheckStatus != "2" ? "" : value;
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.CreateUser = learun.clientdata.get(['userinfo']).userId;
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (res && res.code && res.code == 200) {
+            // 发起流程
+            var postData = {
+                schemeCode: 'MeetingManagementApply',// 填写流程对应模板编号
+                processId: processId,
+                level: '1',
+            };
+            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                learun.loading(false);
+            });
+        }
+        page.search();
+    };
+    page.init();
+}