From f9647664f1bad2fd50e55c450b5f060f9f2cf6f5 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 19 Jul 2021 18:20:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=90=8C=E6=84=8F=E5=90=8E=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E8=B5=84=E4=BA=A7=E6=98=8E=E7=BB=86=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=BB=98=E8=AE=A4=E4=B8=8D=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ass_AssetsInfoItemApplyController.cs | 1 + .../Views/Ass_Acceptance/FormItem.cshtml | 8 ++++---- .../Views/Ass_Acceptance/FormItem.js | 1 + .../Views/Ass_AssetsInfoApply/FormJY.js | 7 ++++--- .../Views/Ass_AssetsInfoApply/FormViewJY.cshtml | 4 ++++ .../Views/Ass_AssetsInfoApply/FormViewJY.js | 15 ++++++++++++--- .../Views/Ass_AssetsInfoItemApply/FormJY.cshtml | 10 +++++----- .../Views/Ass_AssetsInfoItemApply/FormJY.js | 1 + .../Ass_AcceptanceMainService.cs | 6 +++--- 9 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs index 78d71de36..a6bb47557 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemApplyController.cs @@ -55,6 +55,7 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers [HttpGet] public ActionResult FormJY() { + ViewBag.AAICode = CommonHelper.CreateNo(); return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml index cc2c0e1d3..a2387ae81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml @@ -4,8 +4,8 @@ }
-
资产编号*
- +
资产编号
+
资产名称*
@@ -36,8 +36,8 @@
-
库房
-
+
库房*
+
库位
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js index 5d719d717..5bd5cfc67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.js @@ -29,6 +29,7 @@ var bootstrap = function ($, learun) { $('#AAISupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' }); $('#AAISource').lrDataItemSelect({ code: 'zcly' }); $('#AAIHasDetail').lrDataItemSelect({ code: 'YesOrNoBit' }); + $('#AAIHasDetail').lrselectSet('true'); $('#AAIUnit').lrDataItemSelect({ code: 'sldw' }); $('#AAIStorageId').lrselect({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js index 2792c1203..441acc8d5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js @@ -91,11 +91,12 @@ var bootstrap = function ($, learun) { // 访问数据接口地址 url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree' }); + $('#AACreateDeptId').lrselectSet(learun.clientdata.get(['userinfo']).departmentId); $('#Ass_AssetsInfoItemApply').jfGrid({ headData: [ - { - label: '采购临时编号', name: 'AAICode', width: 150, align: 'left' - }, + //{ + // label: '采购临时编号', name: 'AAICode', width: 150, align: 'left' + //}, { label: '资产名称', name: 'AAIName', width: 150, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml index 147fd5945..55bd89d5a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml @@ -26,6 +26,10 @@
申请人
+
+
申请部门
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js index d4eff5243..906f51e8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js @@ -82,11 +82,20 @@ var bootstrap = function ($, learun) { $('#AACreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; $('#AAAssType').lrDataItemSelect({ code: 'AssType' }); $('#AACreateUserId').val(learun.clientdata.get(['userinfo']).realName); + $('#AACreateDeptId').lrselect({ + type: 'tree', + // 展开最大高度 + maxHeight: 200, + // 是否允许搜索 + allowSearch: true, + // 访问数据接口地址 + url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree' + }); $('#Ass_AssetsInfoItemApply').jfGrid({ headData: [ - { - label: '资产编号', name: 'AAICode', width: 150, align: 'left' - }, + //{ + // label: '资产编号', name: 'AAICode', width: 150, align: 'left' + //}, { label: '资产名称', name: 'AAIName', width: 150, align: 'left' }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml index 15eaf9421..1269d71d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml @@ -6,16 +6,16 @@ @Html.AppendJsFile("/Views/LR_Content/plugin/layerselect/lr-layerselect.js")
-
选择已登记资产*
+
选择已登记资产
资产类别*
-
+
资产名称*
@@ -29,7 +29,7 @@
资产型号
-
+
生产厂家
@@ -59,7 +59,7 @@
数量单位
-
+
排序*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js index 7c8c32285..d5f6f22df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js @@ -131,6 +131,7 @@ var bootstrap = function ($, learun) { } } }); + $('#AAIHasDetail').lrselectSet('true'); $('#AAIPhoto').lrUploader(); }, initData: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AcceptanceMain/Ass_AcceptanceMainService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AcceptanceMain/Ass_AcceptanceMainService.cs index a52536be8..f403508d0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AcceptanceMain/Ass_AcceptanceMainService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AcceptanceMain/Ass_AcceptanceMainService.cs @@ -247,7 +247,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AId = assinfoitem.AId; insertassinfoitem.AICodeNum = Ass_AssetsInfoItemMaxNum + 1 + i; insertassinfoitem.AICode = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号 + insertassinfoitem.AICodeNumJY = "";//assinfoitem.ACode + "_" + insertassinfoitem.AICodeNum.ToString();//金隅编号 insertassinfoitem.AIAssValue = assinfoitem.APrice;//价值 insertassinfoitem.AIUnits = assinfoitem.AUnit;//单位 insertassinfoitem.AISpecificationtype = assinfoitem.AModel;//型号 @@ -353,7 +353,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = i + 1; insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICodeNumJY = "";//insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 @@ -416,7 +416,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem insertassinfoitem.AId = insertAss_AssetsInfo.AId; insertassinfoitem.AICodeNum = 1; insertassinfoitem.AICode = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); - insertassinfoitem.AICodeNumJY = insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); + insertassinfoitem.AICodeNumJY = "";// insertAss_AssetsInfo.ACode + "_" + insertassinfoitem.AICodeNum.ToString(); insertassinfoitem.AIAssValue = assitemapp.AAIPrice;//价值 insertassinfoitem.AIUnits = assitemapp.AAIUnit;//单位 insertassinfoitem.AISpecificationtype = assitemapp.AAIModel;//型号 From 29d5a5c93a44d786acb55b213b3430587551d929 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Mon, 19 Jul 2021 18:25:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=80=97=E6=9D=90=20?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BC=96=E5=8F=B7=E6=94=B9=E4=B8=BA=E8=80=97?= =?UTF-8?q?=E6=9D=90=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js index a58e82c9a..850d1aa84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js @@ -94,7 +94,7 @@ var bootstrap = function ($, learun) { $('#Ass_AssetsInfoItemApply').jfGrid({ headData: [ { - label: '资产编号', name: 'AAICode', width: 150, align: 'left' + label: '耗材编号', name: 'AAICode', width: 150, align: 'left' }, { label: '资产名称', name: 'AAIName', width: 150, align: 'left' From 5a1272724970f701ba9dc17890387d4337bffb9a Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 20 Jul 2021 11:14:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AD=A6=E6=A0=A1?= =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml | 4 ++-- .../LR_OrganizationModule/Controllers/CompanyController.cs | 5 ++++- .../Areas/LR_OrganizationModule/Views/Company/Form.js | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml index 90dbfdc10..efc9d90bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml @@ -14,8 +14,8 @@
-
耗材编号*
- +
耗材编号
+
耗材名称*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs index 0d4f03ddb..045da684c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs @@ -106,8 +106,10 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers [HttpPost] [ValidateAntiForgeryToken] [AjaxOnly] - public ActionResult SaveForm(string keyValue, CompanyEntity entity) + [ValidateInput(false)] + public ActionResult SaveForm(string keyValue, string strEntity) { + CompanyEntity entity = strEntity.ToObject(); entity.SyncFlag = false; entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction); entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation); @@ -126,6 +128,7 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers entity.SyncFlag = false; } + list = list.Where(m => m.F_CompanyId != keyValue).ToList(); } if (list.Any(a => a.F_FullName == entity.F_FullName)) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js index ae70b3773..777db052e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js @@ -61,7 +61,12 @@ var bootstrap = function ($, learun) { if (postData["F_ParentId"] == '' || postData["F_ParentId"] == ' ') { postData["F_ParentId"] = '0'; } - $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postData, function (res) { + postData["F_BriefIntroduction"] = F_BriefIntroductionUE.getContent(null, null, true); + postData["F_EnrollmentInformation"] = F_EnrollmentInformationUE.getContent(null, null, true); + var postDatas = { + strEntity: JSON.stringify(postData) + }; + $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postDatas, function (res) { // 保存成功后才回调 if (!!callBack) { callBack();