Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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

@@ -15,17 +15,17 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' }); 
+            $('#Formula').lrDataSourceSelect({ code: 'FormulaMain', value: 'id', text: 'name' });
             $('#Formula').lrGirdSelect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
                 selectWord: 'name',
                 value: 'id',
                 text: 'name',
                 headData:
-                [
-                    { label: "公式", name: "result", width: 300, align: "left" },
-                    { label: "公式名称", name: "name", width: 300, align: "left" }
-                ],
+                    [
+                        { label: "公式", name: "result", width: 300, align: "left" },
+                        { label: "公式名称", name: "name", width: 300, align: "left" }
+                    ],
                 select: function (item) {
                 }
             });
@@ -41,12 +41,17 @@ var bootstrap = function ($, learun) {
                     if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 3) {
                         $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' });
                     } else if (Cycles != null && Cycles != "" && Cycles != undefined && Cycles == 2) {
-                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                        $('#FillingTime').lrDataItemSelect({
+                            code: 'CycleTime',
+                            maxHeight: 200,
+                        });
+                        //$('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     } else {
                         $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
                     }
                 }
             });
+            $('#lrselect').lrselect();
         },
         initData: function () {
             if (!!keyValue) {
@@ -63,7 +68,6 @@ var bootstrap = function ($, learun) {
             }
             $('#State').val('0');
             $('#IsFlag').val('0');
-            $('#IsDel').val('0'); 
         }
     };
     // 保存数据