From 75cdd408b7b5c0b9f9d8f8f44085729a08694b20 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 20 Nov 2024 17:11:04 +0800 Subject: [PATCH] --- .../Views/OfficeEquipment/Form.cshtml | 2 +- .../Views/OfficeEquipment/Form.js | 9 ++------- .../Views/OfficeEquipment/Index.js | 4 ++-- .../Views/OfficeEquipment/IndexMy.js | 4 ++-- .../Learun.Application.WebApi/Modules/Arrangelesson.cs | 3 +-- .../OfficeEquipment/OfficeEquipmentEntity.cs | 4 ++-- .../OfficeEquipment/OfficeEquipmentService.cs | 2 +- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml index f3986c0d2..bc8f04335 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.cshtml @@ -6,7 +6,7 @@
使用管理人*
- +
部门*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js index bfdee24d8..e1061f01c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Form.js @@ -28,7 +28,7 @@ var bootstrap = function ($, learun) { text: 'f_realname', headData: [ - { label: "编号", name: "f_encode", width: 100, align: "left" }, + { label: "编号", name: "f_userid", width: 100, align: "left", ishide: true}, { label: "姓名", name: "f_realname", width: 100, align: "left" }, { label: "部门", name: "f_departmentid", width: 100, align: "left", @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { select: function (item) { ////赋值 $("#Name").val(item.f_realname); - $("#JZGNo").val(item.f_encode); + $("#UserId").val(item.f_userid); $("#Department").lrselectSet(item.f_departmentid); } }); @@ -60,11 +60,6 @@ var bootstrap = function ($, learun) { $('#' + id ).jfGridSet('refreshdata', data[id]); } else { - //console.log(data[id]) - //if (id == 'OfficeEquipment' && data[id]) { - // data[id].Name = "任山"; - //} - //$('[data-table="' + id + '"]').lrSetFormData(data[id]); $('[data-table="' + id + '"]').lrSetFormData(data[id]); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js index 78ecc6a55..4760315c2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/Index.js @@ -100,12 +100,12 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList', headData: [ { - label: "使用管理人", name: "JZGNo", 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=' + 'TeacherInfo', key: value, - keyId: 'f_encode', + keyId: 'f_userid', callback: function (_data) { callback(_data['f_realname']); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js index 6f2b44559..2ba0716a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OfficeEquipment/IndexMy.js @@ -100,12 +100,12 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/OfficeEquipment/GetPageList', headData: [ { - label: "使用管理人", name: "JZGNo", 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=' + 'TeacherInfo', key: value, - keyId: 'f_encode', + keyId: 'f_userid', callback: function (_data) { callback(_data['f_realname']); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs index 5c25204dd..8b9cd7d4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs @@ -530,10 +530,9 @@ namespace Learun.Application.WebApi.Modules if (Types == 0) { var Data = officeEquipmentIBLL.GetOfficeEquipmentEntity(keyValue); - var emp = empinfoIBLL.GetEmpInfoEntityByEmpNo(Data.Name); var Unit = dataItemIBLL.GetDetailList("sldw").Where(x => x.F_ItemValue == Data.Unit).FirstOrDefault(); result = "资产名称:" + Data.DeviceName + ";
资产编号:" + Data.Code + ";
品牌:" + - Data.Brand + ";
型号:" + Data.Model + ";
参数:" + Data.Argument + ";
单位:(" + Unit.F_ItemName + ");
数量:" + Data.Nuantity + ";
使用管理人:" + emp.EmpName + ";
备注:" + Data.Remark; + Data.Brand + ";
型号:" + Data.Model + ";
参数:" + Data.Argument + ";
单位:(" + Unit.F_ItemName + ");
数量:" + Data.Nuantity + ";
使用管理人:" + Data.Name + ";
备注:" + Data.Remark; } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs index 54618e610..12a3b6728 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentEntity.cs @@ -37,8 +37,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 姓名 /// - [Column("JZGNO")] - public string JZGNo { get; set; } + [Column("USERID")] + public string UserId { get; set; } /// /// 所属部门 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs index dca5994f4..0d4583503 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OfficeEquipment/OfficeEquipmentService.cs @@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { if (!LoginUserInfo.Get().roleIds.Contains("5a6e22b1-2a08-4258-9964-3cb7fbb9ebee")) { - strSql.Append(" AND t.Name = '" + LoginUserInfo.Get().account + "' "); + strSql.Append(" AND t.Name = '" + LoginUserInfo.Get().realName + "' "); } } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination);