Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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();
         }
         

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Acceptance/FormItem.cshtml

@@ -4,8 +4,8 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
-        <div class="lr-form-item-title">资产编号<font face="宋体">*</font></div>
-        <input id="AAICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">资产编号</div>
+        <input id="AAICode" type="text" class="form-control"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
@@ -36,8 +36,8 @@
         <div id="AAIHasDetail"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
-        <div class="lr-form-item-title">库房</div>
-        <div id="AAIStorageId"></div>
+        <div class="lr-form-item-title">库房<font face="宋体">*</font></div>
+        <div id="AAIStorageId" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_Acceptance">
         <div class="lr-form-item-title">库位</div>

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({

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'
                     },

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'

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.cshtml

@@ -26,6 +26,10 @@
         <div class="lr-form-item-title">申请人</div>
         <input id="AACreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoApply">
+        <div class="lr-form-item-title">申请部门</div>
+        <div id="AACreateDeptId"></div>
+    </div>
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="Ass_AssetsInfoItemApply"></div>
     </div>

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'
                     },

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")
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">选择已登记资产<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">选择已登记资产</div>
         <div id="AAOldCode"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">资产类别<font face="宋体">*</font></div>
         <div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
         <div class="lr-form-item-title">采购临时编号<font face="宋体">*</font></div>
-        <input id="AAICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
@@ -29,7 +29,7 @@
         <div class="lr-form-item-title">资产型号</div>
         <input id="AAIModel" type="text" class="form-control" />
     </div>
-       <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">生产厂家</div>
         <input id="AAIManufacturer" type="text" class="form-control" />
     </div>
@@ -59,7 +59,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">数量单位</div>
-        <div id="AAIUnit" ></div>
+        <div id="AAIUnit"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>

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 () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml

@@ -14,8 +14,8 @@
         <div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">耗材编号<font face="宋体">*</font></div>
-        <input id="AAICode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">耗材编号</div>
+        <input id="AAICode" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">耗材名称<font face="宋体">*</font></div>

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<CompanyEntity>();
             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))

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();

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;//型号