From 1723331ce604a779bcb1dff9fabbd7c442c44f4e 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 19:34:13 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=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               |  9 +--
 .../SYS_ReceiveMessage/single.vue             | 61 +++++++++++++++----
 .../Sys_ReceiveFile/list.vue                  |  7 ++-
 .../Sys_ReceiveFile/single.vue                |  7 +++
 4 files changed, 66 insertions(+), 18 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 d9c18c95e..d6dc6d91c 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 @delete="action('delete', item.MESSAGEID)" showEdit="true" @edit="action('edit', item.MESSAGEID)" /> 
           </view> 
         </l-customlist> 
       </l-scroll-list> 
@@ -70,7 +70,7 @@
       </view> 
     </scroll-view> 
   
-    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+    <l-customlist-add v-if="!sideOpen" @click="action('add')" />
   
   </view> 
 </template> 
@@ -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' }, 
       }, 
@@ -174,7 +174,7 @@ export default {
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
-          pagination: { rows: 10, page: this.page, sidx: 'MESSAGEID', sord: 'DESC' }, 
+          pagination: { rows: 10, page: this.page, sidx: 'SENDTIME', sord: 'DESC' }, 
           queryJson: JSON.stringify(this.searchData) 
         }, 
         '加载数据时出错'
@@ -235,6 +235,7 @@ export default {
     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 476cbcdad..007e4992e 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,35 +13,43 @@
         :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')"
         :disabled="!edit"
         title="收件时间"
       /> 
+	  <!-- [API + '/learun/adms/annexes/wxdown?' + URL_QUERY(setValue('SYS_ReceiveMessage.URL', $event), true)] -->
+	  <!-- getValue('SYS_ReceiveMessage.URL',$event)  getValue('SYS_ReceiveMessage.URL') -->
+	  <!-- @input="fileList" -->
       <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 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> 
@@ -49,7 +57,7 @@
     </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>
     <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
       删除 
     </l-button> 
@@ -95,13 +103,15 @@ export default {
       // 表单数据 
       current: {}, 
       origin: {}, 
+	  
+	  fileList:[],
   
       // 表单项数据结构 
       scheme: { 
         SYS_ReceiveMessage: { 
           SENDER: { type: 'text', title: '发件人' }, 
           TITLE: { type: 'text', title: '主题' }, 
-          READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
+          // READFLAG: { type: 'select', title: '状态', dataSource: '0' }, 
           SENDTIME: { type: 'datetime', title: '收件时间', dateformat: '0' }, 
           URL: { type: 'upload', title: '附件上传' }, 
           CONTENTS: { type: 'textarea', title: '邮件内容' }, 
@@ -149,8 +159,37 @@ 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 wxlist = await this.FETCH_FILEList(result.SYS_ReceiveMessage.FilePath),fileList = []
+			for (const wxfile of wxlist) {
+				const fileInfo = await this.FETCH_FILEINFO(wxfile.F_Id)
+				if (!fileInfo) {
+					continue
+				}
+			
+				const fileType = fileInfo.F_FileType
+				const fileSize = fileInfo.F_FileSize
+			
+				const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
+				fileList.push({
+					path,
+					type: fileType,
+					uid:wxfile.F_Id,
+					folderId:wxfile.F_FolderId,
+					size: fileSize
+				})
+			}
+			console.log(fileList)
+			this.fileList = fileList
+			
+			this.origin = await this.formatFormData(result) 
+			console.log(this.origin)
+		}else{
+			return
+		}
+		
       } 
       this.current = this.COPY(this.origin) 
     }, 
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 ab1414bcd..684efb793 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	
@@ -65,12 +65,12 @@
           class="margin-bottom"
         /> 
   
-        <l-input 
+        <!-- <l-input 
           v-model="queryData.Sender"
           @change="searchChange"
           title ="发送人"
           placeholder="按发送人查询"
-        /> 
+        /> -->
         <l-input 
           v-model="queryData.Title"
           @change="searchChange"
@@ -124,7 +124,7 @@ export default {
         SendTime: { type: 'datetime', dateformat: '0' }, 
         SendType: { type: 'select', itemCode: 'FileSendType', dataSource: '0' }, 
         ReadFlag: { type: 'select', dataSource: '0' }, 
-        ReadTime: { type: 'datetime', dateformat: '0' }, 
+        ReadTime: { type: 'datetime', dateformat: '1' }, 
       }, 
   
       // 查询条件 
@@ -251,6 +251,7 @@ this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
     async action(type, id = '') { 
       switch (type) { 
         case 'view': 
+		  this.HTTP_POST(`learun/adms/EducationalAdministration/Sys_ReceiveFile/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_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue
index f47aebaf8..831f49460 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	
@@ -33,6 +33,13 @@
         :range="dataSource.Sys_ReceiveFile.SendType"
         title="接收对象"
       />
+	  <l-upload-file
+	    @input="setValue('Sys_ReceiveFile.RUrl', $event)"
+	    :value="getValue('Sys_ReceiveFile.RUrl')"
+	    :readonly="!edit"
+	    :number="9"
+	    title="附件上传"
+	  /> 
          <!--   <l-textarea
         @input="setValue('Sys_ReceiveFile.Contents', $event)"
         :value="getValue('Sys_ReceiveFile.Contents')"