From 0acf7280bbb8851834a4bfce480ccf47f70fb4cd Mon Sep 17 00:00:00 2001
From: edy <edy@LAPTOP-FJ5VQJ6J>
Date: Wed, 30 Jun 2021 18:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E6=97=B6=E9=97=B4=20?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=20=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/FillinFrom/Form.cshtml              |  3 +-
 .../Views/FillinFrom/Form.js                  | 34 +++++++++++++------
 .../Views/FillinFrom/Index.cshtml             |  2 --
 .../Views/FillinFrom/Index.js                 | 30 ++++++++--------
 4 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml
index 5b66f8c15..eab6e7b89 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml	
@@ -25,7 +25,8 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FillinFrom">
         <div class="lr-form-item-title">填报时间</div>
-        <div id="FillingTime"></div>
+        <div id="FillingTime1"></div>
+        <div id="FillingTime2"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="FillinFrom">
         <div class="lr-form-item-title">公&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;式<font face="宋体">*</font></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js
index 5a01ec390..f8db8f5de 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js	
@@ -33,25 +33,37 @@ var bootstrap = function ($, learun) {
             $('#lrPeople').val(learun.clientdata.get(['userinfo']).realName);
             $('#lrTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#FillingDept').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
-            //$('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#FillingCycle').lrDataItemSelect({
                 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: 'CycleTime',
-                            maxHeight: 200,
+                    if (Cycles == 3) {
+                        $('#FillingTime1').show();
+                        $('#FillingTime2').hide();
+                        $('#FillingTime1').lrDataItemSelect({
+                            code: 'CycleTime'
                         });
-                        //$('#FillingTime').lrDataItemSelect({ code: 'undefined' });
-                    } else {
-                        $('#FillingTime').lrDataItemSelect({ code: 'undefined' });
+                    } else if (Cycles == 2) {
+                        $('#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' });
                     }
                 }
             });
-            $('#lrselect').lrselect();
+            $('#FillingTime1').lrselect();
+            $('#FillingTime2').lrDataItemSelect({
+                type: 'multiple',
+                code: 'CycleTime'
+            });
+            $('#FillingTime2').hide();
         },
         initData: function () {
             if (!!keyValue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml
index ac0e39e77..b76e7d410 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.cshtml	
@@ -46,8 +46,6 @@
                             <li id="lr_cancel"><a><i></i>&nbsp;<span class="lrlt">撤回</span></a></li>
                             <li id="lr_people"><a><i></i>&nbsp;<span class="lrlt">设置填报人</span></a></li>
                             <li id="lr_hide"><a><i></i>&nbsp;<span class="lrlt">隐藏/显示</span></a></li>
-                            <li id="lr_import"><a><i></i>&nbsp;<span class="lrlt">导入</span></a></li>
-
                         </ul>
                     </div>
                 </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js
index d7c24c1c0..995d7b376 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js	
@@ -71,20 +71,22 @@ var bootstrap = function ($, learun) {
                         return;
                     }
                     learun.layerConfirm('是否确认修改该项,修改成后会影响数据！', function (res) {
-                        learun.layerForm({
-                            id: 'form',
-                            title: '编辑',
-                            url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue,
-                            width: 600,
-                            height: 400,
-                            callBack: function (id) {
-                                learun.layerConfirm('确定要修改当前项吗！', function (res) {
-                                    if (res) {
-                                        return top[id].acceptClick(refreshGirdData);
-                                    }
-                                })
-                            }
-                        });
+                        if (res) {
+                            learun.layerForm({
+                                id: 'form',
+                                title: '编辑',
+                                url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue,
+                                width: 600,
+                                height: 400,
+                                callBack: function (id) {
+                                    learun.layerConfirm('确定要修改当前项吗！', function (res) {
+                                        if (res) {
+                                            return top[id].acceptClick(refreshGirdData);
+                                        }
+                                    })
+                                }
+                            });
+                        }
                     })
                 }
             });