资产变动申请

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

@@ -11,18 +11,22 @@
         <div class="lr-form-item-title">联系方式</div>
         <input id="ContactWay" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
         <div id="UsePeople" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">联系方式<font face="宋体">*</font></div>
         <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">是否归还<font face="宋体">*</font></div>
+        <div id="IsMark" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">卡片编号<font face="宋体">*</font></div>
         <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
-        <input id="FAId" hidden/>
+        <input id="FAId" hidden />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
@@ -30,7 +34,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">现存放地点<font face="宋体">*</font></div>
-        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>

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

@@ -68,6 +68,20 @@ var bootstrap = function ($, learun) {
                                 });
                             }
                         },
+                        {
+                            label: "使用人", name: "usepeople", width: 100, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                    key: value,
+                                    keyId: 'f_userid',
+                                    callback: function (_data) {
+                                        callback(_data['f_realname']);
+                                    }
+                                });
+                            }
+                        },
+
 
                     ],
                 select: function (item) {
@@ -83,13 +97,18 @@ var bootstrap = function ($, learun) {
             $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#UsePeople').lrDataSourceSelect({
-                code: 'teacheruserdata', value: 'f_encode', text: 'f_realname',
+                code: 'teacheruserdata', value: 'f_userid', text: 'f_realname',
                 select: function (item) {
                     if (item) {
                         $("#ContactWayNew").val(item.f_mobile);
                     }
                 }
             });
+            $('#IsMark').lrselect({
+                data: [{ text: "否", value: "1" }, { text: "是", value: "0" }],
+                text: "text",
+                value: "value"
+            })
             $('#Files').lrUploader();
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.cshtml

@@ -5,20 +5,24 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">申请人</div>
-        <input id="CreateUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user"  />
+        <input id="CreateUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">联系方式</div>
         <input id="ContactWay" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <div id="UsePeople" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="UsePeople" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">联系方式<font face="宋体">*</font></div>
         <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">是否归还<font face="宋体">*</font></div>
+        <div id="IsMark" isvalid="yes" checkexpession="NotNull" readonly></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">卡片编号<font face="宋体">*</font></div>
         <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
@@ -29,7 +33,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">现存放地点<font face="宋体">*</font></div>
-        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly ></div>
+        <div id="StorageId" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>
@@ -41,7 +45,15 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">附件说明</div>
-        <div id="Files" ></div>
+        <div id="Files"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">部门负责人意见<font face="宋体">*</font></div>
+        <textarea id="Department" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">资产负责人意见<font face="宋体">*</font></div>
+        <textarea id="AssetsManagement" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js

@@ -83,14 +83,19 @@ var bootstrap = function ($, learun) {
             $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#UsePeople').lrDataSourceSelect({
-                code: 'teacheruserdata', value: 'f_encode', text: 'f_realname',
+                code: 'teacheruserdata', value: 'f_userid', text: 'f_realname',
                 select: function (item) {
                     if (item) {
                         $("#ContactWayNew").val(item.f_mobile);
                     }
                 }
             });
-            $('#Files').lrUploader({ isUpload: false});
+            $('#IsMark').lrselect({
+                data: [{ text: "否", value: "1" }, { text: "是", value: "0" }],
+                text: "text",
+                value: "value"
+            })
+            $('#Files').lrUploader({ isUpload: false });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -46,8 +46,8 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
-            $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             // 刷新
@@ -82,7 +82,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var Status = $('#gridtable').jfGridValue('Status');
                     if (Status != 0) {
-                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+                        learun.alert.warning("当前项目不可编辑！");
                         return;
                     }
                     var user = $('#gridtable').jfGridValue('CreateUser');
@@ -166,8 +166,8 @@ var bootstrap = function ($, learun) {
                         id: 'formAss_FixAssets',
                         title: '查看',
                         url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/FormView?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         btn: null
                     });
                 }
@@ -197,7 +197,7 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
                                 key: value,
-                                keyId: 'f_encode',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
                                     callback(_data['f_realname']);
                                 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyEntity.cs

@@ -114,6 +114,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// </summary>
         [Column("PROCESSID")]
         public string ProcessId { get; set; }
+        [Column("DEPARTMENT")]
+        public string Department { get; set; }
+        [Column("ASSETSMANAGEMENT")]
+        public string AssetsManagement { get; set; }
+        [Column("ISMARK")]
+        public int? IsMark { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_FixAssetsApply/Ass_FixAssetsApplyService.cs

@@ -234,6 +234,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 var entity = this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(a => a.ProcessId == processId);
                 entity.Status = pastatus;
                 this.BaseRepository().Update(entity);
+                if (pastatus == 2)
+                {
+                    var Ass_FixAssetsentity = this.BaseRepository().FindEntity<Ass_FixAssetsEntity>(x => x.FAId == entity.FAId);
+                    Ass_FixAssetsentity.UsePeople = entity.UsePeople;
+                    Ass_FixAssetsentity.StorageId = entity.StorageIdNew;
+                    this.BaseRepository().Update(Ass_FixAssetsentity);
+                }
             }
             catch (Exception e)
             {