资产变动申请

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

@@ -39,6 +39,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

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

@@ -3,45 +3,46 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <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" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <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"  />
+        <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-6 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 id="UsePeople" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 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" />
+        <input id="ContactWayNew" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">卡片编号<font face="宋体">*</font></div>
-        <input id="CardNumber" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="FACode" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+        <input id="FAId" hidden/>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
-        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <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" ></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="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>
-        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Ass_FixAssetsApply" >
+    <div class="col-xs-12 lr-form-item" data-table="Ass_FixAssetsApply">
         <div class="lr-form-item-title">申请事由<font face="宋体">*</font></div>
-        <textarea id="ApplyReasons" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" ></textarea>
+        <textarea id="ApplyReasons" 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="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>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/Form.js")

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

@@ -45,26 +45,51 @@ var bootstrap = function ($, learun) {
             $('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
             $('#ContactWay').val(learun.clientdata.get(['userinfo']).mobile);
-            $('#UsePeople').lrGirdSelect({
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=FormulaMain',
-                selectWord: 'name',
-                value: 'id',
-                text: 'name',
+            $('#FACode').lrGirdSelect({
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_FixAssets',
+                selectWord: 'faname',
+                value: 'facode',
+                text: 'faname',
                 headData:
                     [
-                        { label: "公式", name: "result", width: 300, align: "left" },
-                        { label: "公式名称", name: "name", width: 300, align: "left" }
+                        { label: "主键", name: "faid", width: 300, align: "left", ishide: true },
+                        { label: "资产编号", name: "facode", width: 150, align: "left" },
+                        { label: "资产名称", name: "faname", width: 150, align: "left" },
+                        {
+                            label: "存放地点", name: "storageid", width: 150, align: "left",
+                            formatterAsync: function (callback, value, row, op, $cell) {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+                                    key: value,
+                                    keyId: 'sid',
+                                    callback: function (_data) {
+                                        callback(_data['sname']);
+                                    }
+                                });
+                            }
+                        },
+
                     ],
                 select: function (item) {
                     //赋值
-                    $("#StuName").val(item.stuname);
-                    $("#StuId").val(item.stuno);
-                    $("#ClassNo").val(item.classno);
+                    $("#FACode").val(item.facode);
+                    $("#FAName").val(item.faname);
+                    $("#FAId").val(item.faid);
+                    //存放地点
+                    $("#StorageId").lrselectSet(item.storageid); 
+                    $("#StorageIdNew").lrselectSet(item.storageid); 
+                }
+            });
+            $('#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',
+                select: function (item) {
+                    if (item) {
+                        $("#ContactWayNew").val(item.f_mobile);
+                    }
                 }
             });
-            $('#UsePeople').lrDataItemSelect({ code: '' });
-            //$('#StorageId').lrDataItemSelect({ code: '' });
-            //$('#StorageIdNew').lrDataItemSelect({ code: '' });
             $('#Files').lrUploader();
         },
         initData: function () {

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

@@ -0,0 +1,47 @@
+@{
+    ViewBag.Title = "Ass_FixAssetsApply";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<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"  />
+    </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="lr-form-item-title">接收人<font face="宋体">*</font></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="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-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 />
+    </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="FAName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </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>
+    <div class="col-xs-6 lr-form-item" data-table="Ass_FixAssetsApply">
+        <div class="lr-form-item-title">存放地点新<font face="宋体">*</font></div>
+        <div id="StorageIdNew" isvalid="yes" checkexpession="NotNull" readonly></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="ApplyReasons" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull" readonly></textarea>
+    </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>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssetsApply/FormView.js")

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

@@ -0,0 +1,153 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:52
+ * 描  述：Ass_FixAssetsApply
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+        if (!!data) {
+            for (var field in data) {
+                if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                    $('#' + data[field].fieldId).parent().remove();
+                }
+                else {
+                    if (data[field].isEdit != 1) {
+                        $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                        if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                            $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                            $('#' + data[field].fieldId).find('.btn-success').remove();
+                        }
+                    }
+                }
+            }
+        }
+    };
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //$('#CreateUser')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            //$('#CreateUser').val(learun.clientdata.get(['userinfo']).realName);
+            //$('#ContactWay').val(learun.clientdata.get(['userinfo']).mobile);
+            //$('#FACode').lrGirdSelect({
+            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_FixAssets',
+            //    selectWord: 'faname',
+            //    value: 'facode',
+            //    text: 'faname',
+            //    headData:
+            //        [
+            //            { label: "主键", name: "faid", width: 300, align: "left", ishide: true },
+            //            { label: "资产编号", name: "facode", width: 150, align: "left" },
+            //            { label: "资产名称", name: "faname", width: 150, align: "left" },
+            //            {
+            //                label: "存放地点", name: "storageid", width: 150, align: "left",
+            //                formatterAsync: function (callback, value, row, op, $cell) {
+            //                    learun.clientdata.getAsync('custmerData', {
+            //                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
+            //                        key: value,
+            //                        keyId: 'sid',
+            //                        callback: function (_data) {
+            //                            callback(_data['sname']);
+            //                        }
+            //                    });
+            //                }
+            //            },
+
+            //        ],
+            //    select: function (item) {
+            //        //赋值
+            //        $("#FACode").val(item.facode);
+            //        $("#FAName").val(item.faname);
+            //        $("#FAId").val(item.faid);
+            //        //存放地点
+            //        $("#StorageId").lrselectSet(item.storageid);
+            //        $("#StorageIdNew").lrselectSet(item.storageid);
+            //    }
+            //});
+            $('#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',
+                select: function (item) {
+                    if (item) {
+                        $("#ContactWayNew").val(item.f_mobile);
+                    }
+                }
+            });
+            $('#Files').lrUploader();
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId, param, callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                        $('#' + id).jfGridSet('refreshdata', data[id]);
+                    }
+                    else {
+                        if (id == 'Ass_FixAssetsApply' && data[id]) {
+                            keyValue = data[id].ID;
+                        }
+                        $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                    }
+                }
+            });
+        }
+        callback && callback();
+    }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if (!!processId) {
+            formData.ProcessId = processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

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

@@ -45,11 +45,11 @@ var bootstrap = function ($, learun) {
             });
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
-            $('#CreateUser').lrUserSelect(0);
-            $('#UsePeople').lrDataItemSelect({ code: '' });
-            $('#StorageIdNew').lrDataItemSelect({ code: '' });
-            $('#StorageId').lrDataItemSelect({ code: '' });
+            }, 250, 400);
+            $('#CreateUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#UsePeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#StorageIdNew').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -68,8 +68,9 @@ var bootstrap = function ($, learun) {
                         res = top[id].validForm();
                         // 保存数据
                         if (res) {
-                            processId = learun.newGuid();
-                            res = top[id].save(processId, refreshGirdData);
+                            res = top[id].save('', function () {
+                                page.search();
+                            });
                         }
                         return res;
                     }
