Skip to content

G
gk
Commit add9c4e9 authored by daniel's avatar daniel
Browse files
Options

feat(gpsDeposit): gps押金完善

parent 706c5c7c
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 20 deletions
src/main/webapp/WEB-INF/views/cmpt/gpsDeposit.jsp
View file @ add9c4e9
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>自助选号</title> <title>GPS押金</title>
<!-- ... 保留原有的 Vue 引入 ... --> <!-- ... 保留原有的 Vue 引入 ... -->
<script src="${ctxStatic}/vue/vue.global.min.js"></script> <script src="${ctxStatic}/vue/vue.global.min.js"></script>
<!-- 添加 Naive UI 的引入 --> <!-- 添加 Naive UI 的引入 -->
...@@ -111,12 +111,12 @@ ...@@ -111,12 +111,12 @@
<!-- 顶部的搜索框 --> <!-- 顶部的搜索框 -->
<n-card :bordered="false"> <n-card :bordered="false">
<div class="w-full flex flex-row items-center gap-x-2"> <div class="w-full flex flex-row items-center gap-x-2">
<div style="min-width: 200px"> <div style="min-width: 230px">
<n-tabs type="segment" @update:value="updateTab":value="tabIndex" animated pane-style="padding:0;"> <n-tabs type="segment" @update:value="updateTab" :value="tabIndex" animated pane-style="padding:0;">
<n-tab-pane v-for="item in TabEnum.data" :name="item.value" :tab="item.name"/> <n-tab-pane v-for="item in TabEnum.data" :name="item.value" :tab="item.name"/>
</n-tabs> </n-tabs>
</div> </div>
<div style="min-width: 400px" v-if="!isSetting" > <div style="min-width: 520px" v-if="tabIndex===2" >
<n-tabs type="segment" <n-tabs type="segment"
@update:value="updateStatus" :value="query.status" animated pane-style="padding:0;"> @update:value="updateStatus" :value="query.status" animated pane-style="padding:0;">
...@@ -126,12 +126,7 @@ ...@@ -126,12 +126,7 @@
:tab="item.name+'('+item.total+')'"/> :tab="item.name+'('+item.total+')'"/>
</n-tabs> </n-tabs>
</div> </div>
<div class="ml-auto" v-if="!isSetting"> <div style="min-width: 520px" v-if="tabIndex===3" >
<n-input v-model:value="keyword" placeholder="请输入关键字进行搜索" :clearable="true" @change="fetchData" />
</div>
</div>
<div class="w-full gap-x-2 flex flex-row items-center mt-3">
<div class="flex-1" v-if="!isSetting" >
<n-tabs type="segment" <n-tabs type="segment"
@update:value="updateStatus" :value="query.status" animated pane-style="padding:0;"> @update:value="updateStatus" :value="query.status" animated pane-style="padding:0;">
<n-tab-pane <n-tab-pane
...@@ -140,21 +135,34 @@ ...@@ -140,21 +135,34 @@
:tab="item.name+'('+item.total+')'"/> :tab="item.name+'('+item.total+')'"/>
</n-tabs> </n-tabs>
</div> </div>
<n-space> <div class="ml-auto" v-if="!isSetting">
<n-button type="primary" > <n-input v-model:value="keyword" placeholder="请输入关键字进行搜索" :clearable="true" @change="fetchData" />
导出未交押金 </div>
</div>
<div class="w-full gap-x-2 flex flex-row items-center mt-3">
<n-space v-if="tabIndex===2">
<n-button type="primary">
一键归还
</n-button> </n-button>
<n-button type="primary" > <n-button v-if="checkedRowKeys.length" type="error">
导出已交押金 批量退款
</n-button> </n-button>
</n-space>
<n-space v-if="tabIndex===3">
<n-button> <n-button>
订单下载 导出已绑定
</n-button> </n-button>
<n-button> <n-button>
一键归还 导出未归还
</n-button> </n-button>
<n-button v-if="checkedRowKeys.length" type="error"> <n-button>
批量退款 导出未支付
</n-button>
<n-button>
导出已支付
</n-button>
<n-button type="primary">
一键发放
</n-button> </n-button>
</n-space> </n-space>
</div> </div>
...@@ -163,7 +171,7 @@ ...@@ -163,7 +171,7 @@
<n-data-table v-if="!isSetting" :columns="playersColumns" :loading="loading" :row-key="rowKey" :data="list" :pagination="pagination" <n-data-table v-if="!isSetting" :columns="playersColumns" :loading="loading" :row-key="rowKey" :data="list" :pagination="pagination"
:bordered="false" :bordered="false"
:remote="true" @update:checked-row-keys="handleCheck"/> :remote="true" @update:checked-row-keys="handleCheck"/>
<n-card v-else title="押金详情" :bordered="false" > <n-card v-show="isSetting" title="押金详情" :bordered="false" >
<n-form <n-form
ref="depositFormRef" ref="depositFormRef"
:model="depositForm" :model="depositForm"
...@@ -379,6 +387,7 @@ ...@@ -379,6 +387,7 @@
new SuperEnum([ new SuperEnum([
{ key: 'SETTING', name: '押金配置', color: 'warning', value: 1 }, { key: 'SETTING', name: '押金配置', color: 'warning', value: 1 },
{ key: 'ORDER', name: '订单列表', color: 'success', value: 2 }, { key: 'ORDER', name: '订单列表', color: 'success', value: 2 },
{ key: 'DEVICE', name: '设备列表', color: 'success', value: 3 },
]) ])
</script> </script>
<script> <script>
...@@ -443,6 +452,11 @@ ...@@ -443,6 +452,11 @@
value: 4, value: 4,
total: 0 total: 0
}, },
{
name: '已关闭',
value: 5,
total: 0
},
]) ])
const GpsStatusOptions = ref([ const GpsStatusOptions = ref([
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment