【修改】app2.0宿舍相关：下拉联动，下拉排序；

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,7 +263,7 @@ 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=' + 'BaseUser',

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

@@ -264,25 +264,25 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-          this.dataSource.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-          this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-          this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-          this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }), 
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
           this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -426,65 +426,74 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：宿舍楼改变事件
 	async DormitoryChange(){
 		if (this.queryData.Dormitory != null && this.queryData.Dormitory!=undefined && this.queryData.Dormitory != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Unit = result.data.filter(t=>t.parentid===this.queryData.Dormitory).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Dormitory).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.Unit='';
+		this.queryData.Floor='';
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.queryData.Unit != null && this.queryData.Unit!=undefined && this.queryData.Unit != "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Floor = result.data.filter(t=>t.parentid===this.queryData.Unit).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Unit).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.Floor='';
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.queryData.Floor != null && this.queryData.Floor!=undefined && this.queryData.Floor != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.RId = result.data.filter(t=>t.parentid===this.queryData.Floor).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.queryData.Floor).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.queryData.RId='';
 		this.searchChange()
 	},
 	  

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_DailyAssess/single.vue

@@ -237,25 +237,25 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_DailyAssess.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_DailyAssess.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_DailyAssess.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_DailyAssess.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-	      this.dataSource.Acc_DailyAssess.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_DailyAssess.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -373,60 +373,69 @@ export default {
 	async DormitoryChange(){
 		if (this.getValue('Acc_DailyAssess.Dormitory') != null && this.getValue('Acc_DailyAssess.Dormitory') !=undefined && this.getValue('Acc_DailyAssess.Dormitory') != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Unit = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.Unit','');
+		this.setValue('Acc_DailyAssess.Floor','');
+		this.setValue('Acc_DailyAssess.RId','');
 	},//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.getValue('Acc_DailyAssess.Unit') != null && this.getValue('Acc_DailyAssess.Unit')!=undefined && this.getValue('Acc_DailyAssess.Unit')!= "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Floor = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Unit')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Unit')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_DailyAssess.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.Floor','');
+		this.setValue('Acc_DailyAssess.RId','');
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.getValue('Acc_DailyAssess.Floor') != null && this.getValue('Acc_DailyAssess.Floor')!=undefined && this.getValue('Acc_DailyAssess.Floor') != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_DailyAssess.RId = result.data.filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Floor')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_DailyAssess.Floor')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_DailyAssess.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_DailyAssess.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.RId','');
 	},
 	//多条件查询：专业部改变事件
 	async DeptNoChange(){
 		if (this.getValue('Acc_DailyAssess.DeptNo') != null && this.getValue('Acc_DailyAssess.DeptNo')!=undefined && this.getValue('Acc_DailyAssess.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_DailyAssess.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_DailyAssess.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_DailyAssess.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.MajorNo','');
+		this.setValue('Acc_DailyAssess.ClassNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_DailyAssess.MajorNo') != null && this.getValue('Acc_DailyAssess.MajorNo')!=undefined && this.getValue('Acc_DailyAssess.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_DailyAssess.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_DailyAssess.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_DailyAssess.ClassNo','');
 	},
 	
 	

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 ="姓名"
         /> 
   
         <!-- 重置查询条件按钮 --> 
@@ -211,25 +211,25 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-          this.dataSource.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-          this.dataSource.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-          this.dataSource.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }),  
 		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-          this.dataSource.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+          this.dataSource.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
         }), 
 		this.FETCH_DATASOURCE('BaseUser').then(result => { 
           this.dataSource.F_CreateAccount = result.data.map(t => ({ text: t.f_realname, value: t.f_account })) 
@@ -373,26 +373,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	

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

@@ -191,25 +191,25 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_GoodsDemage.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno }))
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_DormitoryData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Dormitory = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.Dormitory = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_UnitData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('Acc_FloorData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
-	    }),  
+	      this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
+		}),  
 	  		this.FETCH_DATASOURCE('Acc_RoomData').then(result => { 
-	      this.dataSource.Acc_GoodsDemage.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+	      this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 	    }), 
 	    
 	    
@@ -324,60 +324,69 @@ export default {
 	async DormitoryChange(){
 		if (this.getValue('Acc_GoodsDemage.Dormitory') != null && this.getValue('Acc_GoodsDemage.Dormitory') !=undefined && this.getValue('Acc_GoodsDemage.Dormitory') != "") {
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Unit = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Dormitory') ).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_UnitData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Unit = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Unit = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.Unit','');
+		this.setValue('Acc_GoodsDemage.Floor','');
+		this.setValue('Acc_GoodsDemage.RId','');
 	},//多条件查询：单元改变事件
 	async UnitChange(){
 		if (this.getValue('Acc_GoodsDemage.Unit') != null && this.getValue('Acc_GoodsDemage.Unit')!=undefined && this.getValue('Acc_GoodsDemage.Unit')!= "") {
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Floor = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Unit')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Unit')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_FloorData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.Floor = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.Floor = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.Floor','');
+		this.setValue('Acc_GoodsDemage.RId','');
 	},
 	//多条件查询：楼层改变事件
 	async FloorChange(){
 		if (this.getValue('Acc_GoodsDemage.Floor') != null && this.getValue('Acc_GoodsDemage.Floor')!=undefined && this.getValue('Acc_GoodsDemage.Floor') != "") {
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.RId = result.data.filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Floor')).map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.dno-b.dno}).filter(t=>t.parentid===this.getValue('Acc_GoodsDemage.Floor')).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('Acc_RoomData').then(result => {
-			  this.dataSource.Acc_GoodsDemage.RId = result.data.map(t => ({ text: t.name, value: t.id })) 
+			  this.dataSource.Acc_GoodsDemage.RId = result.data.sort((a,b)=>{return a.parentid-b.parentid}).map(t => ({ text: t.name, value: t.id })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.RId','');
 	},
 	//多条件查询：专业部改变事件
 	async DeptNoChange(){
 		if (this.getValue('Acc_GoodsDemage.DeptNo') != null && this.getValue('Acc_GoodsDemage.DeptNo')!=undefined && this.getValue('Acc_GoodsDemage.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_GoodsDemage.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_GoodsDemage.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_GoodsDemage.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.MajorNo','');
+		this.setValue('Acc_GoodsDemage.ClassNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_GoodsDemage.MajorNo') != null && this.getValue('Acc_GoodsDemage.MajorNo')!=undefined && this.getValue('Acc_GoodsDemage.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_GoodsDemage.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_GoodsDemage.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_GoodsDemage.ClassNo','');
 	},
 	
 	

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

@@ -199,13 +199,13 @@ export default {
       // 拉取加载列表和数据源 
       await Promise.all([ 
         this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+          this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
         }), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+          this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
         }),  
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
           this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -349,26 +349,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_PublicAreaHealth/single.vue

@@ -179,13 +179,13 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_PublicAreaHealth.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_PublicAreaHealth.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_PublicAreaHealth.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -304,25 +304,28 @@ export default {
 	async DeptNoChange(){
 		if (this.getValue('Acc_PublicAreaHealth.DeptNo') != null && this.getValue('Acc_PublicAreaHealth.DeptNo')!=undefined && this.getValue('Acc_PublicAreaHealth.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_PublicAreaHealth.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_PublicAreaHealth.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_PublicAreaHealth.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_PublicAreaHealth.MajorNo','');
+		this.setValue('Acc_PublicAreaHealth.ClassNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_PublicAreaHealth.MajorNo') != null && this.getValue('Acc_PublicAreaHealth.MajorNo')!=undefined && this.getValue('Acc_PublicAreaHealth.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_PublicAreaHealth.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_PublicAreaHealth.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_PublicAreaHealth.ClassNo','');
 	},
 	
 	

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

@@ -198,18 +198,18 @@ export default {
   
       // 拉取加载列表和数据源 
       await Promise.all([ 
-        this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-          this.dataSource.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
-        }), 
+		this.FETCH_DATASOURCE('CdDeptInfo').then(result => {
+		  this.dataSource.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
+		}), 
 		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 		}),  
 		this.FETCH_DATASOURCE('bjsj').then(result => { 
-          this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
-        }),  
+		  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
+		}),  
 		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
-          this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
-        }), 
+		  this.dataSource.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
+		}), 
   
   
         () => {} 
