工作日志bug修改，请假管理字段数据源展示

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

@@ -21,10 +21,10 @@
 							{{ displayListItem(item, 'JTypeId') }}
 						</view>
 
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">接收人：</text>
 							{{ displayListItem(item, 'JReceiveId') }}
-						</view>
+						</view> -->
 
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">日志内容：</text>
@@ -97,10 +97,10 @@
 						type: 'select',
 						dataSource: '0'
 					},
-					JReceiveId: {
-						type: 'organize',
-						dataType: 'user'
-					},
+					// JReceiveId: {
+					// 	type: 'organize',
+					// 	dataType: 'user'
+					// },
 					JContent: {
 						type: 'textarea'
 					},

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue

@@ -5,8 +5,8 @@
 				:disabled="!edit" title="日志主题" required />
 			<l-select @input="setValue('JournalSend.JTypeId', $event)" :value="getValue('JournalSend.JTypeId')"
 				:disabled="!edit" :range="dataSource.JournalSend.JTypeId" title="日志类型" required />
-			<l-organize-picker @input="setValue('JournalSend.JReceiveId', $event)"
-				:value="getValue('JournalSend.JReceiveId')" :readonly="!edit" type="user" title="接收人" />
+			<!-- <l-organize-picker @input="setValue('JournalSend.JReceiveId', $event)"
+				:value="getValue('JournalSend.JReceiveId')" :readonly="!edit" type="user" title="接收人" required /> -->
 			<l-textarea @input="setValue('JournalSend.JContent', $event)" :value="getValue('JournalSend.JContent')"
 				:readonly="!edit" title="日志内容" required />
 		</view>
@@ -82,11 +82,12 @@
 							dataSource: '0',
 							verify: "NotNull"
 						},
-						JReceiveId: {
-							type: 'organize',
-							title: '接收人',
-							dataType: 'user'
-						},
+						// JReceiveId: {
+						// 	type: 'organize',
+						// 	title: '接收人',
+						// 	dataType: 'user',
+						// 	verify: "NotNull"
+						// },
 						JContent: {
 							type: 'textarea',
 							title: '日志内容',
@@ -176,7 +177,7 @@
 						this.LOADING('正在提交...')
 						const postData = await this.getPostData(this.id)
 
-						this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败')
+						this.HTTP_POST('learun/adms/EducationalAdministration/Journal/savePt', postData, '表单提交保存失败')
 							.then(success => {
 								this.HIDE_LOADING()
 								if (!success) {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/list.vue

@@ -171,10 +171,14 @@
 						type: "text"
 					},
 					CheckUserNo: {
-						type: "text"
+						type: "select",
+						dataSource: '1',
+						dataSourceId: 'CheckUserNo'
 					},
 					LeaveType: {
-						type: "select",dataSource: '1', dataSourceId: 'LeaveType'
+						type: "select",
+						dataSource: '1',
+						dataSourceId: 'LeaveType'
 					},
 					StartTime: {
 						type: "text"
@@ -198,19 +202,19 @@
 						type: "text"
 					},
 					ClassNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'ClassNo'
 					},
 					DeptNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'DeptNo'
 					},
 					MajorNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'MajorNo'
 					},
 					ClassDiredctorNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'ClassDiredctorNo'
 					},
 					ClassTutorNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'ClassTutorNo'
 					}
 				},
 
@@ -225,6 +229,12 @@
 
 				// 数据源
 				dataSource: {
+					ClassNo:[],
+					DeptNo:[],
+					MajorNo:[],
+					ClassDiredctorNo:[],
+					CheckUserNo:[],
+					ClassTutorNo:[],
 					LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({
 						value: t.value,
 						text: t.text
@@ -266,7 +276,24 @@
 
 				// 拉取加载列表和数据源
 				await Promise.all([
-
+					this.FETCH_DATASOURCE('bjsj').then(result => {
+					  this.dataSource.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.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.ClassTutorNo = 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.CheckUserNo = 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.DeptNo = result.data.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 }));
+					}),
 				]);
 				await this.fetchList();
 				// 初始化查询条件
@@ -387,16 +414,17 @@
 						return;
 
 					case 'check':
-						await this.HTTP_GET('/Learun/adms/EducationalAdministration/StuLeaveManagement/ischeck', id).then(res=>{
-							if(res){
-								this.NAV_TO(`./single?type=edit&id=${id}`)
-								return
-							}else{
-								return;
-							}
-						})
+						await this.HTTP_GET('/Learun/adms/EducationalAdministration/StuLeaveManagement/ischeck', id)
+							.then(res => {
+								if (res) {
+									this.NAV_TO(`./single?type=edit&id=${id}`)
+									return
+								} else {
+									return;
+								}
+							})
 						return;
-						
+
 					default:
 						return;
 				}

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/Check/single.vue

@@ -22,9 +22,10 @@
 	  		v-if="!edit"
 	  		:disabled="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.CheckUserNo', $event)"
 	    :value="getValue('StuLeaveManagement.CheckUserNo')"
+		:range="dataSource.StuLeaveManagement.CheckUserNo"
 	    title="审核人"
 		v-if="!edit"
 		:disabled="!edit"
@@ -86,37 +87,42 @@
 		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"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.ClassTutorNo', $event)"
 	    :value="getValue('StuLeaveManagement.ClassTutorNo')"
