From ff472c3714b78e06e2d4bb8711ebf6e982170a19 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, 29 Aug 2022 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E5=80=BC=E7=8F=AD=E5=AE=89=E6=8E=92?=
 =?UTF-8?q?=20=E9=87=8D=E7=BD=AE=E6=93=8D=E4=BD=9C=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SYS_ReceiveMessage/list.vue               |  2 +-
 .../Sys_ReceiveFile/list.vue                  |  2 +-
 .../PersonnelManagement/DutySchedule/list.vue | 16 +++++++---
 .../DutySchedule/single.vue                   | 32 ++++++++++++++-----
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue
index 096991894..52bc3168a 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue	
@@ -228,7 +228,7 @@ export default {
     reset() { 
       this.$refs.datefilter.changeDateRange('all') 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue
index 4e34e124d..5aac79c2f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue	
@@ -244,7 +244,7 @@ this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
     reset() { 
       this.$refs.datefilter.changeDateRange('all') 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue
index 7dc859c37..c74def0ca 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue	
@@ -3,7 +3,8 @@
     <!-- 主列表页 --> 
     <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
       <!-- 顶部条目/分页信息栏 --> 
-      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
+	  <!-- sideOpen = true -->
+      <l-customlist-banner @buttonClick="">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
@@ -13,12 +14,14 @@
   
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">时间：</text> 
-              {{ displayListItem(item, 'Date') }} 
+              <!-- {{ displayListItem(item, 'Date') }} -->
+			  {{ displayListItem(item, 'StartTime') }}&nbsp;-&nbsp;{{ displayListItem(item, 'EndTime') }} 
             </view> 
   
             <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">值班人：</text> 
-              {{ displayListItem(item, 'Person') }} 
+              <!-- {{ displayListItem(item, 'Person') }} -->
+			  {{ displayListItem(item, 'F_RealName') }} 
             </view> 
   
             <view class="customlist-item-field"> 
@@ -84,9 +87,12 @@ export default {
     return { 
       // 数据项的数据类型、结构 
       scheme: { 
-        Date: { type: 'datetime', dateformat: '0' }, 
-        Person: { type: 'text' }, 
+        // Date: { type: 'datetime', dateformat: '0' }, 
+        // Person: { type: 'text' }, 
         Remark: { type: 'textarea' }, 
+		StartTime: { type: 'datetime', dateformat: '0' },
+		EndTime: { type: 'datetime', dateformat: '0' },
+		F_RealName: { type: 'text' }, 
       }, 
   
       // 查询条件 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue
index 718a3a09e..89e333ad3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/single.vue	
@@ -2,17 +2,30 @@
   <view class="page"> 
     <view v-if="ready"> 
       <l-date-picker 
-        @input="setValue('DutySchedule.Date', $event)"
-        :value="getValue('DutySchedule.Date')"
+        @input="setValue('DutySchedule.StartTime', $event)"
+        :value="getValue('DutySchedule.StartTime')"
         :disabled="!edit"
-        title="时间"
+        title="开始时间"
       /> 
-      <l-input 
+	  <l-date-picker
+	    @input="setValue('DutySchedule.EndTime', $event)"
+	    :value="getValue('DutySchedule.EndTime')"
+	    :disabled="!edit"
+	    title="结束时间"
+	  /> 
+     <!-- <l-input 
         @input="setValue('DutySchedule.Person', $event)"
         :value="getValue('DutySchedule.Person')"
         :disabled="!edit"
         title="值班人"
-      /> 
+      /> -->
+	  <l-organize-picker
+	    @input="setValue('DutySchedule.Person', $event)"
+	    :value="getValue('DutySchedule.Person')"
+	    :readonly="!edit"
+	    type="user"
+	    title="值班人"
+	  /> 
       <l-textarea 
         @input="setValue('DutySchedule.Remark', $event)"
         :value="getValue('DutySchedule.Remark')"
@@ -80,7 +93,9 @@ export default {
       // 表单项数据结构 
       scheme: { 
         DutySchedule: { 
-          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+          // Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+		  StartTime: { type: 'datetime', dateformat: '0' },
+		  EndTime: { type: 'datetime', dateformat: '0' },
           Person: { type: 'text', title: '值班人' }, 
           Remark: { type: 'textarea', title: '备注' }, 
         }, 
@@ -127,7 +142,8 @@ export default {
         this.origin = await this.getDefaultForm() 
       } else { 
         const result = await this.HTTP_GET('learun/adms/PersonnelManagement/DutySchedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
+		let res = {DutySchedule:result.Schedule}
+        this.origin = await this.formatFormData(res) 
       } 
       this.current = this.COPY(this.origin) 
     }, 
@@ -184,7 +200,7 @@ export default {
   
             this.EMIT('PersonnelManagementDutySchedule-list-change') 
             this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
+            this.TOAST('删除成功', 'success') 
           }) 
           break