From 951f39a393c28cf5a2d95d867650e20628d5e27d Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 27 Oct 2022 12:03:13 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=E6=94=B6=E4=BB=B6=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SYS_ReceiveMessage/list.vue               | 16 ++++--
 .../SYS_ReceiveMessage/single.vue             | 56 +++++++++++++++----
 2 files changed, 55 insertions(+), 17 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 bca21b257..27db9141b 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	
@@ -33,7 +33,7 @@
   
   
   
-            <l-customlist-action @view="action('view', item.MESSAGEID)" /> 
+            <l-customlist-action @view="action('view', item.MESSAGEID)" :showDelete="false" @delete="action('delete', item.MESSAGEID)" :showEdit="false" @edit="action('edit', item.MESSAGEID)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -107,7 +107,7 @@ export default {
         SENDER: { type: 'text' }, 
         TITLE: { type: 'text' }, 
         READFLAG: { type: 'select', dataSource: '0' }, 
-        SENDTIME: { type: 'datetime', dateformat: '0' }, 
+        SENDTIME: { type: 'datetime', dateformat: '1' }, 
         URL: { type: 'upload' }, 
         CONTENTS: { type: 'textarea' }, 
       }, 
@@ -146,6 +146,11 @@ export default {
   onUnload() { 
     this.OFF('EducationalAdministrationSYS_ReceiveMessage-list-change') 
   }, 
+  onShow() {
+  	if(this.list.length){
+  		this.refreshList(false)
+  	}
+  },
   
   methods: { 
     // 页面初始化 
@@ -174,7 +179,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'MESSAGEID', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'READFLAG asc,SENDTIME desc', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -226,15 +231,16 @@ export default {
   
     // 点击「清空查询条件」按钮 
     reset() { 
-      this.$refs.datefilter.changeDateRange('all') 
       this.queryData = this.COPY(this.defaultQueryData) 
-      this.searchChange() 
+      this.$refs.datefilter.changeDateRange('all') 
+      // this.searchChange() 
     }, 
   
     // 点击「编辑」、「查看」、「添加」、「删除」按钮 
     async action(type, id = '') { 
       switch (type) { 
         case 'view': 
+		this.HTTP_POST(`learun/adms/EducationalAdministration/SYS_ReceiveMessage/read`,{keyValue:id})
           this.NAV_TO(`./single?type=view&id=${id}`) 
           return
   
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 947aaa8eb..a2bf1a9f6 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	
@@ -13,13 +13,13 @@
         :disabled="!edit"
         title="主题"
       /> 
-      <l-select 
+ <!--     <l-select 
         @input="setValue('SYS_ReceiveMessage.READFLAG', $event)"
         :value="getValue('SYS_ReceiveMessage.READFLAG')"
         :disabled="!edit"
         :range="dataSource.SYS_ReceiveMessage.READFLAG"
         title="状态"
-      /> 
+      /> -->
       <l-date-picker 
         @input="setValue('SYS_ReceiveMessage.SENDTIME', $event)"
         :value="getValue('SYS_ReceiveMessage.SENDTIME')"
@@ -27,20 +27,38 @@
         title="收件时间"
       /> 
       <l-upload-file 
-        @input="setValue('SYS_ReceiveMessage.URL', $event)"
-        :value="getValue('SYS_ReceiveMessage.URL')"
+	    v-if="ready" 
+        :value="fileList"
+		@input="(e)=>{fileList = e}" 
         :readonly="!edit"
         :number="9"
         title="附件上传"
       /> 
-      <l-textarea 
+    <!--  <l-textarea 
         @input="setValue('SYS_ReceiveMessage.CONTENTS', $event)"
         :value="getValue('SYS_ReceiveMessage.CONTENTS')"
         :readonly="!edit"
         title="邮件内容"
-      /> 
+      /> -->
+	  <view class="bg-white" style="padding: 15px;color: #333333;font-size: 15px;">邮件内容</view>
+	  <view class="bg-white" style="padding: 15px;padding-top: 0px;">
+	  	<u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="getValue('SYS_ReceiveMessage.CONTENTS')" noData="暂无内容"></u-parse>
+	  </view>
     </view> 
-  
+ <!-- <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;">
+   <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
+      提交保存 
+    </l-button> 
+    <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
+      编辑本页 
+    </l-button> 
+    <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
+      取消编辑 
+    </l-button>
+    <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
+      删除 
+    </l-button>
+  </view> -->
   </view> 
 </template> 
   
@@ -82,14 +100,16 @@ export default {
       // 表单数据 
       current: {}, 
       origin: {}, 
+	  
+	  fileList:[],
   
       // 表单项数据结构 
       scheme: { 
         SYS_ReceiveMessage: { 
           SENDER: { type: 'text', title: '发件人' }, 
           TITLE: { type: 'text', title: '主题' }, 
-          READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
-          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
+          // READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
+          SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '1' }, 
           URL: { type: 'upload', title: '附件上传' }, 
           CONTENTS: { type: 'textarea', title: '邮件内容' }, 
         }, 
@@ -136,8 +156,17 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/SYS_ReceiveMessage/form', this.id) 
-        this.origin = await this.formatFormData(result) 
+        const result = await this.HTTP_GET('learun/adms/EducationalAdministration/SYS_ReceiveMessage/form', this.id)
+		if(result){
+			let fileList = await this.getFileListById(result.SYS_ReceiveMessage.FilePath)
+			console.log(fileList)
+			this.fileList = fileList
+			
+			this.origin = await this.formatFormData(result) 
+			console.log(this.origin)
+		}else{
+			return
+		}
       } 
       this.current = this.COPY(this.origin) 
     }, 
@@ -155,11 +184,14 @@ export default {
           break
   
         case 'save': 
+		console.log(this.fileList)
+		
+		// return
           const verifyResult = this.verifyForm() 
           if (verifyResult.length > 0) { 
             this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
             return
-          } 
+          }
   
           if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
             return