From 3685a63ccabcd39cbcc85fcb134785f93936618a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Mon, 31 Oct 2022 18:12:48 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E6=97=A5=E7=A8=8B=E5=AE=89=E6=8E=92?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=AD=9B=E9=80=89=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2scheme=E8=A1=A8=E5=8D=95=E5=90=8D=E4=B8=BASch?=
 =?UTF-8?q?edule?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonnelManagement/Schedule/list.vue     |  2 +-
 .../PersonnelManagement/Schedule/single.vue   | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue
index f912b10fa..ee81bd6cd 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/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 :buttonShow="false" @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue
index 7df8b50fc..803b1a083 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/single.vue	
@@ -2,27 +2,27 @@
   <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')"
+        @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: { 
         }, 
   
       } 
@@ -136,6 +136,7 @@ export default {
       } else { 
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/Schedule/form', this.id) 
         this.origin = await this.formatFormData(result) 
+		console.log(this.origin)
       } 
       this.current = this.COPY(this.origin) 
     },