+		:range="dataSource.StuLeaveManagement.ClassTutorNo"
 	    title="辅导员"
 		disabled
 		v-if="!edit"
@@ -185,7 +191,7 @@ export default {
           CheckStatus: { type: 'select', title: '审核状态', dataSource: '0',verify:"NotNull" },
           CheckRemark: { type: 'texteditor', title: '审核备注', },
 		  CheckTime:{ type: 'text', title: '审核人' },
-		  CheckUserNo: { type: 'text', title: '审核人' },
+		  CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' },
 		  LeaveType: { type: 'select', title: '请假类型', dataSource: '0' },
           StartTime: { type: 'datetime', title: '开始时间', dateformat: '1'  },
           EndTime: { type: 'datetime', title: '结束时间', dateformat: '1'  },
@@ -194,11 +200,11 @@ export default {
 		  CreateUserNo: { 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: '班主任' },
-		  ClassTutorNo: { 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: 'select', title: '辅导员',dataSource: '1', },
 		  
         },
 
@@ -207,6 +213,12 @@ export default {
       // 数据源
       dataSource: {
 		  StuLeaveManagement:{
+			  ClassNo:[],
+			  DeptNo:[],
+			  MajorNo:[],
+			  ClassTutorNo:[],
+			  ClassDiredctorNo:[],
+			  CheckUserNo:[],
 			  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 }))
 		  }
@@ -229,9 +241,26 @@ export default {
 
       // 拉取表单数据，同时拉取所有来自数据源的选单数据
       await Promise.all([
-		  // 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('EmpInfo').then(result => {
+		  	this.dataSource.StuLeaveManagement.CheckUserNo = 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()
 

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

@@ -164,7 +164,7 @@
 						type: "text"
 					},
 					CheckUserNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'CheckUserNo'
 					},
 					LeaveType: {
 						type: "select",dataSource: '1', dataSourceId: 'LeaveType'
@@ -203,7 +203,7 @@
 						type: "select",dataSource: '1', dataSourceId: 'ClassDiredctorNo'
 					},
 					ClassTutorNo: {
-						type: "text"
+						type: "select",dataSource: '1', dataSourceId: 'ClassTutorNo'
 					}
 				},
 
@@ -222,6 +222,8 @@
 					DeptNo:[],
 					MajorNo:[],
 					ClassDiredctorNo:[],
+					CheckUserNo:[],
+					ClassTutorNo:[],
 					LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({
 						value: t.value,
 						text: t.text
@@ -269,12 +271,20 @@
 					this.FETCH_DATASOURCE('EmpInfo').then(result => {
 						this.dataSource.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.ClassTutorNo = 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.CheckUserNo = 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.DeptNo = result.data.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 }));
 					}),
+					
+					
 				]);
 				await this.fetchList();
 				// 初始化查询条件

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuLeaveManagement/single.vue

@@ -16,9 +16,10 @@
 		v-if="!edit"
 		:readonly="!edit"
       />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.CheckUserNo', $event)"
 	    :value="getValue('StuLeaveManagement.CheckUserNo')"
+		:range="dataSource.StuLeaveManagement.CheckUserNo"
 	    title="审核人"
 		v-if="!edit"
 		:disabled="!edit"
@@ -126,7 +127,7 @@
 		disabled
 		v-if="!edit"
 	  />
-	  <l-input
+	  <l-select
 	    @input="setValue('StuLeaveManagement.ClassTutorNo', $event)"
 	    :value="getValue('StuLeaveManagement.ClassTutorNo')"
 		:range="dataSource.StuLeaveManagement.ClassTutorNo"
@@ -197,7 +198,7 @@ export default {
         StuLeaveManagement: {
           CheckStatus: { type: 'select', title: '审核状态', dataSource: '0' },
           CheckRemark: { type: 'texteditor', title: '审核备注', },
-		  CheckUserNo: { type: 'text', title: '审核人' },
+		  CreateUserNo: { type: 'text', title: '学号' },
 		  LeaveType: { type: 'select', title: '请假类型', dataSource: '0',verify:"NotNull" },
 		   StartTime: { type: 'datetime', title: '开始时间',verify:"NotNull", dateformat: '0' }, 
 		   EndTime:{type: 'datetime', title: '结束时间', verify:"NotNull",dateformat: '0'},
@@ -206,14 +207,14 @@ export default {
 		  
 		  LeaveDay: { type: 'number', title: '请假天数',verify:"NumOrNull" },
 		  LeaveReason: { type: 'texteditor', title: '请假事由' },
-		  CheckUserNo: { type: 'text', title: '学号' },
+		  CheckUserNo: { type: 'select', title: '审核人',dataSource: '1' },
 		  CreateUserName: { type: 'text', title: '姓名' },
 		  CreateTime: { 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: '辅导员' },
+		  ClassTutorNo: { type: 'select', title: '辅导员',dataSource: '1', },
 		  
         },
 
@@ -227,6 +228,7 @@ export default {
 			  MajorNo:[],
 			  ClassTutorNo:[],
 			  ClassDiredctorNo:[],
+			  CheckUserNo:[],
 			  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 }))
 		  }
@@ -262,6 +264,9 @@ export default {
 		  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('EmpInfo').then(result => {
+		  	this.dataSource.StuLeaveManagement.CheckUserNo = 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 }));
 		  }),