From 9af3a545cf2d3e0bc452305305b181c7c56bdb75 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 18 Oct 2022 09:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AE=BF?= =?UTF-8?q?=E8=88=8D=E7=89=A9=E5=93=81=E6=8D=9F=E5=9D=8F=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=EF=BC=9A=E8=B0=83=E6=95=B4=E4=B8=BA=E4=B8=8D=E5=8F=AA=E6=98=AF?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=EF=BC=8C=E6=AF=8F=E4=B8=AA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=83=BD=E5=8F=AF=E6=8F=90=E4=BA=A4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Acc_GoodsDemageController.cs | 2 -- .../Views/Acc_GoodsDemage/Index.cshtml | 2 +- .../LogisticsManagement/Views/Acc_GoodsDemage/Index.js | 8 ++++---- .../Modules/LogisticsManagement/Acc_GoodsDemageApi.cs | 1 - .../Acc_GoodsDemage/Acc_GoodsDemageEntity.cs | 1 + .../Acc_GoodsDemage/Acc_GoodsDemageService.cs | 5 +++-- .../pages/LogisticsManagement/Acc_GoodsDemage/list.vue | 10 +++++----- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs index 5494939a2..c9f2bff6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/Acc_GoodsDemageController.cs @@ -103,8 +103,6 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers public ActionResult SaveForm(string keyValue, string strEntity) { Acc_GoodsDemageEntity entity = strEntity.ToObject(); - var loginUserInfo = LoginUserInfo.Get(); - entity.F_CreateAccount = loginUserInfo.account;//上报学生学号 acc_GoodsDemageIBLL.SaveEntity(keyValue,entity); return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml index d174946cf..55b2c104a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml @@ -26,7 +26,7 @@
-
学生姓名
+
上报人
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js index fb8928268..7df212257 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.js @@ -263,14 +263,14 @@ var bootstrap = function ($, learun) { } }, { - label: "学生姓名", name: "F_CreateAccount", width: 100, align: "left", + label: "用户姓名", name: "F_CreateAccount", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic', + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, - keyId: 'stuno', + keyId: 'f_account', callback: function (_data) { - callback(_data['stuname']); + callback(_data['f_realname']); } }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs index f91e166c1..920b6c51d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs @@ -87,7 +87,6 @@ namespace Learun.Application.WebApi { ReqFormEntity parameter = this.GetReqData(); Acc_GoodsDemageEntity entity = parameter.strEntity.ToObject(); - entity.F_CreateAccount = LoginUserInfo.Get().account; acc_GoodsDemageIBLL.SaveEntity(parameter.keyValue, entity); return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs index 1257cb8a5..0c4b463f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageEntity.cs @@ -91,6 +91,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement this.F_CreateDate = DateTime.Now; UserInfo userInfo = LoginUserInfo.Get(); this.F_CreateUserId = userInfo.userId; + this.F_CreateAccount = userInfo.account; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs index 9741d3de3..b86af0663 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Acc_GoodsDemage/Acc_GoodsDemageService.cs @@ -26,12 +26,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement /// public IEnumerable GetPageList(Pagination pagination, string queryJson) { + var dbbase = this.BaseRepository().getDbConnection().Database; try { var strSql = new StringBuilder(); strSql.Append("SELECT t.* "); strSql.Append(" FROM Acc_GoodsDemage t "); - strSql.Append(" left join StuInfoBasic s on t.F_CreateAccount=s.StuNo "); + strSql.Append(" left join " + dbbase + ".dbo.LR_Base_User u on t.F_CreateAccount=u.F_Account"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -60,7 +61,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement if (!queryParam["StuName"].IsEmpty()) { dp.Add("StuName", "%"+queryParam["StuName"].ToString()+"%", DbType.String); - strSql.Append(" AND s.StuName like @StuName "); + strSql.Append(" AND u.F_RealName like @StuName "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue index 1b9237e75..03f8cbd20 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue @@ -40,7 +40,7 @@ {{ displayListItem(item, 'RId') }} - 学生姓名： + 用户姓名： {{ displayListItem(item, 'F_CreateAccount') }} @@ -102,7 +102,7 @@ @@ -153,7 +153,7 @@ export default { Unit: { type: 'select', dataSource: '1', dataSourceId: 'Acc_UnitData,name,id' }, Floor: { type: 'select', dataSource: '1', dataSourceId: 'Acc_FloorData,name,id' }, RId: { type: 'select', dataSource: '1', dataSourceId: 'Acc_RoomData,name,id' }, - F_CreateAccount: { type: 'select', dataSource: '1', dataSourceId: 'StuInfoBasic,stuname,stuno' }, + F_CreateAccount: { type: 'select', dataSource: '1', dataSourceId: 'BaseUser,f_realname,f_account' }, F_CreateDate: { type: 'datetime', dateformat: '0' }, DamageDescribe: { type: 'textarea' }, }, @@ -231,8 +231,8 @@ export default { this.FETCH_DATASOURCE('Acc_RoomData').then(result => { this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) }), - this.FETCH_DATASOURCE('StuInfoBasic').then(result => { - this.dataSource.F_CreateAccount = result.data.map(t => ({ text: t.stuname, value: t.stuno })) + this.FETCH_DATASOURCE('BaseUser').then(result => { + this.dataSource.F_CreateAccount = result.data.map(t => ({ text: t.f_realname, value: t.f_account })) }),