dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.16

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-16 20:42:28 +08:00
parent 29b603889b
commit 3996c44056
9 changed files with 86 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -6,7 +6,6 @@
<div style="display: flex;align-items: center "> <div style="display: flex;align-items: center ">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label=""> <el-form-item label="">
<el-date-picker <el-date-picker
v-model="beginTime" v-model="beginTime"
style="width: 140px" style="width: 140px"

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -28,8 +28,6 @@
<el-option label="POS端" value="POS"/> <el-option label="POS端" value="POS"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="" prop="payType"> <el-form-item label="" prop="payType">
<el-select <el-select
v-model="queryParams.payType" v-model="queryParams.payType"

5
fuintAdmin/src/views/handover/info/rec/trading.vue
View File

@ -58,8 +58,6 @@
<el-form-item class="f-button" style="text-align: right;"> <el-form-item class="f-button" style="text-align: right;">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -209,12 +207,9 @@
/> />
</div> </div>
<el-dialog <el-dialog
title="订单信息" title="订单信息"
:visible.sync="dialogVisible"> :visible.sync="dialogVisible">
<el-descriptions :title="'订单号：'+ordersInfo.orderNo"> <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
<el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item> <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
<el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item> <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>

66
fuintAdmin/src/views/member/index.vue
View File

@ -103,43 +103,35 @@
</div> </div>
<!-- </el-card>--> <!-- </el-card>-->
<el-card style="margin-top: 20px"> <div class="ds-dbox">
<template> <div class="k-one">
<div class="ds-dbox"> <div class="title_">激活会员总数</div>
<div class="k-one"> <div class="num-size">{{total}}</div>
<div class="title_">激活会员总数</div> <img class="r-bot-img" src="./imgs/hy-1.png" alt="">
<div class="num-size">{{total}}</div> </div>
<img class="r-bot-img" src="./imgs/hy-1.png" alt="">
</div>
<div class="k-two"> <div class="k-two">
<div class="title_">今日新增/昨日新增</div> <div class="title_">今日新增/昨日新增</div>
<div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div> <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
<img class="r-bot-img" src="./imgs/hy-2.png" alt=""> <img class="r-bot-img" src="./imgs/hy-2.png" alt="">
</div> </div>
<div class="k-three"> <div class="k-three">
<div class="title_">充值总人数</div> <div class="title_">充值总人数</div>
<div class="num-size">{{rechargeTotal || 0}}</div> <div class="num-size">{{rechargeTotal || 0}}</div>
<img class="r-bot-img" src="./imgs/hy-3.png" alt=""> <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
</div> </div>
<div class="k-four"> <div class="k-four">
<div class="title_">储值总余额</div> <div class="title_">储值总余额</div>
<div class="num-size">{{balance}}</div> <div class="num-size">{{balance}}</div>
<img class="r-bot-img" src="./imgs/hy-4.png" alt=""> <img class="r-bot-img" src="./imgs/hy-4.png" alt="">
</div> </div>
<div class="k-five"> <div class="k-five">
<div class="title_">积分总余额</div> <div class="title_">积分总余额</div>
<div class="num-size">{{point}}</div> <div class="num-size">{{point}}</div>
<img class="r-bot-img" src="./imgs/hy-5.png" alt=""> <img class="r-bot-img" src="./imgs/hy-5.png" alt="">
</div> </div>
</div> </div>
<div style="height: 50vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
</template>
</el-card>
<!-- <el-card style="margin-top: 20px">-->
<div style="height: 58vh;overflow: auto;margin-top: 15px">
<el-table ref="tables" v-loading="loading" :data="list" border <el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort" @selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange"> @sort-change="handleSortChange">
@ -689,7 +681,7 @@ export default {
tabindex: 0, tabindex: 0,
tabs: [ tabs: [
{ {
name: "会员信息", name: "会员信息1",
}, },
{ {
name: "群发记录", name: "群发记录",

19
fuintAdmin/src/views/member/userLabel.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单--> <!-- 收银台订单-->
<template> <template>
<div style="padding-top: 15px;padding-bottom: 5px; padding-right: 40px; background: #f6f8f9;"> <div style="box-sizing: border-box;padding: 10px; background: #f6f8f9;">
<el-card class="box-card" shadow="never"> <div class="wit_box" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="labelName" style="width: 180px"> <el-form-item label="" prop="labelName" style="width: 180px">
@ -34,10 +34,6 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card" style="min-height: 500px;" shadow="never">-->
<div class="table-box"> <div class="table-box">
<el-table <el-table
:data="orderList" :data="orderList"
@ -97,7 +93,7 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</el-card> </div>
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
@ -283,7 +279,7 @@ export default {
.table-box { .table-box {
width: 100%; width: 100%;
height: 79vh; height: 77vh;
overflow: auto; overflow: auto;
} }
@ -341,5 +337,10 @@ export default {
color: #fff; color: #fff;
} }
.wit_box{
background: #fff;
box-sizing: border-box;
padding: 15px;
border-radius: 10px;
}
</style> </style>

2
fuintAdmin/src/views/oilSetting/device/device-index.vue
View File

@ -6,7 +6,7 @@ export default {
activeindex:0, activeindex:0,
tablist:[ tablist:[
{ {
name:'打印机配置', name:'',
}, },
{ {
name:'汽机油机配置', name:'汽机油机配置',

3
fuintAdmin/src/views/setting/device/device-index.vue
View File

@ -24,7 +24,6 @@ export default {
} }
} }
</script> </script>
<template> <template>
<div class="container"> <div class="container">
<div class="tab-box"> <div class="tab-box">
@ -51,6 +50,7 @@ export default {
margin-right: 50px; margin-right: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer;
} }
.active{ .active{
@ -59,6 +59,7 @@ export default {
} }
.container{ .container{
background: #F4F5F9; background: #F4F5F9;
height: 93vh;
box-sizing: border-box; box-sizing: border-box;
//padding: 20px; //padding: 20px;
} }

85
fuintAdmin/src/views/setting/print/index.vue
View File

@ -1,25 +1,55 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <div class="wit-b">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input <el-input
v-model="queryParams.deviceName" v-model="queryParams.deviceName"
placeholder="设备名称" placeholder="请输入配置名称"
clearable clearable
style="width: 240px;" style="width: 240px;"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="payChannel">
<el-select
v-model="queryParams.payChannel"
clearable
placeholder="请选择设备功能"
>
<el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payChannel">
<el-select
v-model="queryParams.payChannel"
clearable
placeholder="请选择关联员工"
>
<el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/>
</el-select>
</el-form-item>
<el-form-item label="" prop="payChannel">
<el-select
v-model="queryParams.payChannel"
clearable
placeholder="请选择设备状态"
>
<el-option label="小程序" value="applet"/>
<el-option label="收银台" value="cashier"/>
<el-option label="POS端" value="POS"/>
</el-select>
</el-form-item>
<el-form-item style="float: right; margin-right: 0px"> <el-form-item style="float: right; margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button> <el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="tableData" style="width: 100%" border> <el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column> <el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column> <el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
@ -33,23 +63,6 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="machineCode" label="设备终端号"></el-table-column> <el-table-column align="center" prop="machineCode" label="设备终端号"></el-table-column>
<el-table-column align="center" prop="msign" label="设备密钥"></el-table-column> <el-table-column align="center" prop="msign" label="设备密钥"></el-table-column>
<!-- <el-table-column align="center" prop="userId" label="用户id"></el-table-column>-->
<!-- <el-table-column prop="appKey" label="应用id(APP_KEY)"></el-table-column>-->
<!-- <el-table-column prop="appSecret" label="应用密钥(APP_SECRET)"></el-table-column>-->
<!-- <el-table-column prop="appPublicKey" label="应用公钥(key)"></el-table-column>-->
<!-- <el-table-column prop="platformPublicKey" label="平台公钥(publicKey)"></el-table-column>-->
<!-- <el-table-column prop="accessToken" label="token"></el-table-column>-->
<!-- <el-table-column prop="isAcquiesce" label="isAcquiesce">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-model="scope.row.isAcquiesce"-->
<!-- @change="submitDeviceInfo(scope.row)"-->
<!-- active-color="#13ce66"-->
<!-- inactive-color="#ff4949">-->
<!-- </el-switch>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -77,8 +90,7 @@
@pagination="getList" @pagination="getList"
/> />
</el-card> </div>
<el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%" <el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
append-to-body > append-to-body >
<el-form ref="form" :model="deviceInfo" label-width="80px"> <el-form ref="form" :model="deviceInfo" label-width="80px">
@ -116,24 +128,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="用户id" prop="userId">-->
<!-- <el-input v-model="deviceInfo.userId"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="应用id" prop="appKey">-->
<!-- <el-input v-model="deviceInfo.appKey"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="应用密钥" prop="appSecret">-->
<!-- <el-input v-model="deviceInfo.appSecret"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="应用公钥" prop="appPublicKey">-->
<!-- <el-input v-model="deviceInfo.appPublicKey"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="平台公钥" prop="platformPublicKey">-->
<!-- <el-input v-model="deviceInfo.platformPublicKey"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="token" prop="accessToken">-->
<!-- <el-input v-model="deviceInfo.accessToken"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="启用状态" prop="isAcquiesce"> <el-form-item label="启用状态" prop="isAcquiesce">
<el-switch <el-switch
v-model="deviceInfo.acquiesce" v-model="deviceInfo.acquiesce"
@ -378,5 +372,12 @@ export default {
height: 50px; height: 50px;
line-height: 60px; line-height: 60px;
} }
.wit-b{
background: #fff;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
height: 86vh;
}
</style> </style>

1
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -985,6 +985,7 @@ export default {
.app-container { .app-container {
width: 100%; width: 100%;
background: #f6f8f9; background: #f6f8f9;
height: 93vh;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }