commit

src/main/resources/views/platform/coffeeTicket/activity/index.html

@@ -46,17 +46,17 @@ layout("/layouts/platform.html"){
             <el-table :data="tableData" ref="tableRef" @sort-change="pageOrder">
                 <el-table-column label="序号" width="60" type="index" :index="indexMethod"></el-table-column>
                 <el-table-column label="活动标题" prop="title" sortable show-overflow-tooltip></el-table-column>
-                <el-table-column label="创建时间" prop="createdAt" width="170" sortable>
+               <!-- <el-table-column label="创建时间" prop="createdAt" width="170" sortable>
                     <template scope="{row}">
                         <span>{{formatDateTime(row.createdAt)}}</span>
                     </template>
-                </el-table-column>
-                <el-table-column label="活动周期" width="220">
+                </el-table-column>-->
+                <el-table-column label="活动周期" width="180">
                     <template scope="{row}">
                         <span>{{formatDate(row.activityStartDate)}} - {{formatDate(row.activityEndDate)}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="可预约星期" width="220">
+                <el-table-column label="可抢票星期" width="220">
                     <template scope="{row}">
                         <span>{{formatWeekDays(row.weekDays)}}</span>
                     </template>

src/main/resources/views/platform/coffeeTicket/new/index.html

@@ -230,10 +230,29 @@ layout("/layouts/platform.html"){
                     </el-form-item>
 
                     <el-form-item label="可报名人员范围" prop="activityGroupId">
-                        <el-select v-model="formData.activityGroupId" clearable filterable placeholder="请选择人员范围" style="width: 460px">
+                        <div style="display: flex; justify-content: space-between">
+                            <div style="width: 99%">
+                                <el-select prop="activityGroupId" placeholder="参加人员范围"
+                                           v-model="formData.activityGroupId"
+                                           style="width: 99%;"
+                                           clearable
+                                           filterable>
+                                    <el-option v-for="item in groupList"
+                                               :label="item.groupName"
+                                               :value="item.groupId"></el-option>
+                                </el-select>
+                            </div>
+                            <div>
+                                <el-button
+                                        @click="$refs.drawerUserScope.userScopeDialog = true"
+                                        type="primary">设置
+                                </el-button>
+                            </div>
+                        </div>
+                       <!-- <el-select v-model="formData.activityGroupId" clearable filterable placeholder="请选择人员范围" style="width: 460px">
                             <el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option>
                         </el-select>
-                        <div class="coffee-form-item-tip">只有该人员范围内的用户可以在手机端看到并参与本活动</div>
+                        <div class="coffee-form-item-tip">只有该人员范围内的用户可以在手机端看到并参与本活动</div>-->
                     </el-form-item>
 
                     <el-form-item label="每日可抢票时间段" required>
@@ -289,6 +308,12 @@ layout("/layouts/platform.html"){
             </div>
         </el-card>
     </guava>
+
+    <drawer-user-scope
+            :group_id.sync="formData.activityGroupId"
+            @group_change="loadGroupList"
+            ref="drawerUserScope"
+    ></drawer-user-scope>
 </div>
 
 <script>
@@ -355,6 +380,9 @@ layout("/layouts/platform.html"){
                 }
             }
         },
+        components: {
+            'drawer-user-scope': httpVueLoader('/components/plugins/DrawerUserScope.vue'),
+        },
         methods: {
             getQueryString(name) {
                 const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)")

src/main/resources/views/platform/coffeeTicket/statistics/index.html

@@ -100,7 +100,9 @@ layout("/layouts/platform.html"){
         <el-card shadow="never" class="mt10">
             <table-tool :app="this" label="抢票统计">
                 <template #func>
-                    <el-button size="small" type="primary" @click="exportExcel">导出</el-button>
+                    <el-button size="small" type="primary" @click="exportExcel"
+                               v-if="${@shiro.hasPermission('coffeeTicket.statistics.delete')}">导出
+                    </el-button>
                 </template>
             </table-tool>
 
@@ -123,7 +125,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="90"
-                                 v-if="$auth.hasPermission('coffeeTicket.statistics.delete')">
+                                 v-if="${@shiro.hasPermission('coffeeTicket.statistics.delete')}">
                     <template scope="{row}">
                         <el-button size="mini" type="danger" @click="onDelete(row)">删除</el-button>
                     </template>