@@ -79,6 +80,16 @@ var bootstrap = function ($, learun) {
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
+                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+                        return;
+                    }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可编辑！");
+                        return;
+                    }
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
@@ -104,10 +115,20 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status > 0) {
+                        learun.alert.warning("选中记录中包含已审核项目，已审核不能删除！");
+                        return;
+                    }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可删除！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/DeleteForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
+                                page.search();
                             });
                         }
                     });
@@ -115,30 +136,47 @@ var bootstrap = function ($, learun) {
             });
             //提交
             $('#lr_submit').on('click', function () {
-                var keyValue = $('#gridtable').jfGridValue('Id');
+                var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var FlowNo = $('#gridtable').jfGridValue('FlowNo');
-                    if (FlowNo != 0) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
                         learun.alert.warning("当前项目已提交,请耐心等待审批!");
                         return;
                     }
+                    var user = $('#gridtable').jfGridValue('CreateUser');
+                    if (user != learun.clientdata.get(['userinfo']).userId) {
+                        learun.alert.warning("当前项目不可删除！");
+                        return;
+                    }
                     learun.layerConfirm('是否确认提交该项！', function (res) {
                         if (res) {
                             processId = learun.newGuid();
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/ModifyStatus/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
+                            learun.postForm(top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/ModifyStatus', { keyValue: keyValue, pastatus: 1, processId: processId }, function (res) {
                                 refreshGirdData(res, {});
                             });
                         }
                     });
                 }
             });
-            //  查看
+            // 查看申请
             $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formAss_FixAssets',
+                        title: '查看',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        btn: null
+                    });
+                }
             });
