From 225ed25736876c99012f13b1ff3784983268d913 Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Fri, 17 Oct 2025 11:13:19 +0800
Subject: [PATCH] commit

---
 .../literacy/models/LiteracyCourse.java        |  7 ++++++-
 .../static/components/plugins/Guava.vue        |  4 ++--
 src/main/resources/views/layouts/v4/apps.html  |  4 ++--
 .../dayofficework/literacy/manage/basicForm.js | 18 ++++++++++++++++--
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java
index 9c6ef458..94c8cc07 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/literacy/models/LiteracyCourse.java
@@ -25,10 +25,15 @@ public class LiteracyCourse extends LiteracySourceCourse implements Serializable
     private String id;
 
     @Column
-    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @ColDefine(type = ColType.VARCHAR, width = 32)
     @Comment("活动ID")
     private String activityId;
 
+	@Column
+	@ColDefine(type = ColType.VARCHAR, width = 32)
+	@Comment("子活动ID")
+	private String courseId;
+
     @Many(field = "courseId")
     private List<LiteracyActivityCourse> courseTimeList;
 
diff --git a/src/main/resources/static/components/plugins/Guava.vue b/src/main/resources/static/components/plugins/Guava.vue
index 849e7b16..9d422d18 100644
--- a/src/main/resources/static/components/plugins/Guava.vue
+++ b/src/main/resources/static/components/plugins/Guava.vue
@@ -16,8 +16,8 @@
       <div class="page-content">
         <slot name="edit"></slot>
       </div>
-      <div class="page-footer" v-if="$slots.edit_func">
-        <slot name="edit_func"></slot>
+      <div class="page-footer" v-if="$slots.edit_footer">
+        <slot name="edit_footer"></slot>
       </div>
     </div>
 
diff --git a/src/main/resources/views/layouts/v4/apps.html b/src/main/resources/views/layouts/v4/apps.html
index 0c3e31b1..2ef6c44b 100644
--- a/src/main/resources/views/layouts/v4/apps.html
+++ b/src/main/resources/views/layouts/v4/apps.html
@@ -524,10 +524,10 @@ layout("/layouts/v4/baseLayout.html"){
 
                 // 如果是"推荐应用"分类
                 if (this.activeCategory === "recommended") {
-                    $.get("/platform/v4/apps/recommended")
+                    $.get("/platform/home/listRecommendApp", { platform: "PC" })
                         .then((result) => {
                             if (result.code === 0) {
-                                this.applications = result.data.list || []
+                                this.applications = result.data || []
                             } else {
                                 console.error("获取推荐应用失败:", result.msg)
                             }
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js b/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js
index cc502807..e9215a5d 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js
+++ b/src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/basicForm.js
@@ -157,8 +157,8 @@ const basicForm = {
                         </el-table-column>
 
                         <el-table-column :label="trainType + '名称'" prop="courseName">
-                            <template v-slot="{row}">
-                                <el-select size="small" v-model="row.courseId" allow-create filterable>
+                            <template v-slot="{row, $index}">
+                                <el-select size="small" v-model="row.courseId" filterable @change="(val) => {courseChange(val, row, $index)}">
                                     <el-option :label="item.courseName" :value="item.id" :key="item.id" v-for="item in sourceCourseList"></el-option>
                                 </el-select>
                             </template>
@@ -342,6 +342,20 @@ const basicForm = {
         "custom-form": customForm,
     },
     methods: {
+        courseChange(val, row, index) {
+            const course = clone(this.sourceCourseList.find(o => o.id === val))
+            if(course.timeList) {
+                course.timeList = JSON.parse(course.timeList)
+                course.courseTimeList = course.timeList
+            }
+            const courseId = course.id
+            delete course.id
+            this.formData.courseList[index] = {...this.formData.courseList[index], ...course}
+            this.$set(this.formData.courseList[index], 'courseId', courseId)
+
+            this.formData.courseList[index].setUpCourseData = course.courseTimeList.map(o => o.courseDate)
+            this.$forceUpdate()
+        },
         async validNumber(row, old) {
             if (GetQueryString("id") === "") {
                 if (row.courseReservedNumber > row.coursePeopleNumber && row.reserveMode === 1) {