Merge branch 'master' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJY.js

@@ -146,18 +146,18 @@ var bootstrap = function ($, learun) {
             $('#lr_viewcg').on('click', function () {
                 var PId = $('#gridtable').jfGridValue('PId');
                 //if (learun.checkrow(PId)) {
-                    if (PId == null || PId === undefined || PId === "") {
-                        learun.alert.warning("当前项目不含采购单！");
-                        return;
-                    }
-                    learun.layerForm({
-                        id: 'formAss_Purchase',
-                        title: '查看采购单',
-                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId,
-                        width: 1000,
-                        height: 600,
-                        btn: null
-                    });
+                if (PId == null || PId === undefined || PId === "") {
+                    learun.alert.warning("当前项目不含采购单！");
+                    return;
+                }
+                learun.layerForm({
+                    id: 'formAss_Purchase',
+                    title: '查看采购单',
+                    url: top.$.rootUrl + '/AssetManagementSystem/Ass_Purchase/FormViewJY?keyValue=' + PId,
+                    width: 1000,
+                    height: 600,
+                    btn: null
+                });
                 //}
             });
             // 删除
@@ -233,8 +233,8 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                    }, 
-                                       {
+                    },
+                    {
                         label: "审批状态", name: "AAStatus", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
@@ -258,13 +258,15 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.AssType = '1';//普通 低值
+            var loginInfo = top.learun.clientdata.get(['userinfo']);
+            param.AACreateUserId = loginInfo.userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function (res, postData) {
         if (res && res.code && res.code == 200) {
             // 发起流程
-            
+
             var postData = {
                 schemeCode: 'Ass_PurchaseApply',// 填写流程对应模板编号 
                 processId: processId,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/IndexJYHC.js

@@ -214,10 +214,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "申请人", name: "AACreateUserId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('user', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
+                                keyId: 'f_account',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
@@ -258,6 +260,8 @@ var bootstrap = function ($, learun) {
             param.StartTime = startTime;
             param.EndTime = endTime;
             param.AssType = '2';//耗材
+            var loginInfo = top.learun.clientdata.get(['userinfo']);
+            param.AACreateUserId = loginInfo.userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Controllers/FormRelationController.cs

@@ -66,7 +66,7 @@ namespace Learun.Application.Web.Areas.LR_FormModule.Controllers
         public ActionResult PreviewIndex(string id)
         {
             string currentUrl = (string)WebHelper.GetHttpItems("currentUrl");
-            currentUrl = currentUrl + "?id=" + id;
+            //currentUrl = currentUrl + "?id=" + id;
             WebHelper.UpdateHttpItem("currentUrl", currentUrl);
 
             return View();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js

@@ -294,7 +294,7 @@ var bootstrap = function ($, learun) {
                 girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewList?keyValue=' + id;
             }
 
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: girdurl,
                 headData: headData,
                 reloadSelected: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.cshtml

@@ -2,7 +2,18 @@
     ViewBag.Title = "流程监控";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
-<div id="lr_layout" class="lr-layout lr-layout-center">
+<div id="lr_layout" class="lr-layout lr-layout-left-center">
+    <div class="lr-layout-left">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle" style="padding-top:10px;">
+            <div class="lr-layout-body">
+                <ul class="lr-left-list" id="lr_left_list">
+                    <li class="active lrlg" data-value="1">未完成</li>
+                    <li data-value="2" class="lrlg">已完成</li>
+                </ul>
+            </div>
+        </div>
+    </div>
+
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle">
             <div class="lr-layout-tool">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/ContractFiling.js

@@ -177,7 +177,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
-            param.categoryId = '2';
+            param.categoryId = categoryId;
             param.F_Category = '合同类';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleBLL.cs

@@ -80,7 +80,10 @@ namespace Learun.Application.Base.SystemModule
             {
                 if (url.Contains("?"))
                 {
-                    url=url.Substring(0, url.IndexOf('?'));
+                    if (!url.Contains("/LR_FormModule/FormRelation/PreviewIndex"))
+                    {
+                        url = url.Substring(0, url.IndexOf('?'));
+                    }
                 }
                 List<ModuleEntity> list = GetModuleList();
                 return list.Find(t => t.F_UrlAddress == url);
@@ -105,7 +108,8 @@ namespace Learun.Application.Base.SystemModule
         {
             List<ModuleEntity> modulelist = GetModuleList();
             List<TreeModel> treeList = new List<TreeModel>();
-            foreach (var item in modulelist) {
+            foreach (var item in modulelist)
+            {
                 TreeModel node = new TreeModel();
                 node.id = item.F_ModuleId;
                 node.text = item.F_FullName;
@@ -263,9 +267,10 @@ namespace Learun.Application.Base.SystemModule
             try
             {
                 List<ModuleButtonEntity> list = cache.Read<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, CacheId.module);
-                if (list == null) {
-                   list = (List<ModuleButtonEntity>)moduleService.GetButtonList(moduleId);
-                   cache.Write<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, list, CacheId.module);
+                if (list == null)
+                {
+                    list = (List<ModuleButtonEntity>)moduleService.GetButtonList(moduleId);
+                    cache.Write<List<ModuleButtonEntity>>(cacheKeyBtn + moduleId, list, CacheId.module);
                 }
                 UserInfo userInfo = LoginUserInfo.Get();
                 /*关联权限*/
@@ -275,7 +280,7 @@ namespace Learun.Application.Base.SystemModule
                     List<string> itemIdList = authorizeIBLL.GetItemIdListByobjectIds(objectIds, 2);
                     list = list.FindAll(t => itemIdList.IndexOf(t.F_ModuleButtonId) >= 0);
                 }
-                return list; 
+                return list;
             }
             catch (Exception ex)
             {
@@ -391,7 +396,7 @@ namespace Learun.Application.Base.SystemModule
                     list = list.FindAll(t => itemIdList.IndexOf(t.F_ModuleColumnId) >= 0);
                 }
 
-                return list; 
+                return list;
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfoApply/Ass_AssetsInfoApplyService.cs

@@ -35,6 +35,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.AAId,
                 t.AACode,
                 t.AAPrice,
+                t.AAAssType,
                 t.AACreateTime,
                 t.AACreateDeptId,
                 t.AACreateUserId,t.AAStatus,