Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml

@@ -19,13 +19,13 @@
                                     <div id="MajorNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">班级</div>
-                                    <div id="ClassNo"></div>
-                                </div>
-                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">姓名</div>
                                     <input id="StuName" type="text" class="form-control" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js

@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
                     var Grades = $("#Grade").lrselectGet();
-                    if (Grades) {
+                    if (Grades != null && Grades != "" && Grades != "undefined") {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
@@ -78,12 +78,14 @@ var bootstrap = function ($, learun) {
                 text: "text",
                 select: function (item) {
                     var MajorNos = $("#MajorNo").lrselectGet();
-                    if (MajorNos) {
+                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
                                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.MajorNos + "' AND CheckMark=1 AND Grade='" + item + "' order by classno desc" }
+                                param: {
+                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
@@ -97,7 +99,9 @@ var bootstrap = function ($, learun) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
                                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: " CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                                param: {
+                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
@@ -106,7 +110,8 @@ var bootstrap = function ($, learun) {
                                 param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
                             });
                         }
-                    }
+                    }   
+
                 }
             });
             $('#ClassNo').lrselect({

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

@@ -67,7 +67,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/components/learun-app/upload-file.vue

@@ -111,7 +111,7 @@ export default {
       //   }
       // })
 	  
-	  uni.chooseImage({
+	  uni.chooseFile({
 	    count: Number(this.number),
 	    sizeType: ['original', 'compressed'],
 	    sourceType: ['album', 'camera'],

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

@@ -106,13 +106,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/PersonnelManagement/MeetingManagement/single.vue

@@ -51,7 +51,7 @@
 	    :readonly="!edit"
 	    type="user"
 	    title="参会人员"
-	  	multiple
+	  	:multiple="true"
 	  />
       <l-organize-picker
         @input="setValue('MeetingManagement.RecordPerson', $event)"
@@ -188,11 +188,10 @@ export default {
     async fetchForm() {
       if (this.mode === 'create') {
         this.origin = await this.getDefaultForm()
-		console.log(this.origin)
       } else {
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/MeetingManagement/form', this.id)
         this.origin = await this.formatFormData(result)
-		console.log(this.origin)
+		console.log(this.origin,this.origin.prototype)
       }
       this.current = this.COPY(this.origin)
     },

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

@@ -7,7 +7,7 @@
 		<!-- </view> -->
 		<view>
 			<view class="pearson">
-				已选择人员：{{names||'暂无'}}
+				已选择：{{names||'暂无'}}
 			</view>
 			<view style="display: flex;justify-content: center;">
 				<view class="cu-btn sm line-red" @tap="itemClear" style="font-size: 16px;margin: 4px;">
@@ -64,8 +64,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
@@ -82,7 +82,7 @@ export default {
       this.type = type || 'user'
 
       const selectType = { user: '职员', department: '部门', company: '公司' }[type]
-      this.SET_TITLE(`请选择一个${selectType}`)
+      this.SET_TITLE(`请选择${selectType}`)
     },
 	
 	findItem(arr,item){