From 42cb12e0a2b5125a8bde87c372170e1de367f16d Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 28 Feb 2023 17:31:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoItem/Form.cshtml | 4 +- .../Views/Ass_AssetsInfoItem/Index.js | 96 +++++++++---------- .../Views/Ass_AssetsInfoItem/IndexOfMy.js | 86 ++++++++--------- .../Views/Ass_UserChangeInfo/Form.cshtml | 14 +-- .../Views/Ass_UserChangeInfo/Form.js | 2 +- .../Views/Ass_UserChangeInfo/Index.cshtml | 8 +- .../Views/Ass_UserChangeInfo/Index.js | 2 +- 7 files changed, 106 insertions(+), 106 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml index 83a11a01a..2fa326bc7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Form.cshtml @@ -29,14 +29,14 @@
所在库位
- @*
+
报废时间*
报废提示时间*
-
*@ +
资产编号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js index f43014606..669479766 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js @@ -265,54 +265,54 @@ var bootstrap = function ($, learun) { } }, { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" }, - //{ - // label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) { - - // if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) { - // var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/")); - // var nowDate = new Date(); - // var timerange = datedifference(nowDate, validDate2); - // console.log(timerange); - // if (validDate2 > nowDate && timerange > 0) { - // switch (row.ScrapRemindTime) { - // case 0: - // if (timerange < 30) { - // return '' + validDate2.Format("yyyy-MM-dd") + ''; - // } else { - // return '' + validDate2.Format("yyyy-MM-dd") + ''; - // } - // case 1: - // if (timerange >= 30 && timerange < 90) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } - // case 2: - // if (timerange >= 90 && timerange < 180) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } - // case 3: - // if (timerange >= 180 && timerange < 360) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } - - // default: - // } - - // } else { - // return '已报废'; - - // } - // } else { - // return '未设置'; - // } - - // } - //}, + { + label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) { + + if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) { + var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/")); + var nowDate = new Date(); + var timerange = datedifference(nowDate, validDate2); + console.log(timerange); + if (validDate2 > nowDate && timerange > 0) { + switch (row.ScrapRemindTime) { + case 0: + if (timerange < 30) { + return '' + validDate2.Format("yyyy-MM-dd") + ''; + } else { + return '' + validDate2.Format("yyyy-MM-dd") + ''; + } + case 1: + if (timerange >= 30 && timerange < 90) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } + case 2: + if (timerange >= 90 && timerange < 180) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } + case 3: + if (timerange >= 180 && timerange < 360) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } + + default: + } + + } else { + return '已报废'; + + } + } else { + return '未设置'; + } + + } + }, { label: "资产型号", name: "AISpecificationtype", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js index 75f18e3e8..e6c9e12e9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/IndexOfMy.js @@ -225,54 +225,54 @@ var bootstrap = function ($, learun) { } }, { label: "所在库位", name: "AIIStoragePosition", width: 100, align: "left" }, - //{ - // label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) { + { + label: "报废时间", name: "AIIStoragePosition", width: 100, align: "left", formatter: function (cellvalue, row) { - // if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) { - // var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/")); - // var nowDate = new Date(); - // var timerange = datedifference(nowDate, validDate2); - // console.log(timerange); - // if (validDate2 > nowDate && timerange > 0) { - // switch (row.ScrapRemindTime) { - // case 0: - // if (timerange < 30) { - // return '' + validDate2.Format("yyyy-MM-dd") + ''; - // } else { - // return '' + validDate2.Format("yyyy-MM-dd") + ''; - // } - // case 1: - // if (timerange >= 30 && timerange < 90) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } - // case 2: - // if (timerange >= 90 && timerange < 180) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } - // case 3: - // if (timerange >= 180 && timerange < 360) { - // return '' + row.AScrapTime + ''; - // } else { - // return '' + row.AScrapTime + ''; - // } + if (!!row.AScrapTime && row.ScrapRemindTime > (-1)) { + var validDate2 = new Date(row.AScrapTime.replace(/-/g, "/")); + var nowDate = new Date(); + var timerange = datedifference(nowDate, validDate2); + console.log(timerange); + if (validDate2 > nowDate && timerange > 0) { + switch (row.ScrapRemindTime) { + case 0: + if (timerange < 30) { + return '' + validDate2.Format("yyyy-MM-dd") + ''; + } else { + return '' + validDate2.Format("yyyy-MM-dd") + ''; + } + case 1: + if (timerange >= 30 && timerange < 90) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } + case 2: + if (timerange >= 90 && timerange < 180) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } + case 3: + if (timerange >= 180 && timerange < 360) { + return '' + row.AScrapTime + ''; + } else { + return '' + row.AScrapTime + ''; + } - // default: - // } + default: + } - // } else { - // return '已报废'; + } else { + return '已报废'; - // } - // } else { - // return '未设置'; - // } + } + } else { + return '未设置'; + } - // } - //}, + } + }, { label: "资产型号", name: "AISpecificationtype", width: 100, align: "left" }, 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..8705eee8a 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 @@ -3,21 +3,21 @@ 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..8f2c9e0e1 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 @@ -15,7 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#UCEditer').lrDataItemSelect({ code: '' }); + $('#UserID').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); }, 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..4685fb3ba 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 @@ -11,7 +11,7 @@
-
+ @*
明细ID
@@ -26,7 +26,7 @@
-
+
*@
@@ -34,8 +34,8 @@
-  编辑 -  删除 + @* 编辑 +  删除*@  打印
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 ae43a37f5..434503e93 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 @@ -98,7 +98,7 @@ var bootstrap = function ($, learun) { key: value, keyId: 'aiid', callback: function (_data) { - callback(_data['aiassname']); + callback(_data['aicode']); } }); }