Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs

@@ -217,9 +217,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <returns></returns>
         public ActionResult ModifyStatus(string keyValue, int pastatus, string processId)
         {
-            //var userInfo = LoginUserInfo.Get();
-            //var RealName = userInfo.realName;
-            dispatchIBLL.ModifyStatus(keyValue, pastatus, processId);
+            var userInfo = LoginUserInfo.Get();
+            var RealName = userInfo.realName;
+            dispatchIBLL.ModifyStatus(keyValue, pastatus, processId, RealName);
             return Success("提交成功！");
         }
 

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

@@ -231,13 +231,6 @@ var bootstrap = function ($, learun) {
                                         $.each(res.data, function (i, item) {
                                             bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
                                         })
-                                        //$.each(res.data, function(i, item) {
-                                        //    bb += '<span onclick="downLoad(\'' +
-                                        //        item.F_Id +
-                                        //        '\')" style="color:blue">' +
-                                        //        item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
-                                        //        '</span>,&nbsp;&nbsp;&nbsp;';
-                                        //})
                                         callback(bb);
                                     }
                                 });
@@ -306,9 +299,9 @@ var bootstrap = function ($, learun) {
                 processId: processId,
                 level: '1',
             };
-            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
-                learun.loading(false);
-            });
+            //learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+            //    learun.loading(false);
+            //});
             page.search();
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js

@@ -90,7 +90,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/EducationalAdministration/Dispatch/Form?keyValue=' + keyValue + '&WorkName=' + 2 + '&DisOffice=' + 2,
                         width: 800,
                         height: 380,
                         callBack: function (id) {
@@ -232,7 +232,6 @@ var bootstrap = function ($, learun) {
                                         $.each(res.data, function (i, item) {
                                             bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
                                         })
-                                        bb
                                         callback(bb);
                                     }
                                 });
@@ -272,11 +271,12 @@ var bootstrap = function ($, learun) {
             param.EndTime = logend;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },
-        downLoad: function (fileId) {
-            top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
-        }
+        //downLoad: function (fileId) {
+        //    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: fileId, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+        //}
     };
     refreshGirdData = function (res, postData) {
+        console.log("refreshgrid");
         if (res.code == 200) {
             var DisFrom = $('#gridtable').jfGridValue('DisFrom');
             var Reasons = $('#gridtable').jfGridValue('Reasons');
@@ -290,24 +290,24 @@ var bootstrap = function ($, learun) {
                 success: function (res) {
                     var bb = '';
                     $.each(res.data,
-                        function (i, item) {
-                            bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
-                        })
+                        function(i, item) {
+                            bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ',';
+                        });
                     Reasons = bb;
+                    // 发起流程
+                    var postData = {
+                        //schemeCode: 'Dispatch',// 本地
+                        schemeCode: 'XBSW',// 线上
+                        title: "(" + DisFrom + ")  " + Reasons,
+                        processId: processId,
+                        level: '1',
+                    };
+                    learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
+                        learun.loading(false);
+                    });
+                    page.search();
                 }
             });
-            // 发起流程
-            var postData = {
-                //schemeCode: 'Dispatch',// 本地
-                schemeCode: 'XBSW',// 线上
-                title: "(" + DisFrom + ")  " + Reasons,
-                processId: processId,
-                level: '1',
-            };
-            learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function (data) {
-                learun.loading(false);
-            });
-            page.search();
         }
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Print.cshtml

@@ -2,10 +2,22 @@
 <html lang="en">
 
 <head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name=”renderer” content=”webkit|ie-comp|ie-stand” />
+    <meta name="viewport" content="width=device-width" />
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" href="/favicon.ico">
     <title>收文通告</title>
+    <link href="/Content/pace/pace-theme-minimal.css" rel="stylesheet" />
+    <link href="/Content/font/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="/Content/bootstrap/bootstrap.min.css" rel="stylesheet" />
+
+    <script src="/Content/pace/pace.min.js"></script>
+    <script src="/Content/jquery/jquery-1.10.2.min.js"></script>
+    <script src="/Content/bootstrap/bootstrap.min.js"></script>
+    <script src="/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
     <style>
         /*.btn {
             width: 100px;
@@ -85,7 +97,7 @@
         }
 
         .heder {
-            height: 180px;
+            height: 184px;
             width: 90%;
             margin: 0 auto;
             border-top: 2px solid red;
@@ -142,12 +154,12 @@
         .yj {
             width: 90%;
             margin: 0 auto;
-            height: 270px;
+            height: 185px;
             border-bottom: 2px solid red;
         }
 
             .yj div {
-                height: 232px;
+                height: 140px;
             }
 
                 .yj div span {
@@ -171,7 +183,7 @@
         }
 
             .ps div {
-                height: 480px;
+                /*height: 480px;*/
                 border-bottom: 2px solid red;
             }
 
