【修改】宿舍物品损坏上报：调整为不只是学生，每个用户都可提交；

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<Acc_GoodsDemageEntity>();
-            var loginUserInfo = LoginUserInfo.Get();
-            entity.F_CreateAccount = loginUserInfo.account;//上报学生学号
             acc_GoodsDemageIBLL.SaveEntity(keyValue,entity);
             return Success("保存成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Acc_GoodsDemage/Index.cshtml

@@ -26,7 +26,7 @@
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <div class="lr-form-item-title">上报人</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                             </div>

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']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/LogisticsManagement/Acc_GoodsDemageApi.cs

@@ -87,7 +87,6 @@ namespace Learun.Application.WebApi
         {
             ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
             Acc_GoodsDemageEntity entity = parameter.strEntity.ToObject<Acc_GoodsDemageEntity>();
-            entity.F_CreateAccount = LoginUserInfo.Get().account;
             acc_GoodsDemageIBLL.SaveEntity(parameter.keyValue, entity);
             return Success("保存成功！");
         }

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;
         }
         /// <summary>
         /// 编辑调用

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
         /// <returns></returns>
         public IEnumerable<Acc_GoodsDemageEntity> 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<Acc_GoodsDemageEntity>(strSql.ToString(),dp, pagination);
             }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_GoodsDemage/list.vue

@@ -40,7 +40,7 @@
               {{ displayListItem(item, 'RId') }} 
             </view> 
             <view class="customlist-item-field"> 
-              <text class="customlist-item-field-title">学生姓名：</text> 
+              <text class="customlist-item-field-title">用户姓名：</text> 
               {{ displayListItem(item, 'F_CreateAccount') }} 
             </view> 
   
@@ -102,7 +102,7 @@
         <l-input	 
           v-model="queryData.StuName"
           @change="searchChange"
-          title ="学生姓名"
+          title ="上报人"
         /> 
   
         <!-- 重置查询条件按钮 --> 
@@ -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 })) 
         }),