From 8711a7765018bf37cc26d691152437acdd549b54 Mon Sep 17 00:00:00 2001
From: lb01 <Vimicro@lb>
Date: Sat, 26 Nov 2022 16:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E5=A4=A9=E8=AF=B7?=
 =?UTF-8?q?=E5=81=87=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuLeaveManagement/single.vue             | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue
index 14010c6b3..6f83fac29 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue	
@@ -94,30 +94,34 @@
 		disabled
 		v-if="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.ClassNo', $event)"
 	    :value="getValue('StuLeaveManagement.ClassNo')"
+		:range="dataSource.StuLeaveManagement.ClassNo"
 	    title="班级"
 		disabled
 		v-if="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.DeptNo', $event)"
 	    :value="getValue('StuLeaveManagement.DeptNo')"
+		:range="dataSource.StuLeaveManagement.DeptNo"
 	    title="系部"
 		disabled
 		v-if="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.MajorNo', $event)"
 	    :value="getValue('StuLeaveManagement.MajorNo')"
+		:range="dataSource.StuLeaveManagement.MajorNo"
 	    title="专业"
 		disabled
 		v-if="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.ClassDiredctorNo', $event)"
 	    :value="getValue('StuLeaveManagement.ClassDiredctorNo')"
+		:range="dataSource.StuLeaveManagement.ClassDiredctorNo"
 	    title="班主任"
 		disabled
 		v-if="!edit"
@@ -125,6 +129,7 @@
 	  <l-input
 	    @input="setValue('StuLeaveManagement.ClassTutorNo', $event)"
 	    :value="getValue('StuLeaveManagement.ClassTutorNo')"
+		:range="dataSource.StuLeaveManagement.ClassTutorNo"
 	    title="辅导员"
 		disabled
 		v-if="!edit"
@@ -204,10 +209,10 @@ export default {
 		  CheckUserNo: { type: 'text', title: '学号' },
 		  CreateUserName: { type: 'text', title: '姓名' },
 		  CreateTime: { type: 'text', title: '申请时间' },
-		  ClassNo: { type: 'text', title: '班级' },
-		  DeptNo: { type: 'text', title: '系部' },
-		  MajorNo: { type: 'text', title: '专业' },
-		  ClassDiredctorNo: { type: 'text', title: '班主任' },
+		  ClassNo: {  type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' },
+		  DeptNo: { type: 'select', title: '系部', dataSource: '1', },
+		  MajorNo: { type: 'select', title: '专业', dataSource: '1', },
+		  ClassDiredctorNo: { type: 'select', title: '班主任',dataSource: '1', },
 		  ClassTutorNo: { type: 'text', title: '辅导员' },
 		  
         },
@@ -217,6 +222,11 @@ export default {
       // 数据源
       dataSource: {
 		  StuLeaveManagement:{
+			  ClassNo:[],
+			  DeptNo:[],
+			  MajorNo:[],
+			  ClassTutorNo:[],
+			  ClassDiredctorNo:[],
 			  LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })),
 			  CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
 		  }
@@ -242,6 +252,23 @@ export default {
 		  // this.FETCH_DATASOURCE('ConferenceRoom').then(result => {
 		  //   this.dataSource.StuLeaveManagement.CheckStatus = result.data.map(t => ({ text: t.name, value: t.id }))
 		  // }),
+		  this.FETCH_DATASOURCE('bjsj').then(result => {
+			  console.log(result)
+		    this.dataSource.StuLeaveManagement.ClassNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.classname, value: t.classno })) 
+		  }),
+		  this.FETCH_DATASOURCE('EmpInfo').then(result => {
+		  	this.dataSource.StuLeaveManagement.ClassDiredctorNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.empname, value: t.empno }));
+		  }),
+		  this.FETCH_DATASOURCE('EmpInfo').then(result => {
+		  	this.dataSource.StuLeaveManagement.ClassTutorNo = result.data.sort((a,b)=>{return b.classno-a.classno}).map(t => ({ text: t.empname, value: t.empno }));
+		  }),
+		  this.FETCH_DATASOURCE('CdDeptInfo').then(result => {
+		  	this.dataSource.StuLeaveManagement.DeptNo = result.data.map(t => ({ text: t.deptname, value: t.deptno }));
+		  }),
+		  this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
+			  console.log()
+		  	this.dataSource.StuLeaveManagement.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno }));
+		  }),
       ])
       await this.fetchForm()