【修改】在册登记明细：查询弹框中部门和人员联动选择修改；查看出入记录中库房下拉修改；登记在册资产：资产属性必填；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Controllers/Ass_AssetsInfoItemController.cs

@@ -357,6 +357,14 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Ass_AssetsInfoItemEntity entity = strEntity.ToObject<Ass_AssetsInfoItemEntity>();
+            if (!entity.AIAssValue.HasValue)
+            {
+                entity.AIAssValue = null;
+            }
+            if (!entity.AIASSState.HasValue)
+            {
+                entity.AIASSState = null;
+            }
             ass_AssetsInfoItemIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsChangeItem/Index.js

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
             $('#ACInOrOut').lrDataItemSelect({ code: 'InOrOut' });
             $('#ACReasonType').lrDataItemSelect({ code: 'ReasonType' });
             //$('#ACCStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
-            $('#AIIStorageId').lrselect({
+            $('#ACCStorageId').lrselect({
                 type: 'tree',
                 allowSearch: true,
                 url: top.$.rootUrl + '/AssetManagementSystem/AssStorageRoom/GetTree',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.cshtml

@@ -17,7 +17,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
         <div class="lr-form-item-title">资产属性<font face="宋体">*</font></div>
-        <div id="AAssType"></div>
+        <div id="AAssType" isvalid="yes" checkexpession="NotNull" ></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfo">
             <div class="lr-form-item-title">英文名称</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfo/Form.js

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
             //$('#AIIStorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#ASupplierId').lrDataSourceSelect({ code: 'Ass_SupplierData', value: 'sid', text: 'sname' });
             $('#AAssType').lrDataItemSelect({ code: 'AssType' });
-            $('#APhoto').lrUploader();
+            //$('#APhoto').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItem/Index.js

@@ -69,10 +69,13 @@ var bootstrap = function ($, learun) {
             $('#AIASSState').lrDataItemSelect({ code: 'AssState' });
             $('#AIDepartment').lrDepartmentSelect({
                 select: function (val) {
-                    $('#AIUsePeople').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentId?departmentId=' + val.value, text: 'F_RealName', value: 'F_UserId' })
+                    if (val) {
+                        $('#AIUsePeople').lrselectRefresh({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentId?departmentId=' + val.value, text: 'F_RealName', value: 'F_UserId' })
+                    }
                 }
             });
-            $('#AIUsePeople').lrselect({ allowSearch: true, text: 'F_RealName', value: 'F_UserId' });
+            //$('#AIUsePeople').lrselect({ allowSearch: true, text: 'F_RealName', value: 'F_UserId' });
+            $('#AIUsePeople').lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -133,6 +136,10 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('AIId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'forminfoitem',
                         title: '编辑',
@@ -149,6 +156,10 @@ var bootstrap = function ($, learun) {
             $('#lr_view').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('AIId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'forminfoitem',
                         title: '查看',
@@ -166,6 +177,10 @@ var bootstrap = function ($, learun) {
             $('#lr_detail').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('AIId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'formdetail',
                         title: '出入库记录',
@@ -181,6 +196,10 @@ var bootstrap = function ($, learun) {
             $('#lr_usedetail').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('AIId');
                 if (learun.checkrow(keyValue)) {
+                    if (keyValue.indexOf(',') != -1) {
+                        learun.alert.warning("只能选择一条记录进行操作！");
+                        return false;
+                    }
                     learun.layerForm({
                         id: 'formusedetail',
                         title: '使用人员变动记录',