Merge branch '新疆警官学校中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 新疆警官学校中职

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js

@@ -359,7 +359,7 @@ export default {
 
         case 'radio':
         case 'select':
-          if (!val || !dataSource.map(t => t.value).includes(String(val))) { return '' }
+          if ((!val&&val!==0) || !dataSource.map(t => t.value).includes(String(val))) { return '' }
           return String(val)
 	    case 'selectNoMap':
 		  if (!val) { return '' }

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

@@ -100,6 +100,20 @@
 							<text class="customlist-item-field-title">辅导员：</text>
 							{{ displayListItem(item, "ClassTutorNo") }}
 						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">区队：</text>
+							{{ displayListItem(item, "DistrictTeam") }}
+						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">校内/外出：</text>
+							{{ displayListItem(item, "IsCampus") }}
+						</view>
+						<view class="customlist-item-field" v-show="item.IsCampus == 1">
+							<text class="customlist-item-field-title">过夜：</text>
+							{{ displayListItem(item, "IsStay") }}
+						</view>
 
 						<l-customlist-action :showButton="!item.CheckStatus" buttonText="审核"
 							@join="action('check', item.Id)" @view="action('view', item.Id)" />
@@ -221,7 +235,19 @@
 					},
 					ClassTutorNo: {
 						type: "select",dataSource: '1', dataSourceId: 'ClassTutorNo'
-					}
+					},
+					Code: {
+						type: "text"
+					},
+					DistrictTeam: {
+						type: "text"
+					},
+					IsCampus: {
+						type: "select",dataSource: '1'
+					},
+					IsStay: {
+						type: "select",dataSource: '1'
+					},
 				},
 
 				// 查询条件
@@ -246,6 +272,11 @@
 						value: t.value,
 						text: t.text
 					})),
+					IsCampus:[{ text: "外出假", value: "1" }, { text: "校内假", value: "0" }],
+					IsStay: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+						value: t.value,
+						text: t.text
+					})),
 					// CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({
 					// 	value: t.value,
 					// 	text: t.text

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

@@ -1,6 +1,34 @@
 <template>
   <view class="page">
     <view v-if="ready">
+		<l-input
+		  @input="setValue('StuLeaveManagement.Code', $event)"
+		  :value="getValue('StuLeaveManagement.Code')"
+		  title="编号"
+			disabled
+		/>
+		<l-input
+		  @input="setValue('StuLeaveManagement.DistrictTeam', $event)"
+		  :value="getValue('StuLeaveManagement.DistrictTeam')"
+		  title="区队"
+			disabled
+		/>
+		<l-select
+		  @input="setValue('StuLeaveManagement.IsCampus', $event)"
+		  :value="getValue('StuLeaveManagement.IsCampus')"
+			:range="dataSource.StuLeaveManagement.IsCampus"
+		  title="校内/外出"
+				required
+				disabled
+		/>
+		<l-select
+				v-show="getValue('StuLeaveManagement.IsCampus') == '1'"
+		  @input="setValue('StuLeaveManagement.IsStay', $event)"
+		  :value="getValue('StuLeaveManagement.IsStay')"
+			:range="dataSource.StuLeaveManagement.IsStay"
+		  title="过夜"
+				disabled
+		/>
       <!-- <l-select
         @input="setValue('StuLeaveManagement.CheckStatus', $event)"
         :value="getValue('StuLeaveManagement.CheckStatus')"
@@ -214,7 +242,18 @@ export default {
 		  MajorNo: { type: 'select', title: '专业', dataSource: '1', },
 		  ClassDiredctorNo: { type: 'select', title: '班主任',dataSource: '1', },
 		  ClassTutorNo: { type: 'select', title: '辅导员',dataSource: '1', },
-		  
+		  Code: {
+		  	type: "text", title: '编号',
+		  },
+		  DistrictTeam: {
+		  	type: "text", title: '区队',
+		  },
+		  IsCampus: {
+		  	type: "select",dataSource: '1', title: '校内/外出',verify:"NotNull"
+		  },
+		  IsStay: {
+		  	type: "select",dataSource: '1', title: '过夜'
+		  },
         },
 
       },
@@ -229,6 +268,11 @@ export default {
 			  ClassDiredctorNo:[],
 			  CheckUserNo:[],
 			  LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })),
+			  IsCampus:[{ text: "外出假", value: "1" }, { text: "校内假", value: "0" }],
+			  IsStay: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+			  	value: t.value,
+			  	text: t.text
+			  })),
 			  // CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
 		  }
       }

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

@@ -93,6 +93,25 @@
 							<text class="customlist-item-field-title">辅导员：</text>
 							{{ displayListItem(item, "ClassTutorNo") }}
 						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">编号：</text>