@@ -221,10 +233,17 @@
                 text-indent: 0;
                 text-align: center;
             }
-
+        #mapHeight{
+           height: 650px;
+        }
         #psMain div {
             border: 0;
         }
+        .leftDiv{
+        	float: left;
+        	width: 50%;
+        }
+
     </style>
 </head>
 
@@ -287,14 +306,14 @@
                 </p>
             </div>
             <div class="ps">
-                <div id="mapHeight" style="height: 700px;">
+                <div id="mapHeight">
                     <span>
                         批    <em> 示：</em>
                         <em style="color: #000000" id="psMain">
                             <div style="height: auto;">
                                 @foreach (var item in ViewBag.pSList)
                                 {
-                                    <div style="height: auto;width: 60%;display:inline-block;">
+                                    <div style="" class="leftDiv">
                                         <em style="display: inline-block; height: 30px; line-height: 30px; margin-left: 60px;">@item</em>
                                     </div>
                                 }
@@ -329,6 +348,7 @@
     <script src="~/Content/jquery/jquery-1.10.2.min.js"></script>
     <script src="~/Content/jquery/plugin/fullcalendar/js/jquery-1.7.2.min.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jquery.jqprint-0.3.js"></script>
+    <script src="~/Content/signet/jquery.zsign.js"></script>
     <script>
         //盖章图片
         @*var stampUrl = '/LR_NewWorkFlow/StampInfo/GetImg?keyValue=@ViewBag.StampImg';

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchBLL.cs

@@ -153,11 +153,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="pastatus">审核状态</param>
         /// <param name="processId">流程Id</param>
         /// <returns></returns>
-        public void ModifyStatus(string keyValue, int pastatus, string processId)
+        public void ModifyStatus(string keyValue, int pastatus, string processId,string  RealName)
         {
             try
             {
-                dispatchService.ModifyStatus(keyValue, pastatus, processId);
+                dispatchService.ModifyStatus(keyValue, pastatus, processId, RealName);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchIBLL.cs

@@ -51,8 +51,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void SaveEntity(string keyValue, DispatchEntity entity);
         #endregion
 
-        void ModifyStatus(string keyValue, int pastatus, string processId);
-        //void ModifyStatus(string keyValue, int pastatus, string processId, string RealName);
+        //void ModifyStatus(string keyValue, int pastatus, string processId);
+        void ModifyStatus(string keyValue, int pastatus, string processId, string RealName);
         void ModifyStatusByProcessId(int i, string processId);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Dispatch/DispatchService.cs

@@ -42,6 +42,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
                     strSql.Append(" AND  t.DisFrom like @keyword  ");
                 }
+                if (!queryParam["WorkName"].IsEmpty())
+                {
+                    dp.Add("WorkName", "" + queryParam["WorkName"].ToString() + "", DbType.String);
+                    strSql.Append(" AND  t.WorkName like @WorkName  ");
+                }
                 string beginDate = queryParam["StartTime"].ToString();
                 string endDate = queryParam["EndTime"].ToString();
                 if (!string.IsNullOrEmpty(beginDate) && !string.IsNullOrEmpty(endDate))
@@ -191,13 +196,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         #region 扩展数据
 
-        public void ModifyStatus(string keyValue, int pastatus, string processId)
+        public void ModifyStatus(string keyValue, int pastatus, string processId, string RealName)
         {
             try
             {
                 var entity = this.BaseRepository("CollegeMIS").FindEntity<DispatchEntity>(a => a.Id == keyValue);
-                //entity.CreateUser = RealName;
-                //entity.CreateTime = DateTime.Now;
+                if (pastatus == 1)
+                {
+                    entity.CreateUser = RealName;
+                    entity.CreateTime = DateTime.Now;
+                }
                 entity.processId = processId;
                 entity.FlowNo = pastatus.ToString();
                 this.BaseRepository("CollegeMIS").Update(entity);