From ef28b626535b1702eb018800e11ad76f63f46db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Tue, 1 Nov 2022 10:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=AE=89=E6=8E=92=20?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=B7=A5=E4=BD=9C=E8=AE=B0=E4=BA=8B=20?=
 =?UTF-8?q?=E6=8E=8C=E4=B8=8A=E4=BF=9D=E4=BF=AE=20=EF=BC=9A=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8C=BA=E9=97=B4=E5=8E=BB=E6=8E=89=20=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SYS_ReceiveMessage/single.vue                   |  2 +-
 .../PersonnelManagement/ActivitySchedule/list.vue   | 10 +++++-----
 .../PersonnelManagement/ActivitySchedule/single.vue |  4 ++--
 .../pages/PersonnelManagement/ClassWork/list.vue    | 13 +++++++------
 .../pages/PersonnelManagement/ClassWork/single.vue  |  4 ++--
 .../pages/PersonnelManagement/EmpRepair/list.vue    |  2 +-
 .../pages/PersonnelManagement/EmpRepair/single.vue  |  4 ++--
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue
index a2bf1a9f6..0fbe6ae14 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue	
@@ -20,7 +20,7 @@
         :range="dataSource.SYS_ReceiveMessage.READFLAG"
         title="状态"
       /> -->
-      <l-date-picker 
+      <l-datetime-picker 
         @input="setValue('SYS_ReceiveMessage.SENDTIME', $event)"
         :value="getValue('SYS_ReceiveMessage.SENDTIME')"
         :disabled="!edit"
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue
index b12ee8f77..ecd3bd166 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue	
@@ -52,13 +52,13 @@
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y> 
       <view v-if="ready" class="padding"> 
   
-        <l-customlist-sidepage-datefilter 
+        <!-- <l-customlist-sidepage-datefilter 
           v-model="dateRange"
           @change="searchChange"
           title="按时间日期查询: "
           ref="datefilter"
           class="margin-bottom"
-        /> 
+        /> -->
   
         <l-input 
           v-model="queryData.Title"
@@ -108,7 +108,7 @@ export default {
     return { 
       // 数据项的数据类型、结构 
       scheme: { 
-        Date: { type: 'datetime', dateformat: '0' }, 
+        Date: { type: 'datetime', dateformat: '1' }, 
         Address: { type: 'text' }, 
         Title: { type: 'text' }, 
         Content: { type: 'textarea' }, 
@@ -228,8 +228,8 @@ export default {
     // 点击「清空查询条件」按钮 
     reset() { 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.$refs.datefilter.changeDateRange('all') 
-      // this.searchChange() 
+      // this.$refs.datefilter.changeDateRange('all') 
+      this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue
index 8d321b531..7f691e958 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/single.vue	
@@ -1,7 +1,7 @@
 <template> 
   <view class="page"> 
     <view v-if="ready"> 
-      <l-date-picker 
+      <l-datetime-picker 
         @input="setValue('ActivitySchedule.Date', $event)"
         :value="getValue('ActivitySchedule.Date')"
         :disabled="!edit"
@@ -92,7 +92,7 @@ export default {
       // 表单项数据结构 
       scheme: { 
         ActivitySchedule: { 
-          Date: { type: 'datetime', title: '时间', dateformat: '0' }, 
+          Date: { type: 'datetime', title: '时间', dateformat: '1' }, 
           Address: { type: 'text', title: '地点' }, 
           Title: { type: 'text', title: '主题' }, 
           Content: { type: 'textarea', title: '内容' }, 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue
index 7ca2c81f4..649a56d70 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/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="true" @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
   
       <!-- 滚动列表，跨端支持上拉/下拉 --> 
       <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
@@ -47,13 +47,13 @@
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y> 
       <view v-if="ready" class="padding"> 
   
-        <l-customlist-sidepage-datefilter 
+        <!-- <l-customlist-sidepage-datefilter 
           v-model="dateRange"
           @change="searchChange"
           title="按时间日期查询: "
           ref="datefilter"
           class="margin-bottom"
-        /> 
+        /> -->
   
         <l-select 
           v-model="queryData.ClassNo"
@@ -105,7 +105,7 @@ export default {
       // 数据项的数据类型、结构 
       scheme: { 
         ClassNo: { type: 'select', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-        Date: { type: 'datetime', dateformat: '0' }, 
+        Date: { type: 'datetime', dateformat: '1' }, 
         Title: { type: 'text' }, 
         Content: { type: 'textarea' }, 
       }, 
@@ -208,6 +208,7 @@ export default {
   
     // 设置搜索条件 
     async searchChange() { 
+		console.log(this.queryData)
       const result = {} 
   
       // 时间查询相关参数 
@@ -227,8 +228,8 @@ export default {
     // 点击「清空查询条件」按钮 
     reset() { 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.$refs.datefilter.changeDateRange('all') 
-      // this.searchChange() 
+      // this.$refs.datefilter.changeDateRange('all') 
+      this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue
index d89b45a72..cf4511618 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/single.vue	
@@ -8,7 +8,7 @@
         :range="dataSource.ClassWork.ClassNo"
         title="班级"
       /> 
-      <l-date-picker 
+      <l-datetime-picker 
         @input="setValue('ClassWork.Date', $event)"
         :value="getValue('ClassWork.Date')"
         :disabled="!edit"
@@ -88,7 +88,7 @@ export default {
       scheme: { 
         ClassWork: { 
           ClassNo: { type: 'select', title: '班级', dataSource: '1', dataSourceId: 'bjsj,classname,classno' }, 
-          Date: { type: 'datetime', title: '日期', dateformat: '0' }, 
+          Date: { type: 'datetime', title: '日期', dateformat: '1' }, 
           Title: { type: 'text', title: '标题' }, 
           Content: { type: 'textarea', title: '工作内容' }, 
         }, 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue
index 2518fd7e0..6d299f4ca 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue	
@@ -100,7 +100,7 @@ export default {
         ApplyCode: { type: 'text' }, 
         ApplyUserId: { type: 'organize', dataType: 'user' }, 
         ApplyContent: { type: 'textarea' }, 
-        ApplyTime: { type: 'datetime', dateformat: '0' }, 
+        ApplyTime: { type: 'datetime', dateformat: '1' }, 
       }, 
   
       // 查询条件 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue
index 7f416bf18..3ae419b9f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/single.vue	
@@ -20,7 +20,7 @@
         :readonly="!edit"
         title="报修内容"
       /> 
-      <l-date-picker 
+      <l-datetime-picker 
         @input="setValue('EmpRepair.ApplyTime', $event)"
         :value="getValue('EmpRepair.ApplyTime')"
         :disabled="!edit"
@@ -90,7 +90,7 @@ export default {
           ApplyCode: { type: 'text', title: '报修编号' }, 
           ApplyUserId: { type: 'organize', title: '报修人', dataType: 'user' }, 
           ApplyContent: { type: 'textarea', title: '报修内容' }, 
-          ApplyTime: { type: 'datetime', title: '报修时间', dateformat: '0' }, 
+          ApplyTime: { type: 'datetime', title: '报修时间', dateformat: '1' }, 
         }, 
   
       },