diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
index c33aa8c52..71bb4a076 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js
@@ -237,6 +237,32 @@ export default {
return await this.HTTP_GET('learun/adms/annexes/wxlist', folderId)
},
+ // 根据文件夹id获取图片列表
+ async getFileListById(folderId){
+ if(!folderId){
+ return []
+ }
+ let wxlist = await this.FETCH_FILEList(folderId),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
+ })
+ }
+ return fileList
+ },
// 封装的 GET 请求,集成了验证信息
// 返回请求结果或 null
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue
index f3947f199..bf835102b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file.vue
@@ -2,7 +2,7 @@
-
+
{{item.name}}
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 d6dc6d91c..5a6592cd6 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 @@
-
+
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 007e4992e..bcfd2aa52 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
@@ -26,9 +26,6 @@
:disabled="!edit"
title="收件时间"
/>
-
-
-
-
+
@@ -161,26 +158,7 @@ export default {
} else {
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
- })
- }
+ let fileList = await this.getFileListById(result.SYS_ReceiveMessage.FilePath)
console.log(fileList)
this.fileList = fileList
@@ -189,7 +167,6 @@ export default {
}else{
return
}
-
}
this.current = this.COPY(this.origin)
},
@@ -207,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
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 684efb793..81704719b 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
@@ -42,7 +42,7 @@
-
+
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 831f49460..d1642f563 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,12 +33,19 @@
:range="dataSource.Sys_ReceiveFile.SendType"
title="接收对象"
/>
- -->
+
+
删除
-
+ -->
@@ -102,6 +109,7 @@ export default {
edit: null,
ready: false, // 表单数据
current: {},
+ fileList:[],
origin: {}, // 表单项数据结构
scheme: {
Sys_ReceiveFile: {
@@ -152,6 +160,7 @@ export default {
"learun/adms/EducationalAdministration/Sys_ReceiveFile/form",
this.id
);
+ this.fileList = await this.getFileListById(result.Sys_ReceiveFile.FilePath)
this.origin = await this.formatFormData(result);
}
this.current = this.COPY(this.origin);