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 @@
- {{ tips }}
+ {{ tips }}
@@ -26,10 +26,10 @@
{{ displayListItem(item, 'JReceiveId') }}
-
+
@@ -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()