调整登记在册资产、资产登记明细

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

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

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

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";
 }
-<div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_UserChangeInfo">
         <div class="lr-form-item-title">明细ID</div>
-        <input id="AIID" type="text" class="form-control"  />
+        <div id="AIID" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
-        <div class="lr-form-item-title">使用人员ID</div>
-        <input id="UserID" type="text" class="form-control"  />
+    <div class="col-xs-12 lr-form-item" data-table="Ass_UserChangeInfo">
+        <div class="lr-form-item-title">使用人员</div>
+        <div id="UserID" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
+    <div class="col-xs-12 lr-form-item" data-table="Ass_UserChangeInfo">
         <div class="lr-form-item-title">修改时间</div>
-        <input id="UCChangeTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#UCChangeTime').trigger('change'); } })"   />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_UserChangeInfo" >
-        <div class="lr-form-item-title">操作人</div>
-        <div id="UCEditer"  ></div>
+        <input id="UCChangeTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#UCChangeTime').trigger('change'); } })" />
     </div>
+    @*<div class="col-xs-12 lr-form-item" data-table="Ass_UserChangeInfo">
+            <div class="lr-form-item-title">操作人</div>
+            <div id="UCEditer"></div>
+        </div>*@
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Form.js")

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_UserChangeInfo/Index.cshtml

@@ -14,12 +14,12 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">明细ID</div>
-                                    <input id="AIID" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">明细编号</div>
+                                    <div id="AIID"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">使用人员ID</div>
-                                    <input id="UserID" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">使用人员</div>
+                                    <div id="UserID"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">操作人</div>

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