Merge branch '临城职教中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 临城职教中职

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/organize-picker.vue

@@ -62,7 +62,7 @@ export default {
 	  
 	  let values = this.value.split(",")
 	  if(values.length>1){
-		  const orgItems = values.map(t=>list[t].name).toString()
+		  const orgItems = values.map(t=>list[t]?list[t].name:'').toString()
 		  return orgItems
 	  }
 	  

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
   <view class="page">
     <!-- 主列表页 -->
     <view
@@ -101,13 +101,13 @@
           title="会议地点"
           placeholder="按会议地点查询"
         />
-        <l-organize-picker
+        <!-- <l-organize-picker
           v-model="queryData.CreateUser"
           @change="searchChange"
           type="user"
           title="申请人"
           placeholder="按申请人查询"
-        />
+        /> -->
 
         <!-- 重置查询条件按钮 -->
         <view class="padding-tb">

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/common/select-organize-multiple.vue

@@ -59,8 +59,8 @@ export default {
 		  let arr = this.ids.split(",")
 		  let items = []
 		  for (let s of arr) {
-			  if(this.GET_GLOBAL("user")[s]){
-				  items.push({...this.GET_GLOBAL("user")[s],id:s})
+			  if(this.GET_GLOBAL(type)[s]){
+			  	items.push({...this.GET_GLOBAL(type)[s],id:s})
 			  }
 		  }
 		  this.items = items
@@ -77,7 +77,7 @@ export default {
       this.type = type || 'user'
 
       const selectType = { user: '职员', department: '部门', company: '公司' }[type]
-      this.SET_TITLE(`请选择一个${selectType}`)
+      this.SET_TITLE(`请选择${selectType}`)
     },
 	
 	findItem(arr,item){

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

@@ -107,7 +107,23 @@
 					{
 						en: 'TEN',
 						cn: '星期十'
-					}
+					},
+					{
+						en: 'ELEVEN',
+						cn: '星期十一'
+					},
+					{
+						en: 'TWELVE',
+						cn: '星期十二'
+					},
+					{
+						en: 'THIRTEEN',
+						cn: '星期十三'
+					},
+					{
+						en: 'FOURTEEN',
+						cn: '星期十四'
+					},
 				]
 			};
 		},
@@ -120,7 +136,7 @@
 				let _this = this;
 				// _this.todayWeek = common.weekday2();
 				_this.weekDayTime = 14 * common.oneDayTime();
-				_this.noClassTime = 4 * common.oneDayTime();
+				_this.noClassTime = 0 * common.oneDayTime();
 				_this.loadData();
 			},
 			liTap(ind) {
@@ -174,7 +190,7 @@
 			// 处理课程数据
 			ProcessingData(res) {
 				let courseCateByDay = {}
-				for (let i = 1; i < 11; i++) {
+				for (let i = 1; i < 15; i++) {
 					courseCateByDay[i] = []
 				}
 				res.forEach((item) => {
@@ -299,11 +315,12 @@
 	}
 
 	.tSec2TopUl {
-		width: 800px;
+		width: 1200px;
+		overflow: hidden;
 	}
 
 	.tSec2TopLi {
-		width: 10%;
+		width: 7.14%;
 		float: left;
 		line-height: 18px;
 		padding: 9px 0 9px;
@@ -327,7 +344,7 @@
 		display: block;
 	}
 
-	.tSec2TopLi text:first-child {
+	.tSec2TopLi:nth-child(-n + 10) text:first-child {
 		letter-spacing: 2px;
 		text-transform: uppercase;
 	}