From 41f19ba17139aac128cf5e387386b5696716bf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Wed, 31 Aug 2022 23:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sys_ReceiveFile/single.vue                         |  4 ++--
 .../pages/PersonnelManagement/DutySchedule/list.vue    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue
index adb8edb70..639504c0e 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue	
@@ -115,7 +115,7 @@ export default {
         Sys_ReceiveFile: {
           Sender: { type: "text", title: "发送人" },
           Title: { type: "text", title: "主题" },
-          SendTime: { type: "datetime", title: "发送时间", dateformat: "0" },
+          SendTime: { type: "datetime", title: "发送时间", dateformat: "1" },
           SendType: {
             type: "select",
             title: "接收对象",
@@ -124,7 +124,7 @@ export default {
           },
           Contents: { type: "textarea", title: "内容" },
           ReadFlag: { type: "select", title: "状态", dataSource: "0" },
-          ReadTime: { type: "datetime", title: "查阅时间", dateformat: "0" },
+          ReadTime: { type: "datetime", title: "查阅时间", dateformat: "1" },
         },
       }, // 数据源
       dataSource: {
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 36dd9f4e3..00970a14d 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	
@@ -156,7 +156,7 @@ export default {
     }, 
   
     // 拉取列表 
-    async fetchList() { 
+    async fetchList(isConcat=true) { 
       if (this.page > this.total) { return } 
   
       const result = await this.HTTP_GET( 
@@ -174,19 +174,19 @@ export default {
   
       this.total = result.total 
       this.page = result.page + 1 
-      this.list = this.list.concat(result.rows) 
+      this.list = isConcat?this.list.concat(result.rows):result.rows
   
       this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` 
       this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多'
     }, 
   
     // 刷新清空列表 
-    async refreshList() { 
+    async refreshList(isConcat=true) { 
       this.page = 1 
       this.total = 2 
       this.list = [] 
   
-      await this.fetchList() 
+      await this.fetchList(isConcat) 
     }, 
   
     // 列表下拉 
@@ -211,7 +211,7 @@ export default {
       Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) 
   
       this.searchData = result 
-      await this.refreshList() 
+      await this.refreshList(false) 
     }, 
   
     // 点击「清空查询条件」按钮