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

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

@@ -24,7 +24,7 @@ var bootstrap = function ($, learun) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/BookBorrow/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
@@ -39,6 +39,11 @@ var bootstrap = function ($, learun) {
         if (!$('body').lrValidform()) {
             return false;
         }
+        var Amount = $('#Amount').val();
+        if (Amount <= 0 || Math.floor(Amount) !== Amount) {
+            learun.alert.warning('数量请输入大于0的整数！');
+            return false;
+        }
         var postData = {
             strEntity: JSON.stringify($('body').lrGetFormData())
         };

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

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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -22,7 +22,7 @@ export default {
   // ],
   "apiHost": [
     // "http://cyzjzx.gnway.cc:31218/"//测试地址接口
-	// "http://api.cyzjzx.com/"//正式地址接口
+	// "http://219.139.155.38:8687/"//正式地址接口
 	 "http://192.168.10.175:8088/"
   ],
   // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址