From 70f582888c6e04cd9494f12e3f94e0a44d533084 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Thu, 3 Jun 2021 18:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E8=AE=B0=E5=9C=A8?= =?UTF-8?q?=E5=86=8C=E8=B5=84=E4=BA=A7=E3=80=81=E8=B5=84=E4=BA=A7=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AssScrap/Index.js | 8 +++++-- .../Views/Ass_AssetsInfo/Index.js | 2 +- .../Views/Ass_Inventory/Index.js | 6 ++++- .../Views/Ass_UserChangeInfo/Form.cshtml | 24 +++++++++---------- .../Views/Ass_UserChangeInfo/Form.js | 6 +++-- .../Views/Ass_UserChangeInfo/Index.cshtml | 8 +++---- .../Views/Ass_UserChangeInfo/Index.js | 10 ++++---- 7 files changed, 38 insertions(+), 26 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js index 2dd0e32e2..be6e9795c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.js @@ -5,6 +5,7 @@ * 描 述：资产报废 */ var refreshGirdData; +var refreshGirdData1; var bootstrap = function ($, learun) { "use strict"; var processId = ''; @@ -88,7 +89,7 @@ var bootstrap = function ($, learun) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/AssScrap/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); + refreshGirdData1(); }); } }); @@ -184,7 +185,7 @@ var bootstrap = function ($, learun) { } }; refreshGirdData = function (res, postData) { - if (res.code == 200) { + if (res && res.code == 200) { // 发起流程 var postData = { schemeCode: 'Ass_Scrap',// 填写流程对应模板编号 @@ -198,5 +199,8 @@ var bootstrap = function ($, learun) { page.search(); } }; + refreshGirdData1 = function () { + page.search(); + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js index cd1273b0d..a30ecf7dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Index.js @@ -70,7 +70,7 @@ var bootstrap = function ($, learun) { id: 'form', title: '资产明细', url: top.$.rootUrl + '/AssetManagementSystem/Ass_AssetsInfoItem/Index?AId=' + keyValue, - width: 1000, + width: 1100, height: 700, btn: null, end: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Index.js index 5fdac3130..1e7712e00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Inventory/Index.js @@ -5,6 +5,7 @@ * 描 述：资产盘点 */ var refreshGirdData; +var refreshGirdData1; var bootstrap = function ($, learun) { "use strict"; var processId = ''; @@ -87,7 +88,7 @@ var bootstrap = function ($, learun) { learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Inventory/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); + refreshGirdData1(); }); } }); @@ -181,5 +182,8 @@ var bootstrap = function ($, learun) { page.search(); } }; + refreshGirdData1 = function () { + page.search(); + }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.cshtml index 94b3243ec..31582daec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.cshtml @@ -2,22 +2,22 @@ ViewBag.Title = "使用人员变动记录"; Layout = "~/Views/Shared/_Form.cshtml"; } -
-
+
+
明细ID
- +
-
-
使用人员ID
- +
+
使用人员
+
-
+
修改时间
- -
-
-
操作人
-
+
+ @*
+
操作人
+
+
*@
@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js index 3c0688582..5d4a2eaa4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js @@ -10,12 +10,14 @@ var bootstrap = function ($, learun) { "use strict"; var page = { init: function () { - $('.lr-form-wrap').lrscroll(); + $('.lr-form-wrap').lrscroll(); page.bind(); page.initData(); }, bind: function () { - $('#UCEditer').lrDataItemSelect({ code: '' }); + $('#UserID').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + //$('#UCEditer').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + $('#AIID').lrDataSourceSelect({ code: 'Ass_AssetsInfoItem', value: 'aiid', text: 'aicode' }); }, initData: function () { if (!!keyValue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.cshtml index c02680282..2a0354cbd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.cshtml @@ -14,12 +14,12 @@
-
明细ID
- +
明细编号
+
-
使用人员ID
- +
使用人员
+
操作人
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js index 47f0558aa..e27ffb22c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.js @@ -46,7 +46,9 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - $('#UCEditer').lrDataItemSelect({ code: '' }); + $('#UserID').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + $('#UCEditer').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + $('#AIID').lrDataSourceSelect({ code: 'Ass_AssetsInfoItem', value: 'aiid', text: 'aicode' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -98,13 +100,13 @@ var bootstrap = function ($, learun) { key: value, keyId: 'aiid', callback: function (_data) { - callback(_data['aiassname']); + callback(_data['aicode']); } }); } }, { - label: "使用者", name: "UserID", width: 100, align: "left", + label: "使用人员", name: "UserID", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', @@ -116,7 +118,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "修改时间", name: "UCChangeTime", width: 100, align: "left"}, + { label: "修改时间", name: "UCChangeTime", width: 200, align: "left"}, { label: "操作人", name: "UCEditer", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {