feat: v3版疗休养优化8

src/main/resources/db/v4_from_v3/init_staff_therapy_menus_roles.sql

@@ -64,8 +64,8 @@ FROM sys_menu WHERE permission='inclusiveTherapyV3';
 -- 线路选择查询
 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag)
 SELECT '7ea90000000000000000000000000008', id, CONCAT(path, '0008'),
-    '线路选择查询', 'menu', '/platform/inclusiveTherapyV3/lineSelectionOverview', '_self', 'fa fa-th-large', 1, 0,
+    '线路选择查询', 'menu', '/platform/inclusiveTherapyV3/statistics/unionLineNumberStatistics', '_self', 'fa fa-th-large', 1, 0,
-    'inclusiveTherapyV3.lineSelectionOverview', 8, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0
+    'inclusiveTherapyV3.unionLineNumberStatistics', 8, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0
 FROM sys_menu WHERE permission='inclusiveTherapyV3';
 
 -- 成团结果通知
@@ -85,8 +85,8 @@ FROM sys_menu WHERE permission='inclusiveTherapyV3';
 -- 分工会线路选择统计
 INSERT INTO sys_menu (id, parentId, path, name, type, href, target, icon, showit, disabled, permission, location, hasChildren, platform, moduleId, createdBy, createdAt, updatedBy, updatedAt, delFlag)
 SELECT '7ea9000000000000000000000000000b', id, CONCAT(path, '0011'),
-    '分工会线路选择统计', 'menu', '/platform/inclusiveTherapyV3/statistics/unionLineNumberStatistics', '_self', 'fa fa-th-large', 1, 0,
+    '分工会线路选择统计', 'menu', '/platform/inclusiveTherapyV3/lineSelectionOverview', '_self', 'fa fa-th-large', 1, 0,
-    'inclusiveTherapyV3.unionLineNumberStatistics', 11, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0
+    'inclusiveTherapyV3.lineSelectionOverview', 11, 0, 'pc', moduleId, '', UNIX_TIMESTAMP(NOW())*1000, '', UNIX_TIMESTAMP(NOW())*1000, 0
 FROM sys_menu WHERE permission='inclusiveTherapyV3';
 
 -- 人数统计

src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html

@@ -243,6 +243,8 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
                             </el-select>
                         </el-form-item>
                     </el-col>
+                </el-row>
+                <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="旅行社名称" prop="travelAgencyId">
                             <el-select clearable filterable style="width: 100%" v-model="formData.travelAgencyId">
@@ -272,7 +274,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
 
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-row :gutter="20">
-                            <el-col :span="12">
+                            <el-col :span="24">
                                 <el-form-item label="线路类型" prop="regionalNature">
                                     <el-radio-group class="mr0-radio" size="small" v-model="formData.regionalNature">
                                         <el-radio :label="item.value"
@@ -284,6 +286,8 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
                             </el-col>
                         </el-row>
                     </el-col>
+                </el-row>
+                <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="交通工具" prop="trafficTools">
                             <el-input clearable maxlength="50" v-model="formData.trafficTools"></el-input>
@@ -312,6 +316,8 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
                             </el-col>
                         </el-row>
                     </el-col>
+                </el-row>
+                <el-row :gutter="20">
                     <el-col :md="12" :sm="24" :xs="24">
                         <el-form-item label="预计费用（元/人次）" prop="estimatedCost">
                             <el-input clearable maxlength="50" v-model="formData.estimatedCost"></el-input>

src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html

@@ -280,7 +280,7 @@ layout("/platform/zhgh/staffbenefit/therapyRecuperation/layouts/platform.html"){
                        <!-- <el-button icon="el-icon-s-promotion" @click="openImport" size="small"
                                    type="primary">参加人员导入
                         </el-button>-->
-                        <!--# if(@com.budwk.app.zhgh.staffbenefit.therapyRecuperation.support.TherapyContext.hasRole('H04')){ #-->
+                        <!--# if(@com.budwk.app.zhgh.staffbenefit.therapyRecuperation.support.TherapyContext.hasAnyRoles('H04,superadmin')){ #-->
                         <template>
                             <el-button icon="el-icon-s-promotion"
                                        @click="$downloadFile('/platform/inclusiveTherapyV3/query/exportDeclareForm')"