+							{{ displayListItem(item, "Code") }}
+						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">区队：</text>
+							{{ displayListItem(item, "DistrictTeam") }}
+						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">校内/外出：</text>
+							{{ displayListItem(item, "IsCampus") }}
+						</view>
+						<view class="customlist-item-field" v-show="item.IsCampus == 1">
+							<text class="customlist-item-field-title">过夜：</text>
+							{{ displayListItem(item, "IsStay") }}
+						</view>
 
 						<l-customlist-action 
 							:showButton="item.CheckStatus ==0 && user.userId == item.CreateUserId" buttonText="提交"  @join="action('join', item.Id)" 
@@ -206,7 +225,19 @@
 					},
 					ClassTutorNo: {
 						type: "select",dataSource: '1', dataSourceId: 'ClassTutorNo'
-					}
+					},
+					Code: {
+						type: "text"
+					},
+					DistrictTeam: {
+						type: "text"
+					},
+					IsCampus: {
+						type: "select",dataSource: '1'
+					},
+					IsStay: {
+						type: "select",dataSource: '1'
+					},
 				},
 
 				// 查询条件
@@ -230,6 +261,11 @@
 						value: t.value,
 						text: t.text
 					})),
+					IsCampus:[{ text: "外出假", value: "1" }, { text: "校内假", value: "0" }],
+					IsStay: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+						value: t.value,
+						text: t.text
+					})),
 					CheckStatus:[
 						{
 							value:'0',

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

@@ -1,6 +1,34 @@
 <template>
   <view class="page">
     <view v-if="ready">
+	  <l-input
+	    @input="setValue('StuLeaveManagement.Code', $event)"
+	    :value="getValue('StuLeaveManagement.Code')"
+	    title="编号"
+	  	:disabled="!edit"
+	  />
+	  <l-input
+	    @input="setValue('StuLeaveManagement.DistrictTeam', $event)"
+	    :value="getValue('StuLeaveManagement.DistrictTeam')"
+	    title="区队"
+	  	:disabled="!edit"
+	  />
+	  <l-select
+	    @input="setValue('StuLeaveManagement.IsCampus', $event)"
+	    :value="getValue('StuLeaveManagement.IsCampus')"
+	  	:range="dataSource.StuLeaveManagement.IsCampus"
+	    title="校内/外出"
+		required
+		:disabled="!edit"
+	  />
+	  <l-select
+		v-show="getValue('StuLeaveManagement.IsCampus') == '1'"
+	    @input="setValue('StuLeaveManagement.IsStay', $event)"
+	    :value="getValue('StuLeaveManagement.IsStay')"
+	  	:range="dataSource.StuLeaveManagement.IsStay"
+	    title="过夜"
+		:disabled="!edit"
+	  />
       <!-- <l-select
         @input="setValue('StuLeaveManagement.CheckStatus', $event)"
         :value="getValue('StuLeaveManagement.CheckStatus')"
@@ -224,7 +252,18 @@ export default {
 		  MajorNo: { type: 'select', title: '专业', dataSource: '1', },
 		  ClassDiredctorNo: { type: 'select', title: '班主任',dataSource: '1', },
 		  ClassTutorNo: { type: 'select', title: '辅导员',dataSource: '1', },
-		  
+		  Code: {
+		  	type: "text", title: '编号',
+		  },
+		  DistrictTeam: {
+		  	type: "text", title: '区队',
+		  },
+		  IsCampus: {
+		  	type: "select",dataSource: '1', title: '校内/外出',verify:"NotNull"
+		  },
+		  IsStay: {
+		  	type: "select",dataSource: '1', title: '过夜'
+		  },
         },
 
       },
@@ -239,6 +278,11 @@ export default {
 			  ClassDiredctorNo:[],
 			  CheckUserNo:[],
 			  LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({ value: t.value, text: t.text })),
+			  IsCampus:[{ text: "外出假", value: "1" }, { text: "校内假", value: "0" }],
+			  IsStay: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+			  	value: t.value,
+			  	text: t.text
+			  })),
 			  // CheckStatus: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text }))
 		  }
       }
@@ -279,7 +323,6 @@ export default {
 		  	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 }));
 		  }),
       ])
@@ -327,6 +370,10 @@ export default {
 		  let StartTime = Date.parse(this.current.StuLeaveManagement.StartTime)
 		  let EndTime = Date.parse(this.current.StuLeaveManagement.EndTime)
 		  
+		  if(this.current.StuLeaveManagement.IsCampus == '0'){
+			  this.current.StuLeaveManagement.IsStay = '0'
+		  }
+		  
 		  if(StartTime > EndTime){
 			  this.TOAST('结束时间不能早于开始时间')
 			  return