Merge branch 'main' of https://dd3skj.picp.vip/zhengziru/zhgh_hmc

# Conflicts:
#	src/main/resources/application.properties

src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java

@@ -1018,6 +1018,16 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl<TheRapyR
 
         //如果报酒店
         if (StrUtil.isNotBlank(enrollInfo.getTakePartInBaseManagementId()) && StrUtil.isBlank(enrollInfo.getId())) {
+            // 判断酒店报名时间
+            TheRapyRecuperationBaseManagement base = dao().fetch(TheRapyRecuperationBaseManagement.class, Cnd.where("id", "=", enrollInfo.getTakePartInBaseManagementId()));
+
+            if (DateUtil.compare(new Date(), base.getSignUpStartTime()) < 0) {
+                return Map.of(false, "报名未开始，请耐心等待");
+            }
+            if (DateUtil.compare(new Date(), base.getSignUpEndTime()) > 0) {
+                return Map.of(false, "报名时间已过，抱歉不能报名");
+            }
+
             Map<Boolean, String> oneYear = this.validCountOneYear(loginName, travelFrequency, editOther);
             if (oneYear != null) {
                 return oneYear;

src/main/resources/views/platform/theRapyRecuperation/signUp/index.html

@@ -271,13 +271,14 @@ layout("/layouts/platform.html"){
                             </div>
                         </div>
                         <div class="route-footer">
+<!--                            <el-button-->
+<!--                                    type="text"-->
+<!--                                    size="small"-->
+<!--                                    @click="viewDetails(item)">-->
+<!--                                <i class="el-icon-view"></i> 查看详情-->
+<!--                            </el-button>-->
                             <el-button
-                                    type="text"
+                                    style="margin-left: auto"
-                                    size="small"
-                                    @click="viewDetails(item)">
-                                <i class="el-icon-view"></i> 查看详情
-                            </el-button>
-                            <el-button
                                     class="route-signup-btn"
                                     type="primary"
                                     size="mini"
@@ -330,7 +331,7 @@ layout("/layouts/platform.html"){
                             <el-button
                                     type="text"
                                     size="small"
-                                    @click="viewDetails(item)">
+                                    @click="openLine(item)">
                                 <i class="el-icon-view"></i> 查看详情
                             </el-button>
                             <el-button
@@ -349,23 +350,35 @@ layout("/layouts/platform.html"){
         </div>
     </guava>
 
-    <line-sign-up ref="lineSignUpRef"></line-sign-up>
+    <line-sign-up ref="lineSignUpRef" @view-line="openLine"></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="config" @success="baseSuccess"></base-sign-up>
     </el-dialog>
+
+    <el-dialog
+        title="详情"
+        :visible.sync="lineDialogVisible"
+        width="50%">
+        <info ref="lineRef" :index="pageForm.theRapyRecuperationType"></info>
+        <span slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="lineDialogVisible = false">关 闭</el-button>
+        </span>
+    </el-dialog>
 </div>
 
 <script>
     <!--#include('lineSignUp.js'){}#-->
     <!--#include('base.js'){}#-->
+    <!--#include('info.js'){}#-->
 
     new Vue({
         el: '#app',
         mixins: [initTableMixins],
         components: {
             'line-sign-up': LineSignUp,
-            'base-sign-up': BASE
+            'base-sign-up': BASE,
+            'info': INFO
         },
         data() {
             return {
@@ -384,7 +397,10 @@ layout("/layouts/platform.html"){
 
                 // 定点报名相关
                 baseName: '',
-                baseVisible: false
+                baseVisible: false,
+
+                // 查看详情
+                lineDialogVisible: false,
             }
         },
         methods: {
@@ -487,7 +503,15 @@ layout("/layouts/platform.html"){
             baseSuccess() {
                 this.baseVisible = false
                 this.pageData();
-            }
+            },
+
+            // 查看线路详情
+            openLine(row) {
+                this.lineDialogVisible = true
+                this.$nextTick(() => {
+                    this.$refs.lineRef.openInit(row.usId, row.id)
+                })
+            },
         },
         created() {
             this.pageData();

src/main/resources/views/platform/theRapyRecuperation/signUp/info.js

@@ -2,7 +2,7 @@ const INFO = {
     template: /*language=HTML*/ `
         <div>
             <!-- 省内或省外 -->
-            <template v-if="[0, 1].includes(index)">
+            <template v-if="index == 0 || index == 1">
                 <el-descriptions :column="2" border class="descriptions-form">
                     <el-descriptions-item label="线路名称" :span="2">
                         <el-tag>{{lineData.lotName}}</el-tag>
@@ -114,6 +114,7 @@ const INFO = {
         async getLineData(takePartInLineId) {
             if (takePartInLineId == null){
                 this.lineData={}
+                return
             }
             const resp = await $.get("/platform/theRapyRecuperation/line/enroll/selectLineAllInfo", {
                 usId: takePartInLineId
@@ -125,6 +126,7 @@ const INFO = {
         async getBaseData(takePartInBaseManagementId) {
             if (takePartInBaseManagementId == null){
                 this.baseData={}
+                return
             }
             const res = await $.get('/platform/theRapyRecuperation/baseManagement/selectBaseAllInfo', {
                 id: takePartInBaseManagementId

src/main/resources/views/platform/theRapyRecuperation/signUp/lineSignUp.js

@@ -80,15 +80,18 @@ const LineSignUp = {
                                 </el-tag>
                             </template>
                         </el-table-column>
-                        <el-table-column label="操作" width="300px">
+                        <el-table-column label="操作" width="350px">
                             <template slot-scope="scope">
                                 <el-button size="mini" 
                                            :type="selectedTime && selectedTime.usId === scope.row.usId ? 'success' : 'primary'" 
                                            @click="handleCurrentChange(scope.row)">
                                     {{ selectedTime && selectedTime.usId === scope.row.usId ? '已选择' : '选择' }}
                                 </el-button>
+                                <el-button size="mini" type="primary" @click="$emit('view-line', scope.row)">
+                                    查看线路
+                                </el-button>
                                 <el-button size="mini" type="primary" @click="viewSignUpUser(scope.row)">
-                                    查看报名人员
+                                    报名人员
                                 </el-button>
                             </template>
                         </el-table-column>