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

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

@@ -23,7 +23,7 @@
         <div class="lr-form-item-title">填报周期<font face="宋体">*</font></div>
         <div id="FillingCycle" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom" id="TimeHide">
         <div class="lr-form-item-title">填报时间</div>
         <div id="FillingTime1"></div>
         <div id="FillingTime2"></div>

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

@@ -38,23 +38,21 @@ var bootstrap = function ($, learun) {
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
                     if (Cycles == 3) {
+                        $('#TimeHide').show();
                         $('#FillingTime1').show();
                         $('#FillingTime2').hide();
                         $('#FillingTime1').lrDataItemSelect({
                             code: 'CycleTime'
                         });
                     } else if (Cycles == 2) {
+                        $('#TimeHide').show();
                         $('#FillingTime1').hide();
-                        //$('#FillingTime1').lrDataItemSelect({ code: 'undefined' });
                         $('#FillingTime2').show();
-                        //$('#FillingTime2').lrDataItemSelect({
-                        //    type: 'multiple',
-                        //    code: 'CycleTime'
-                        //});
                     } else if (Cycles == 1) {
-                        $('#FillingTime1').show();
-                        $('#FillingTime2').hide();
-                        $('#FillingTime1').lrDataItemSelect({ code: 'undefined' });
+                        //$('#FillingTime1').hide();
+                        //$('#FillingTime2').hide();
+                        //$('#FillingTime1').lrDataItemSelect({ code: 'undefined' });
+                        $('#TimeHide').hide();
                     }
                 }
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormPeople.cshtml

@@ -23,9 +23,10 @@
         <div class="lr-form-item-title">填报周期<font face="宋体">*</font></div>
         <div id="FillingCycle" readonly="readonly"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
+    <div class="col-xs-6 lr-form-item" data-table="FillinFrom" id="TimeHide">
         <div class="lr-form-item-title">填报时间</div>
-        <div id="FillingTime" readonly="readonly"></div>
+        <div id="FillingTime1" readonly="readonly"></div>
+        <div id="FillingTime2" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
         <div class="lr-form-item-title">填&nbsp;&nbsp;报&nbsp;&nbsp;人<font face="宋体">*</font></div>

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

@@ -55,16 +55,30 @@ var bootstrap = function ($, learun) {
                 code: 'ThisCycle',
                 select: function (item) {
                     var Cycles = $("#FillingCycle").lrselectGet();
-                    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' });
-                    }
-                    else {
-                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                    if (Cycles == 3) {
+                        $('#TimeHide').show();
+                        $('#FillingTime1').show();
+                        $('#FillingTime2').hide();
+                        $('#FillingTime1').lrDataItemSelect({
+                            code: 'CycleTime'
+                        });
+                    } else if (Cycles == 2) {
+                        $('#TimeHide').show();
+                        $('#FillingTime1').hide();
+                        $('#FillingTime2').show();
+                    } else if (Cycles == 1) {
+                        $('#TimeHide').hide();
+                        //$('#FillingTime1').hide();
+                        //$('#FillingTime2').hide();
                     }
                 }
             });
+            $('#FillingTime1').lrselect();
+            $('#FillingTime2').lrDataItemSelect({
+                type: 'multiple',
+                code: 'CycleTime'
+            });
+            $('#FillingTime2').hide();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
                         return false;
                     }
                     if (IsFlag == 1) {
-                        learun.alert.warning("当前项已作废,不能提交！");
+                        learun.alert.warning("当前项已隐藏,不能提交！");
                         return false;
                     }
                 }