From 9fcc563ce7e647f28f85cdba8373e0cc6e933118 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 14:53:11 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EducationalAdministration/JournalSend/list.vue     | 10 ++++++----
 .../EducationalAdministration/JournalSend/single.vue   |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue
index 53a913d5a..e8b6068cc 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/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"> 
@@ -26,10 +26,10 @@
               {{ displayListItem(item, 'JReceiveId') }} 
             </view> 
   
-            <view class="customlist-item-field"> 
+            <!-- <view class="customlist-item-field"> 
               <text class="customlist-item-field-title">日志内容：</text> 
               {{ displayListItem(item, 'JContent') }} 
-            </view> 
+            </view> -->
   
   
             <l-customlist-action showEdit @edit="action('edit', item.JournalSendId)" showDelete @delete="action('delete', item.JournalSendId)" @view="action('view', item.JournalSendId)" /> 
@@ -132,6 +132,8 @@ export default {
       this.ON('EducationalAdministrationJournalSend-list-change', this.refreshList) 
   
       // 拉取加载列表和数据源 
+	  const dataDictionary = await this.GET_GLOBAL('dataDictionary')
+	  this.dataSource.JTypeId = Object.values(dataDictionary.JournalType)
       await Promise.all([ 
   
   
@@ -152,7 +154,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'JournalSendId', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'JSendTime', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue
index 9ef35f666..ee8797db4 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
@@ -120,10 +120,11 @@ export default {
       this.edit = ['create', 'edit'].includes(this.mode) 
   
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
-      await Promise.all([ 
-  
-  
-        () => {} 
+	  const dataDictionary = await this.GET_GLOBAL('dataDictionary')
+	  this.dataSource.JournalSend.JTypeId = Object.values(dataDictionary.JournalType)
+      await Promise.all([
+        () => {
+		} 
       ]) 
       await this.fetchForm()