Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -60,6 +60,15 @@ namespace Learun.Application.Web.Areas.AssetManagementSystem.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 主页面【老师】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexOfTeacher()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.cshtml

@@ -0,0 +1,90 @@
+@{
+    ViewBag.Title = "固定资产"; 
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<style>
+    .lr-form-item{
+        padding-left:85px;
+    }
+    .lr-form-item-title{
+        width:90px;
+    }
+</style>
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产编号</div>
+                                    <input id="FACode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产名称</div>
+                                    <input id="FAName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产国标大类</div>
+                                    <div id="ATGId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">资产分类</div>
+                                    <div id="ATId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">取得方式</div>
+                                    <div id="GetWay"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用状况</div>
+                                    <div id="UseCondition"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用部门</div>
+                                    <div id="UseDepartment"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">管理部门</div>
+                                    <div id="ManageDepartment"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">使用人</div>
+                                    <div id="UsePeople"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">卡片状态</div>
+                                    <div id="CardStatus"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">采购组织形式</div>
+                                    <input id="PurchaseOrganizationForm" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">存放地点</div>
+                                    <div id="StorageId"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">折旧/摊销状态</div>
+                                    <div id="DepreciationStatus"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-eye"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_FixAssets/IndexOfTeacher.js

@@ -0,0 +1,300 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-05-05 14:37
+ * 描  述：固定资产
+ */
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 350, 500);
+            $('#ATGId').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                param: { strWhere: "ATPTId='0' " },
+                value: "atid",
+                text: "aname",
+                select: function (item) {
+                    if (!!item) {
+                        $('#ATId').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=Ass_AssetsType',
+                            param: { strWhere: "ATPTId='" + item.atid + "' " },
+                            value: "atid",
+                            text: "aname"
+                        });
+                    }
+                }
+            });
+            $('#ATId').lrselect({ allowSearch: true });
+            $('#GetWay').lrDataItemSelect({ code: 'GetWay' });
+            $('#UseCondition').lrDataItemSelect({ code: 'AssState' });
+            $('#UseDepartment').lrDepartmentSelect();
+            $('#ManageDepartment').lrDepartmentSelect();
+            $('#UsePeople').lrUserSelect(0);
+            $('#CardStatus').lrDataItemSelect({ code: 'CardStatus' });
+            $('#StorageId').lrDataSourceSelect({ code: 'Ass_StorageData', value: 'sid', text: 'sname' });
+            $('#DepreciationStatus').lrDataItemSelect({ code: 'DepreciationStatus' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 查看
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('FAId');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'formAss_FixAssets',
+                        title: '查看固定资产',
+                        url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 800,
+                        btn: null
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/AssetManagementSystem/Ass_FixAssets/GetPageList',
+                headData: [
+                    { label: "资产编号", name: "FACode", width: 100, align: "left" },
+                    { label: "资产名称", name: "FAName", width: 100, align: "left" },
+                    {
+                        label: "资产国标大类", name: "ATGId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "资产分类", name: "ATId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                                key: value,
+                                keyId: 'atid',
+                                callback: function (_data) {
+                                    callback(_data['aname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "财务入账日期", name: "FinanceEntryDate", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue ? cellvalue.slice(0, 11) : "";
+                        }
+                    },
+                    {
+                        label: "价值类型", name: "ValueType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ValueType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "价值", name: "Value", width: 100, align: "left" },
+                    {
+                        label: "取得方式", name: "GetWay", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'GetWay',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "取得日期", name: "GetDate", width: 100, align: "left" },
+                    {
+                        label: "使用状况", name: "UseCondition", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'AssState',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用部门", name: "UseDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "管理部门", name: "ManageDepartment", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "使用人", name: "UsePeople", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
+                    { label: "数量", name: "Amount", width: 100, align: "left" },
+                    { label: "制单人", name: "MakePeople", width: 100, align: "left" },
+                    { label: "制单时间", name: "MakeDate", width: 100, align: "left" },
+                    {
+                        label: "所属单位", name: "Unit", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
+                                key: value,
+                                keyId: 'f_companyid',
+                                callback: function (_data) {
+                                    callback(_data['f_fullname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "卡片状态", name: "CardStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CardStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "折旧年限", name: "DepreciationLife", width: 100, align: "left" },
+                    { label: "累计折旧", name: "AccumulatedDepreciation", width: 100, align: "left" },
+                    { label: "已提折旧月数", name: "HaveDepreciationMonths", width: 100, align: "left" },
+                    { label: "月折旧额", name: "MonthlyDepreciation", width: 100, align: "left" },
+                    {
+                        label: "折旧方法", name: "DepreciationMothod", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepreciationMothod',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "净值", name: "NetValue", width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue <= 0 ? "<span style='color:red;'>0</span>" : cellvalue;
+                        }
+                    },
+                    { label: "采购组织形式", name: "PurchaseOrganizationForm", width: 100, align: "left" },
+                    { label: "品牌", name: "Brand", width: 100, align: "left" },
+                    { label: "规格型号", name: "SpecificationModel", width: 100, align: "left" },
+                    {
+                        label: "存放地点", name: "StorageId", width: 100, 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']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "销售商", name: "SupplierId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                                key: value,
+                                keyId: 'sid',
+                                callback: function (_data) {
+                                    callback(_data['sname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "使用权面积/建筑面积", name: "UseArea", width: 100, align: "left" },
+                    { label: "财政拨款", name: "FinancialAppropriation", width: 100, align: "left" },
+                    { label: "非财政拨款", name: "NonFinancialAppropriation", width: 100, align: "left" },
+                    { label: "会计凭证号", name: "AccountDocumentNumber", width: 100, align: "left" },
+                    {
+                        label: "折旧/摊销状态", name: "DepreciationStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DepreciationStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 1) {
+                                return '<span class=\"label label-warning\">已提交</span>';
+                            } else if (cellvalue === 2) {
+                                return '<span class=\"label label-success\">审批通过</span>';
+                            } else if (cellvalue === 3) {
+                                return '<span class=\"label label-danger\">审核未通过</span>';
+                            } else {
+                                return '<span class=\"label label-default\" >草稿</span>';
+                            }
+                        }
+                    }
+                ],
+                mainId: 'FAId',
+                isPage: true,
+                sidx: 'CreateTime desc'
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.IsTeacher = "1";//控制老师查看的参数
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    
+    page.init();
+}

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

@@ -960,6 +960,7 @@
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssetsApply\FormView.js" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.css" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.js" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\IndexOfTeacher.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" />
@@ -8177,6 +8178,7 @@
     <Content Include="Areas\StudentWork\Views\FamilyEconomy\FormView.cshtml" />
     <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\ImportForm.cshtml" />
     <Content Include="Content\excel\AssFixAssetsImport.xls" />
+    <Content Include="Areas\AssetManagementSystem\Views\Ass_FixAssets\IndexOfTeacher.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_FixAssets/Ass_FixAssetsService.cs

@@ -1,5 +1,6 @@
 using Dapper;
 using Learun.Application.Base.SystemModule;
+using Learun.Application.Organization;
 using Learun.Cache.Base;
 using Learun.Cache.Factory;
 using Learun.DataBase.Repository;
@@ -108,6 +109,23 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                     dp.Add("DepreciationStatus", queryParam["DepreciationStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.DepreciationStatus = @DepreciationStatus ");
                 }
+
+                //判断是否是普通教师的列表：若是，则二级判断；若不是，则无；
+                //二级判断登录用户是否是部门负责人：若是，则使用部门=本部门，或者使用人=本人；若不是，则使用人=本人；
+                if (!queryParam["IsTeacher"].IsEmpty() && queryParam["IsTeacher"].ToString() == "1")
+                {
+                    var departmentList = this.BaseRepository().FindList<DepartmentEntity>($"select * from LR_Base_Department where F_DeleteMark=0 and F_EnabledMark=1 and F_Manager='{LoginUserInfo.Get().userId}' ");
+                    if (departmentList.Any())
+                    {
+                        var departmentIds = departmentList.Select(x => x.F_DepartmentId).ToArray();
+                        strSql.Append($" AND (t.UseDepartment in ('{string.Join("','", departmentIds)}') or t.UsePeople='{LoginUserInfo.Get().userId}' )");
+                    }
+                    else
+                    {
+                        strSql.Append($" AND t.UsePeople='{LoginUserInfo.Get().userId}' ");
+                    }
+                }
+
                 return this.BaseRepository().FindList<Ass_FixAssetsEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)