@@ -349,26 +349,29 @@ export default {
 	async DeptNoChange(){
 		if (this.queryData.DeptNo != null && this.queryData.DeptNo!=undefined && this.queryData.DeptNo != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.queryData.DeptNo).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.queryData.MajorNo='';
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.queryData.MajorNo != null && this.queryData.MajorNo!=undefined && this.queryData.MajorNo != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.queryData.MajorNo).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.queryData.ClassNo='';
 		this.searchChange()
 	},
 	

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LogisticsManagement/Acc_StuDayRoutine/single.vue

@@ -179,13 +179,13 @@ export default {
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
 	  await Promise.all([ 
 	    this.FETCH_DATASOURCE('CdDeptInfo').then(result => { 
-	      this.dataSource.Acc_StuDayRoutine.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno })) 
+	      this.dataSource.Acc_StuDayRoutine.DeptNo = result.data.sort((a,b)=>{return a.deptsort-b.deptsort}).map(t => ({ text: t.deptname, value: t.deptno })) 
 	    }), 
 	  		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-	  		  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+	  		  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 	  		}),  
 	  		this.FETCH_DATASOURCE('bjsj').then(result => { 
-	      this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+	      this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 	    }),  
 	  		this.FETCH_DATASOURCE('StuInfoBasic').then(result => { 
 	      this.dataSource.Acc_StuDayRoutine.StuNo = result.data.map(t => ({ text: t.stuname, value: t.stuno })) 
@@ -304,25 +304,28 @@ export default {
 	async DeptNoChange(){
 		if (this.getValue('Acc_StuDayRoutine.DeptNo') != null && this.getValue('Acc_StuDayRoutine.DeptNo')!=undefined && this.getValue('Acc_StuDayRoutine.DeptNo') != "") {
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.filter(t=>t.deptno===this.getValue('Acc_StuDayRoutine.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).filter(t=>t.deptno===this.getValue('Acc_StuDayRoutine.DeptNo')).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+			  this.dataSource.Acc_StuDayRoutine.MajorNo = result.data.sort((a,b)=>{return a.majorno-b.majorno}).map(t => ({ text: t.majorname, value: t.majorno })) 
 			})
 		}
+		this.setValue('Acc_StuDayRoutine.MajorNo','');
+		this.setValue('Acc_StuDayRoutine.ClassNo','');
 	},
 	//多条件查询：专业改变事件
 	async MajorNoChange(){
 		if (this.getValue('Acc_StuDayRoutine.MajorNo') != null && this.getValue('Acc_StuDayRoutine.MajorNo')!=undefined && this.getValue('Acc_StuDayRoutine.MajorNo') != "") {
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).filter(t=>t.majorno===this.getValue('Acc_StuDayRoutine.MajorNo')).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}else{
 			this.FETCH_DATASOURCE('bjsj').then(result => {
-			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.map(t => ({ text: t.classname, value: t.classno })) 
+			  this.dataSource.Acc_StuDayRoutine.ClassNo = result.data.sort((a,b)=>{return a.classno-b.classno}).map(t => ({ text: t.classname, value: t.classno })) 
 			})
 		}
+		this.setValue('Acc_StuDayRoutine.ClassNo','');
 	},