From 708097bba0d614acb024577307b82e548bf4287b Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Thu, 19 Jun 2025 03:44:51 +0800
Subject: [PATCH] commit

---
 .../theRapyRecuperation/mine/index.html       | 31 ++++++++++++++++---
 .../theRapyRecuperation/signUp/base.js        |  3 +-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/views/platform/theRapyRecuperation/mine/index.html b/src/main/resources/views/platform/theRapyRecuperation/mine/index.html
index e583181..63fe9d9 100644
--- a/src/main/resources/views/platform/theRapyRecuperation/mine/index.html
+++ b/src/main/resources/views/platform/theRapyRecuperation/mine/index.html
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
             </div>
         </el-card>
         <el-card class="mt10" shadow="never">
-            <table-tool :app="this" label="线路列表">
+            <vi-title2 title="线路列表">
                 <template #func>
                     <el-radio-group v-model="pageForm.signUpStateId" @change="doSearch">
                         <el-radio-button label="1">已报名</el-radio-button>
@@ -40,7 +40,8 @@ layout("/layouts/platform.html"){
                         <el-radio-button label="3">未参加</el-radio-button>
                     </el-radio-group>
                 </template>
-            </table-tool>
+            </vi-title2>
+
             <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
                       align="center"
                       header-align="center">
@@ -123,11 +124,16 @@ layout("/layouts/platform.html"){
     </el-dialog>
 
     <line-sign-up ref="lineSignUpRef"></line-sign-up>
+
+    <el-dialog :title="baseName + '报名'" width="60%" :visible.sync="baseVisible" :close-on-click-modal="false" :close-on-press-escape="false">
+        <base-sign-up ref="baseRef" :config_data="configData" @success="baseSuccess"></base-sign-up>
+    </el-dialog>
 </div>
 
 <script>
     <!--#include('../signUp/info.js'){}#-->
     <!--#include('../signUp/lineSignUp.js'){}#-->
+    <!--#include('../signUp/base.js'){}#-->
     const vue = new Vue({
         el: '#app',
         mixins: [initTableMixins],
@@ -141,14 +147,22 @@ layout("/layouts/platform.html"){
                 },
                 chooseButton: [],
                 configData: {},
-                lineDialogVisible: false
+                lineDialogVisible: false,
+                baseVisible:false,
+                baseName:""
             }
         },
         components: {
             'info': INFO,
-            'line-sign-up': LineSignUp
+            'line-sign-up': LineSignUp,
+            'base-sign-up': BASE
         },
         methods: {
+            // 定点相关
+            baseSuccess() {
+                this.baseVisible = false
+                this.pageData();
+            },
             edit(o) {
                 if ([0, 1].includes(this.pageForm.theRapyRecuperationType)) {
                     // 线路
@@ -158,6 +172,15 @@ layout("/layouts/platform.html"){
                     }, this.pageForm, this.configData, o.id);
                 } else if (this.pageForm.theRapyRecuperationType === 3) {
                     // 定点疗休养
+                    const data = {
+                        id: o.takePartInBaseManagementId,
+                        enrollId: o.id,
+                    }
+                    this.baseName = o.baseName
+                    this.baseVisible = true
+                    this.$nextTick(() => {
+                        this.$refs.baseRef.initData(data)
+                    })
                 }
             },
             editOther(o) {
diff --git a/src/main/resources/views/platform/theRapyRecuperation/signUp/base.js b/src/main/resources/views/platform/theRapyRecuperation/signUp/base.js
index db7e22a..15bcb5d 100644
--- a/src/main/resources/views/platform/theRapyRecuperation/signUp/base.js
+++ b/src/main/resources/views/platform/theRapyRecuperation/signUp/base.js
@@ -381,11 +381,12 @@ const BASE = {
             this.enrollId = data.enrollId
             this.editOther = data.editOther
 
-            await this.getData()
+
 
             if (this.enrollId || this.editOther) {
                 await this.findSignUpInfoById()
             }
+            await this.getData()
             await this.join()
         },
     },