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

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

@@ -6,7 +6,7 @@
 			<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="接收人" required />
+				:value="getValue('JournalSend.JReceiveId')" :readonly="!edit" type="user" title="接收人" />
 			<l-textarea @input="setValue('JournalSend.JContent', $event)" :value="getValue('JournalSend.JContent')"
 				:readonly="!edit" title="日志内容" required />
 		</view>
@@ -85,8 +85,7 @@
 						JReceiveId: {
 							type: 'organize',
 							title: '接收人',
-							dataType: 'user',
-							verify: "NotNull"
+							dataType: 'user'
 						},
 						JContent: {
 							type: 'textarea',

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

@@ -334,7 +334,7 @@
 						pagination: {
 							rows: 10,
 							page: this.page,
-							sidx: 'Id',
+							sidx: 'UpdateDate',
 							sord: 'DESC'
 						},
 						queryJson: JSON.stringify(Object.assign(this.searchData, {

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

@@ -10,7 +10,23 @@
         <l-customlist :tips="loadState" showTips> 
           <!-- 单条记录 --> 
           <view class="customlist-item" v-for="item of list" :key="item.Id"> 
-  
+			
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">申请时间：</text> 
+			  {{ displayListItem(item, 'UpdateDate') }} 
+			</view> 
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">审核状态：</text> 
+			  {{ IsCheckitem(displayListItem(item, 'IsCheck')) }} 
+			</view> 
+			
+			<view class="customlist-item-field">
+			  <text class="customlist-item-field-title">原上课时间：</text> 
+			  {{itmeDel(displayListItem(item, 'LessonDate'))  }} 
+			</view> 
+			
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">学年度：</text> 
               {{ displayListItem(item, 'AcademicYearNo') }} 
@@ -62,7 +78,7 @@
             </view> 
   
   
-            <l-customlist-action showButton buttonText="审核" @join="action('check',item.ID)"  @view="action('view', item.ID)" /> 
+            <l-customlist-action :showButton="!item.IsCheck" buttonText="审核" @join="action('check',item.ID)"  @view="action('view', item.ID)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -97,7 +113,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <!-- <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
   
   </view> 
 </template> 
@@ -131,6 +147,9 @@ export default {
     return { 
       // 数据项的数据类型、结构 
       scheme: { 
+	  UpdateDate:{type: 'text'},
+	  IsCheck:{type: 'text'},
+	  LessonDate:{type: 'text'},
         AcademicYearNo: { type: 'text' }, 
         Semester: { type: 'text' }, 
         StuNo: { type: 'text' }, 
@@ -138,8 +157,8 @@ export default {
         Grade: { type: 'text' }, 
         DeptNo: { type: 'text' }, 
         DeptName: { type: 'text' }, 
-        MajorNo: { type: 'text' }, 
-        MajorName: { type: 'text' }, 
+        MajorNo: { type: "text" }, 
+        MajorName: { type: "text" }, 
         ClassNo: { type: 'text' }, 
       }, 
   
@@ -153,6 +172,7 @@ export default {
   
       // 数据源 
       dataSource: { 
+		  MajorNo:[]
       }, 
   
       // 页面相关参数 
@@ -183,8 +203,9 @@ export default {
   
       // 拉取加载列表和数据源 
       await Promise.all([ 
-  
-  
+		this.FETCH_DATASOURCE('CdMajorInfo').then(result => {
+		  this.dataSource.MajorNo = result.data.map(t => ({ text: t.majorname, value: t.majorno })) 
+		}), 
         () => {} 
       ]) 
       await this.fetchList() 
@@ -202,7 +223,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'UpdateDate', sord: 'DESC' }, 
           queryJson: JSON.stringify(Object.assign(this.searchData,{ClassManagerNo:this.user.account})) 
         }, 
         '加载数据时出错'
@@ -314,12 +335,24 @@ export default {
   
         default: return value === null || value === undefined ? '' : value 
       } 
-    } 
+    },
+	IsCheckitem(data){
+		if(data){
+			return data == 1?'同意':'不同意'
+		}else{
+			return '待审核'
+		}
+	},
+	itmeDel(data){
+		var newDate = /\d{4}-\d{1,2}-\d{1,2}/g.exec(data)
+		return newDate[0]
+	} 
   
   },
    created() {
    	this.user = this.GET_GLOBAL('loginUser');
-   } 
+   },
+	
 } 
 </script> 
   

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

@@ -191,16 +191,16 @@
 						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"
@@ -218,6 +218,10 @@
 
 				// 数据源
 				dataSource: {
+					ClassNo:[],
+					DeptNo:[],
+					MajorNo:[],
+					ClassDiredctorNo:[],
 					LeaveType: Object.values(this.GET_GLOBAL('dataDictionary').LeaveType).map(t => ({
 						value: t.value,
 						text: t.text
@@ -259,7 +263,18 @@
 
 				// 拉取加载列表和数据源
 				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('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

@@ -31,7 +31,21 @@
 		required
 		:disabled="!edit"
 	  />
-      <l-datetime-picker
+	  <l-date-picker
+	    @input="setValue('StuLeaveManagement.StartTime', $event)"
+	    :value="getValue('StuLeaveManagement.StartTime')"
+	    :disabled="!edit"
+		required
+	    title="开始时间"
+	  /> 
+	  <l-date-picker
+	    @input="setValue('StuLeaveManagement.EndTime', $event)"
+	    :value="getValue('StuLeaveManagement.EndTime')"
+	    :disabled="!edit"
+		required
+	    title="结束时间"
+	  /> 
+     <!-- <l-datetime-picker
         @input="setValue('StuLeaveManagement.StartTime', $event)"
         :value="getValue('StuLeaveManagement.StartTime')"
         title="开始时间"
@@ -44,7 +58,7 @@
         title="结束时间"
 		required
 		:disabled="!edit"
-      />
+      /> -->
 	  <l-input
 	    @input="setValue('StuLeaveManagement.LeaveDay', $event)"
 	    :value="getValue( String('StuLeaveManagement.LeaveDay'))"
@@ -180,8 +194,11 @@ export default {
           CheckRemark: { type: 'texteditor', title: '审核备注', },
 		  CheckUserNo: { type: 'text', title: '审核人' },
 		  LeaveType: { type: 'select', title: '请假类型', dataSource: '0',verify:"NotNull" },
-          StartTime: { type: 'datetime', title: '开始时间', dateformat: '1',verify:"NotNull"  },
-          EndTime: { type: 'datetime', title: '结束时间', dateformat: '1',verify:"NotNull"  },
+		   StartTime: { type: 'datetime', title: '开始时间',verify:"NotNull", dateformat: '0' }, 
+		   EndTime:{type: 'datetime', title: '结束时间', verify:"NotNull",dateformat: '0'},
+          // StartTime: { type: 'datetime', title: '开始时间', dateformat: '1',verify:"NotNull"  },
+          // EndTime: { type: 'datetime', title: '结束时间',dateformat: '1', verify:"NotNull"  },
+		  
 		  LeaveDay: { type: 'number', title: '请假天数',verify:"NumOrNull" },
 		  LeaveReason: { type: 'texteditor', title: '请假事由' },
 		  CheckUserNo: { type: 'text', title: '学号' },

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue

@@ -170,7 +170,7 @@
 	    @input="setValue('Ououtsourcing.DeductionsCombined', $event)"
 	    :value="getValue('Ououtsourcing.DeductionsCombined')"
 	    :disabled="!edit"
-	    title="小计"
+	    title="扣款合计"
 	  /> 
 	  <l-input
 	    @input="setValue('Ououtsourcing.HousingFundAllowance', $event)"
@@ -188,7 +188,7 @@
 	    @input="setValue('Ououtsourcing.PersonalIncomeTax', $event)"
 	    :value="getValue('Ououtsourcing.PersonalIncomeTax')"
 	    :disabled="!edit"
-	    title="个人所得税"
+	    title="所得税"
 	  /> 
 	  <l-input
 	    @input="setValue('Ououtsourcing.EndowmentInsurance', $event)"
@@ -407,13 +407,13 @@ export default {
 		  // 特级教师津贴和乡镇补贴TeacherAndTown
 		  // TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
 		  // 扣款小计DeductionsCombined
-		  DeductionsCombined: { type: 'text', title: '扣款小计'},
+		  DeductionsCombined: { type: 'text', title: '扣款合计'},
 		  // 公积金ProvidentFundPayment
 		  HousingFundAllowance: { type: 'text', title: '(缴纳)公积金'},
 		  // 工会工费LaborUnionWage
 		  LaborUnionWage: { type: 'text', title: '工会工费'},
 		  // 个人所得税PersonalIncomeTax
-		  PersonalIncomeTax: { type: 'text', title: '个人所得税'},
+		  PersonalIncomeTax: { type: 'text', title: '所得税'},
 		  // 养老保险EndowmentInsurance
 		  EndowmentInsurance: { type: 'text', title: '养老保险'},
 		  // 职业年金OccupationalAnnuities

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue

@@ -170,7 +170,7 @@
 	    @input="setValue('WelfarePosition.DeductionsCombined', $event)"
 	    :value="getValue('WelfarePosition.DeductionsCombined')"
 	    :disabled="!edit"
-	    title="小计"
+	    title="扣款合计"
 	  /> 
 	  <l-input
 	    @input="setValue('WelfarePosition.HousingFundAllowance', $event)"
@@ -188,7 +188,7 @@
 	    @input="setValue('WelfarePosition.PersonalIncomeTax', $event)"
 	    :value="getValue('WelfarePosition.PersonalIncomeTax')"
 	    :disabled="!edit"
-	    title="个人所得税"
+	    title="所得税"
 	  /> 
 	  <l-input
 	    @input="setValue('WelfarePosition.EndowmentInsurance', $event)"
@@ -214,13 +214,19 @@
 	    :disabled="!edit"
 	    title="失业保险"
 	  /> 
-	  <l-textarea
+	  <l-input
+	    @input="setValue('WelfarePosition.Other', $event)"
+	    :value="getValue('WelfarePosition.Other')"
+	    :disabled="!edit"
+	    title="其他"
+	  />
+	  <!-- <l-textarea
 	    @input="setValue('WelfarePosition.Other', $event)"
 	    :value="getValue('WelfarePosition.Other')"
 	    :disabled="!edit"
 	    title="其他"
 		placeholder="不可编辑状态"
-	  /> 
+	  /> -->
 	  
 	<!--  <l-input
 		class="top-15"
@@ -408,13 +414,13 @@ export default {
 		  // 特级教师津贴和乡镇补贴TeacherAndTown
 		  // TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
 		  // 扣款小计DeductionsCombined
-		  DeductionsCombined: { type: 'text', title: '扣款小计'},
+		  DeductionsCombined: { type: 'text', title: '扣款合计'},
 		  // 公积金ProvidentFundPayment
 		  HousingFundAllowance: { type: 'text', title: '(缴纳)公积金'},
 		  // 工会工费LaborUnionWage
 		  LaborUnionWage: { type: 'text', title: '工会工费'},
 		  // 个人所得税PersonalIncomeTax
-		  PersonalIncomeTax: { type: 'text', title: '个人所得税'},
+		  PersonalIncomeTax: { type: 'text', title: '所得税'},
 		  // 养老保险EndowmentInsurance
 		  EndowmentInsurance: { type: 'text', title: '养老保险'},
 		  // 职业年金OccupationalAnnuities