From ade19595bec5ae5463659023b327e57bcb9de10c Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Mon, 20 Jun 2022 15:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/MeetingManagement/FormView.js       | 17 ++++--------
 .../Views/MeetingManagement/Index.cshtml      |  4 +--
 .../MeetingManagement/IndexOfMyApply.cshtml   |  6 ++---
 .../Views/MeetingManagement/IndexOfMyApply.js | 27 ++++++++++++++++++-
 .../MeetingManagement/IndexOfMyJoin.cshtml    | 10 +++----
 .../Views/MeetingManagement/IndexOfMyJoin.js  | 27 ++++++++++++++++++-
 6 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js
index 5e536ad42..e4cbd9c77 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/FormView.js	
@@ -97,19 +97,12 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     save = function (processId, callBack, i) {
-        var formData = $('body').lrGetFormData();
-        if (!!processId) {
-            formData.ProcessId = processId;
+        if (!!callBack) {
+            var res = {
+                code: 200, data: {}
+            };
+            callBack(res, i);
         }
-        var postData = {
-            strEntity: JSON.stringify(formData)
-        };
-        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack(res, i);
-            }
-        });
     };
     page.init();
 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml
index 3cb8f5afb..a4883b7a1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/Index.cshtml	
@@ -43,8 +43,8 @@
                         <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>
+                        @*<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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml
index baa5705a1..bfa3910b4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.cshtml	
@@ -40,11 +40,11 @@
                         <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_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>
+                        @*<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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js
index 9be3e8340..feb9eba1a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyApply.js	
@@ -137,9 +137,34 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 考勤
             // 纪要
+            $('#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');
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml
index c8488f576..5ea78d88c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.cshtml	
@@ -33,18 +33,14 @@
                         <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_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>
+                        @*<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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js
index 948a840f0..61269160b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingManagement/IndexOfMyJoin.js	
@@ -137,9 +137,34 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
-            // 考勤
             // 纪要
+            $('#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');