From aa5107f7dc063fe08d551d275d03dc3787fb1908 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 14 Jun 2022 16:13:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E7=AE=A1=E7=90=86--=E5=BA=8A?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Accommodation/Index.js                  | 15 ++++++++-------
 .../Views/Accommodation/IndexBed.js               |  4 +---
 .../Views/Accommodation/IndexDistribution.js      |  3 +--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js
index ff87bf30a..490719349 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Index.js	
@@ -262,10 +262,10 @@ var bootstrap = function ($, learun) {
                         }
                     });
                 }
-                
+
 
             });
-            
+
             //分类管理
             $("#lr_Classify").on("click", function () {
                 learun.layerForm({
@@ -304,14 +304,14 @@ var bootstrap = function ($, learun) {
                         selectedParent.ChildType = "5";
                     }
                     var param = {};
-                    
+
                     if (item.title == '1')
                         param.ApartmentId = item.value;
                     else if (item.title == '2')
                         param.UnitId = item.value;
                     else if (item.title == '3')
                         param.FloorId = item.value;
-                    
+
                     //page.initGird();
                     //page.search({ ParentID: item.value });
                     page.search(param);
@@ -433,6 +433,7 @@ var bootstrap = function ($, learun) {
                 sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ',
                 //sord: 'ASC',
                 isSubGrid: true,             // 是否有子表
+                //床位信息
                 subGridExpanded: function (subContentId, rowItem) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Accommodation/GetBedListByRoomId?RoomId=' + rowItem.ID,
@@ -454,7 +455,7 @@ var bootstrap = function ($, learun) {
                         ],
                         mainId: 'ID',
                         isPage: false,
-                        //sidx: 'DNo',
+                        sidx: ' REPLACE(Name,\'床\',\'\')'
                         //sord: 'ASC',
                     });
                     //var param;
@@ -467,7 +468,7 @@ var bootstrap = function ($, learun) {
             //$("#gridtable").empty();
             //$("#gridtable")[0].dfop = undefined;
             //if (selectedParent.BuildType == undefined || selectedParent.BuildType === "3") {
-                
+
             //} else {
             //    //lrAuthorizeJfGridLei
             //    $('#gridtable').jfGrid({
@@ -563,7 +564,7 @@ var bootstrap = function ($, learun) {
             //    });
             //}
 
-            
+
         },
         search: function (param) {
             param = param || {};
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js
index 04b75f750..218d9e18e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexBed.js	
@@ -85,9 +85,7 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'ID',
                 isPage: false,
-                //isMultiselect: true,
-                //sidx: 'ApartmentId asc,UnitId asc ,FloorId asc ',
-                //sord: 'ASC',
+                sidx: ' REPLACE(Name,\'床\',\'\')'
 
             });
             page.search();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js
index 71a969a6d..2e72dd9af 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/IndexDistribution.js	
@@ -490,8 +490,7 @@ var bootstrap = function ($, learun) {
                         ],
                         mainId: 'ID',
                         isPage: false,
-                        //sidx: 'DNo',
-                        //sord: 'ASC',
+                        sidx: ' REPLACE(Name,\'床\',\'\')'
                     });
                     //var param;
                     //param = param || {};