app2.0：教师功能完善：多账号绑定，工资条，工作日志，值班安排，日程安排，学生课表请假管理，。

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -559,11 +559,11 @@
 				"navigationBarTitleText": "调度信息"
 			}
 		},
-		//请假管理
+		//学生课表请假管理
 		{
 			"path": "pages/EducationalAdministration/StuAttendanceLeave/list",
 			"style": {
-				"navigationBarTitleText": "请假管理"
+				"navigationBarTitleText": "学生课表请假管理"
 			}
 		},
 		{

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

@@ -73,7 +73,7 @@
 /** 
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
  * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/Journal/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+ * { "path": "pages/EducationalAdministration/JournalSend/list", "style": { "navigationBarTitleText": "表单列表页" } } 
  *  
  * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
  * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
@@ -103,7 +103,7 @@ export default {
   
       // 数据源 
       dataSource: { 
-        JTypeId: [], 
+        JTypeId: Object.values(this.GET_GLOBAL('dataDictionary').JournalType).map(t => ({ value: t.value, text: t.text })), 
       }, 
   
       // 页面相关参数 

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

@@ -99,7 +99,7 @@ export default {
       // 数据源 
       dataSource: { 
         JournalSend: { 
-          JTypeId: [], 
+          JTypeId: Object.values(this.GET_GLOBAL('dataDictionary').JournalType).map(t => ({ value: t.value, text: t.text })), 
         }, 
   
       } 

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

@@ -112,9 +112,7 @@ export default {
       },
 
       // 数据源
-      dataSource: {
-        LoginUserBind: {},
-      },
+      dataSource: { },
     };
   },
 
@@ -172,13 +170,7 @@ export default {
             return;
           }
 
-          if (
-            !(await this.CONFIRM(
-              "提交确认",
-              "确定要提交本页表单内容吗？",
-              true
-            ))
-          ) {
+          if ( !(await this.CONFIRM("提交确认","确定要提交本页表单内容吗？",true))) {
             return;
           }
 
@@ -189,14 +181,11 @@ export default {
           aa.BindUserPasswordTemp = this.MD5(aa.BindUserPassword);
           postData.strEntity = JSON.stringify(aa);
 		  
-		  //todo:
-		  
           this.HTTP_POST(
             "learun/EducationalAdministration/LoginUserBind/save",
             postData,
             "表单提交保存失败"
           ).then((success) => {
-			  console.log(success);
             this.HIDE_LOADING();
             if (!success) {
               return;
@@ -226,7 +215,7 @@ export default {
 
             this.EMIT("EducationalAdministrationLoginUserBind-list-change");
             this.NAV_BACK();
-            this.this.TOAST("删除成功", "success");
+            this.TOAST("删除成功", "success");
           });
           break;
 

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

@@ -60,9 +60,19 @@
               <text class="customlist-item-field-title">所在行政班号：</text> 
               {{ displayListItem(item, 'ClassNo') }} 
             </view> 
+			
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">审核状态：</text> 
+              {{ displayListItem(item, 'IsCheck') }} 
+            </view> 
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">备注：</text> 
+              {{ displayListItem(item, 'TecRemark') }} 
+            </view> 
   
   
-            <l-customlist-action showButton buttonText="审核" @join="action('check',item.Id)"  @view="action('view', item.Id)" /> 
+			<l-customlist-action showEdit editText="审核" @edit="action('edit', item.ID,item)" showDelete @delete="action('delete', item.ID)" hideView/>
+			
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -141,6 +151,8 @@ export default {
         MajorNo: { type: 'text' }, 
         MajorName: { type: 'text' }, 
         ClassNo: { type: 'text' }, 
+        IsCheck: { type: 'select',dataSource:'0' }, 
+        TecRemark: { type: 'textarea' }, 
       }, 
   
       // 查询条件 
@@ -150,9 +162,10 @@ export default {
         StuNo: '', 
         StuName: '', 
       }, 
-  
+		
       // 数据源 
       dataSource: { 
+		  IsCheck: Object.values(this.GET_GLOBAL('dataDictionary').LeaveCheck).map(t => ({ value: t.value, text: t.text })),  
       }, 
   
       // 页面相关参数 
@@ -201,7 +214,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'ID', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -252,7 +265,7 @@ export default {
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
-    async action(type, id = '') { 
+    async action(type, id = '',item) { 
       switch (type) { 
         case 'view': 
           this.NAV_TO(`./single?type=view&id=${id}`) 
@@ -263,6 +276,10 @@ export default {
           return
   
         case 'edit': 
+		  if(item.IsCheck){
+			  this.TOAST('已经审核过了!');
+			  return;
+		  }
           this.NAV_TO(`./single?type=edit&id=${id}`) 
           return
   

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

@@ -4,128 +4,128 @@
       <l-input 
         @input="setValue('StuAttendanceLeave.AcademicYearNo', $event)"
         :value="getValue('StuAttendanceLeave.AcademicYearNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="学年度"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.Semester', $event)"
         :value="getValue('StuAttendanceLeave.Semester')"
-        :disabled="!edit"
+        disabled="disabled"
         title="学期"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.StuNo', $event)"
         :value="getValue('StuAttendanceLeave.StuNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="学号"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.StuName', $event)"
         :value="getValue('StuAttendanceLeave.StuName')"
-        :disabled="!edit"
+        disabled="disabled"
         title="姓名"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.Grade', $event)"
         :value="getValue('StuAttendanceLeave.Grade')"
-        :disabled="!edit"
+        disabled="disabled"
         title="年级"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.EmpNo', $event)"
         :value="getValue('StuAttendanceLeave.EmpNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="教师号"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.DeptNo', $event)"
         :value="getValue('StuAttendanceLeave.DeptNo')"
-        :disabled="!edit"
+       disabled="disabled"
         title="系所码"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.DeptName', $event)"
         :value="getValue('StuAttendanceLeave.DeptName')"
-        :disabled="!edit"
+       disabled="disabled"
         title="系名"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.MajorNo', $event)"
         :value="getValue('StuAttendanceLeave.MajorNo')"
-        :disabled="!edit"
+       disabled="disabled"
         title="专业码"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.MajorName', $event)"
         :value="getValue('StuAttendanceLeave.MajorName')"
-        :disabled="!edit"
+       disabled="disabled"
         title="专业名"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.ClassNo', $event)"
         :value="getValue('StuAttendanceLeave.ClassNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="所在行政班号"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.ClassName', $event)"
         :value="getValue('StuAttendanceLeave.ClassName')"
-        :disabled="!edit"
+        disabled="disabled"
         title="班级名称"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonNo', $event)"
         :value="getValue('StuAttendanceLeave.LessonNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="课程号"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonName', $event)"
         :value="getValue('StuAttendanceLeave.LessonName')"
-        :disabled="!edit"
+        disabled="disabled"
         title="课程名称"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonSortNo', $event)"
         :value="getValue('StuAttendanceLeave.LessonSortNo')"
-        :disabled="!edit"
+        disabled="disabled"
         title="课程类别码"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonSortName', $event)"
         :value="getValue('StuAttendanceLeave.LessonSortName')"
-        :disabled="!edit"
+        disabled="disabled"
         title="课程类别"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonDate', $event)"
         :value="getValue('StuAttendanceLeave.LessonDate')"
-        :disabled="!edit"
+        disabled="disabled"
         title="原上课日期"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.LessonTime', $event)"
         :value="getValue('StuAttendanceLeave.LessonTime')"
-        :disabled="!edit"
+        disabled="disabled"
         title="上课时间"
       /> 
       <l-input 
         @input="setValue('StuAttendanceLeave.PlanWeek', $event)"
         :value="getValue('StuAttendanceLeave.PlanWeek')"
-        :disabled="!edit"
+        disabled="disabled"
         title="教学周次"
       /> 
       <l-select 
         @input="setValue('StuAttendanceLeave.LeaveType', $event)"
         :value="getValue('StuAttendanceLeave.LeaveType')"
-        :disabled="!edit"
+        disabled="disabled"
         :range="dataSource.StuAttendanceLeave.LeaveType"
         title="请假类型"
       /> 
       <l-textarea 
         @input="setValue('StuAttendanceLeave.Remark', $event)"
         :value="getValue('StuAttendanceLeave.Remark')"
-        :readonly="!edit"
+        readonly="readonly"
         title="备注"
       /> 
       <l-select 
@@ -133,7 +133,7 @@
         :value="getValue('StuAttendanceLeave.IsCheck')"
         :disabled="!edit"
         :range="dataSource.StuAttendanceLeave.IsCheck"
-        title="下拉框"
+        title="审核"
       /> 
       <l-textarea 
         @input="setValue('StuAttendanceLeave.TecRemark', $event)"
@@ -153,9 +153,9 @@
       <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
         取消编辑 
       </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+      <!-- <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
         删除 
-      </l-button> 
+      </l-button> -->
     </view> 
   </view> 
 </template> 
@@ -223,7 +223,7 @@ export default {
           PlanWeek: { type: 'text', title: '教学周次' }, 
           LeaveType: { type: 'select', title: '请假类型', itemCode: 'LeaveType', dataSource: '0' }, 
           Remark: { type: 'textarea', title: '备注' }, 
-          IsCheck: { type: 'select', title: '下拉框', itemCode: 'LeaveCheck', dataSource: '0' }, 
+          IsCheck: { type: 'select', title: '审核', itemCode: 'LeaveCheck', dataSource: '0' }, 
           TecRemark: { type: 'textarea', title: '备注' }, 
         }, 
   
@@ -301,7 +301,7 @@ export default {
   
           this.LOADING('正在提交...') 
           const postData = await this.getPostData(this.id) 
-  
+		  
           this.HTTP_POST('learun/adms/EducationalAdministration/StuAttendanceLeave/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 

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

@@ -3,7 +3,7 @@
     <!-- 主列表页 --> 
     <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
       <!-- 顶部条目/分页信息栏 --> 
-      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
+      <l-customlist-banner @buttonClick="sideOpen = false">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
@@ -18,7 +18,7 @@
   
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">值班人：</text> 
-              {{ displayListItem(item, 'Person') }} 
+              {{ displayListItem(item, 'F_RealName') }} 
             </view> 
   
             <view class="customlist-item-field"> 
@@ -27,7 +27,7 @@
             </view> 
   
   
-            <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> 
+            <!-- <l-customlist-action showEdit @edit="action('edit', item.ID)" showDelete @delete="action('delete', item.ID)" @view="action('view', item.ID)" /> -->
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -85,7 +85,7 @@ export default {
       // 数据项的数据类型、结构 
       scheme: { 
         Date: { type: 'datetime', dateformat: '0' }, 
-        Person: { type: 'text' }, 
+        F_RealName: { type: 'text' }, 
         Remark: { type: 'textarea' }, 
       }, 
   

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

@@ -162,7 +162,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'F_ScheduleId', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'F_StartDate', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue

@@ -1,28 +1,28 @@
 <template> 
   <view class="page"> 
     <view v-if="ready"> 
-      <l-datetime-picker 
-        @input="setValue('LR_OA_Schedule.F_StartDate', $event)"
-        :value="getValue('LR_OA_Schedule.F_StartDate')"
+     <l-datetime-picker 
+        @input="setValue('Schedule.F_StartDate', $event)"
+        :value="getValue('Schedule.F_StartDate')"
         :disabled="!edit"
         title="开始时间"
       /> 
       <l-datetime-picker 
-        @input="setValue('LR_OA_Schedule.F_EndDate', $event)"
-        :value="getValue('LR_OA_Schedule.F_EndDate')"
+        @input="setValue('Schedule.F_EndDate', $event)"
+        :value="getValue('Schedule.F_EndDate')"
         :disabled="!edit"
         title="结束时间"
-      /> 
+      />
       <l-input 
-        @input="setValue('LR_OA_Schedule.F_Early', $event)"
-        :value="getValue('LR_OA_Schedule.F_Early')"
+        @input="setValue('Schedule.F_Early', $event)"
+        :value="getValue('Schedule.F_Early')"
         :disabled="!edit"
         title="提前提醒"
         required 
       /> 
       <l-textarea 
-        @input="setValue('LR_OA_Schedule.F_ScheduleContent', $event)"
-        :value="getValue('LR_OA_Schedule.F_ScheduleContent')"
+        @input="setValue('Schedule.F_ScheduleContent', $event)"
+        :value="getValue('Schedule.F_ScheduleContent')"
         :readonly="!edit"
         title="日程内容"
       /> 
@@ -86,7 +86,7 @@ export default {
   
       // 表单项数据结构 
       scheme: { 
-        LR_OA_Schedule: { 
+        Schedule: { 
           F_StartDate: { type: 'datetime', title: '开始时间', dateformat: '1' }, 
           F_EndDate: { type: 'datetime', title: '结束时间', dateformat: '1' }, 
           F_Early: { type: 'text', title: '提前提醒', verify: 'NumOrNull' }, 
@@ -97,7 +97,7 @@ export default {
   
       // 数据源 
       dataSource: { 
-        LR_OA_Schedule: { 
+        Schedule: { 
         }, 
   
       } 
@@ -134,7 +134,7 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/Schedule/form', this.id) 
+        const result = await this.HTTP_GET('learun/adms/PersonnelManagement/Schedule/form', this.id)
         this.origin = await this.formatFormData(result) 
       } 
       this.current = this.COPY(this.origin) 

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

@@ -65,13 +65,19 @@ export default{
 			});
 		},
 		tapTime(num) {
+			let ytemp =0;
+			let mtemp = 0;
+			let ydata = parseInt(this.today.y) ;
+			let mdata = parseInt(this.today.m);
 			if (num == 0) {
-			    if (this.today.m == 1) { this.today.y = this.today.y - 1, this.today.m = 12 } 
-				else { this.today.y = this.today.y, this.today.m = this.today.m - 1 }
+			    if (mdata == 1) { ytemp = ydata - 1, mtemp = 12 } 
+				else { ytemp = ydata, mtemp = mdata - 1 }
 			} else {
-			    if (this.today.m == 12) { this.today.y = this.today.y + 1, this.today.m = 1 } 
-				else { this.today.y = this.today.y, this.today.m = this.today.m + 1 }
+			    if (mdata == 12) { ytemp = ydata + 1, mtemp = 1 } 
+				else { ytemp = ydata, mtemp = mdata + 1 }
 			}
+			this.today.y=ytemp;
+			this.today.m = mtemp<10?'0'+mtemp:mtemp;
 			this.jisuan()
 		},
 		jisuan() {