+
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').lrAuthorizeJfGridLei({
                 url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssetsApply/GetPageList',
                 headData: [
                     {
@@ -156,26 +194,28 @@ var bootstrap = function ($, learun) {
                     {
                         label: "接收人", name: "UsePeople", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
                                 key: value,
-                                code: '',
+                                keyId: 'f_encode',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
                     },
                     { label: "联系方式", name: "ContactWayNew", width: 100, align: "left" },
-                    { label: "卡片编号", name: "CardNumber", width: 200, align: "left" },
+                    { label: "卡片编号", name: "FACode", width: 200, align: "left" },
                     { label: "资产名称", name: "FAName", width: 200, align: "left" },
                     {
-                        label: "现存放地点", name: "StorageId", width: 200, align: "left",
+                        label: "存放地点", name: "StorageId", width: 150, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
-                                code: '',
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
@@ -183,11 +223,12 @@ var bootstrap = function ($, learun) {
                     {
                         label: "存放地点新", name: "StorageIdNew", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_StorageData',
                                 key: value,
-                                code: '',
+                                keyId: 'sid',
                                 callback: function (_data) {
-                                    callback(_data.text);
+                                    callback(_data['sname']);
                                 }
                             });
                         }
@@ -205,16 +246,17 @@ var bootstrap = function ($, learun) {
                                 cache: false,
                                 success: function (res) {
                                     var bb = '';
+                                    //$.each(res.data, function (i, item) {
+                                    //    bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                    //})
                                     $.each(res.data, function (i, item) {
-                                        bb += item.F_FileName.substring(0, item.F_FileName.indexOf(".")) + ','
+                                        bb += '<span onclick="downLoad(\'' +
+                                            item.F_Id +
+                                            '\')" style="color:blue">' +
+                                            //item.F_FileName.substring(0, item.F_FileName.indexOf(".")) +
+                                            item.F_FileName +
+                                            '</span>,&nbsp;&nbsp;&nbsp;';
                                     })
-                                    //$.each(res.data, function(i, item) {
-                                    //    bb += '<span onclick="downLoad(\'' +
-                                    //        item.F_Id +
-                                    //        '\')" style="color:blue">' +
-                                    //        item.F_FileName.substring(0,item.F_FileName.indexOf(".")) +
-                                    //        '</span>,&nbsp;&nbsp;&nbsp;';
-                                    //})
                                     callback(bb);
                                 }
                             });
@@ -224,7 +266,7 @@ var bootstrap = function ($, learun) {
                         label: "审批状态", name: "Status", width: 100, align: "center",
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 0) {
-                                return '<span class=\"label label-warning\">草稿</span>';
+                                return '<span class=\"label label-primary\">草稿</span>';
                             } if (cellvalue == 1) {
                                 return '<span class=\"label label-warning\">审批中</span>';
                             } else if (cellvalue == 2) {
@@ -234,7 +276,9 @@ var bootstrap = function ($, learun) {
                     }
                 ],
                 mainId: 'ID',
-                isPage: true
+                isPage: true,
+                sidx: 'CreateUser,Status',
+                sord: 'desc',
             });
         },
         search: function (param) {
@@ -249,7 +293,7 @@ var bootstrap = function ($, learun) {
             if (res.code == 200) {
                 // 发起流程
                 var postData = {
-                    schemeCode: '',// 填写流程对应模板编号
+                    schemeCode: 'Ass_FixAssetsApply',// 填写流程对应模板编号
                     processId: processId,
                     level: '1',
                 };

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -956,6 +956,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsOutItemApply\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsType\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_AssetsType\Index.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\FormView.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_InventoryItemApply\Form.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_InventoryItemApply\Index.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_Inventory\Form.js" />
@@ -8163,6 +8164,7 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\IndexClassRoom.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ArrangeExamTermNew\SeatForm.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\SchoolLevelScholarship\IndexOfStudent.cshtml" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

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

@@ -22,6 +22,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         /// <summary>
         /// 资产编号
         /// </summary>
+        [Column("FAID")]
+        public string FAId { get; set; }
+        /// <summary>
+        /// 资产编号
+        /// </summary>
         [Column("FACODE")]
         public string FACode { get; set; }
         /// <summary>

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

@@ -73,7 +73,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("FAName", "%" + queryParam["FAName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.FAName Like @FAName ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<Ass_FixAssetsApplyEntity>(strSql.ToString(), dp, pagination);
+                return this.BaseRepository().FindList<Ass_FixAssetsApplyEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -97,7 +97,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<Ass_FixAssetsApplyEntity>(keyValue);
+                return this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(keyValue);
             }
             catch (Exception ex)
             {
@@ -121,7 +121,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<Ass_FixAssetsApplyEntity>(t => t.ProcessId == processId);
+                return this.BaseRepository().FindEntity<Ass_FixAssetsApplyEntity>(t => t.ProcessId == processId);
             }
             catch (Exception ex)
             {
@@ -148,7 +148,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Ass_FixAssetsApplyEntity>(t => t.ID == keyValue);
+                this.BaseRepository().Delete<Ass_FixAssetsApplyEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -176,12 +176,12 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
-                    this.BaseRepository("CollegeMIS").Update(entity);
+                    this.BaseRepository().Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    this.BaseRepository().Insert(entity);
                 }
             }
             catch (Exception ex)