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

11.21

Browse Source
This commit is contained in:
ds 2024-11-21 08:31:42 +08:00
parent 5ed75e1fb8
commit 8b0bdfdef6
18 changed files with 82 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-containers"> <div class="app-containers">
<!-- 存油卡--> <!-- 存油卡-->
<div class="card-box" style="margin-bottom: 20px"> <div class="card-box" style="margin-bottom: -2px">
<div class="d-s"> <div class="d-s">
<div class="gang"></div> <div class="gang"></div>
<div style="font-weight: bold">电子囤油卡</div> <div style="font-weight: bold">电子囤油卡</div>
@ -200,7 +200,7 @@
<el-input type="textarea" v-model="oilForm.gzDetail"></el-input> <el-input type="textarea" v-model="oilForm.gzDetail"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div style="text-align: center;">
<el-button @click="resetForm('oilForm')">取 消</el-button> <el-button @click="resetForm('oilForm')">取 消</el-button>
<el-button type="primary" @click="submitForms('oilForm')">保 存</el-button> <el-button type="primary" @click="submitForms('oilForm')">保 存</el-button>
</div> </div>
@ -296,10 +296,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer" center> <div style="text-align: center;">
<el-button @click="centerDialogVisible = false">取 消</el-button> <el-button @click="centerDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="postadd('ruleForm')">保 存</el-button> <el-button type="primary" @click="postadd('ruleForm')">保 存</el-button>
</span> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

4
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.8vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">--> <!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="商品档案" name="goods"></el-tab-pane>--> <!-- <el-tab-pane label="商品档案" name="goods"></el-tab-pane>-->
@ -75,7 +75,7 @@
<div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div> <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
</div> </div>
<div style="height: 66vh;overflow: auto"> <div style="height: 69vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" <el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border border

2
fuintAdmin/src/views/convenienceStore/goodsSale.vue
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<!-- 商品销售统计--> <!-- 商品销售统计-->
<!-- 搜索框--> <!-- 搜索框-->
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.8vh;">
<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

4
fuintAdmin/src/views/convenienceStore/pinlei.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.8vh;">
<!-- 查询类别 --> <!-- 查询类别 -->
<el-form :inline="true" :model="queryParams"> <el-form :inline="true" :model="queryParams">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
@ -28,7 +28,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 68vh;overflow: auto"> <div style="height: 71vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" row-key="id" border> <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">

4
fuintAdmin/src/views/convenienceStore/stockStatistic.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索框--> <!-- 搜索框-->
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.8vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input <el-input
@ -93,7 +93,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 71vh;overflow: auto;scrollbar-width: none"> <div style="height: 72vh;overflow: auto;scrollbar-width: none">
<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">

4
fuintAdmin/src/views/convenienceStore/supplier.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.8vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="name"> <el-form-item label="" prop="name">
<el-input <el-input
@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 68vh;overflow: auto"> <div style="height: 72vh;overflow: auto">
<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">

4
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="card-change" style="height: 86vh;"> <div class="card-change" style="height: 86.5vh;">
<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="gunName"> <el-form-item label="" prop="gunName">
<el-input <el-input
@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div> <div>
<div style="width: 100%;overflow: auto;height: 69vh"> <div style="width: 100%;overflow: auto;height: 71.5vh">
<el-table ref="tables" <el-table ref="tables"
v-loading="loading" v-loading="loading"
:data="gunList" :data="gunList"

2
fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
View File

@ -207,7 +207,7 @@ export default {
<template> <template>
<div> <div>
<div class="card-change-box" style="margin-bottom: 20px"> <div class="card-change-box">
<div style="display: flex; justify-content: space-between;margin-bottom: 10px"> <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
<div style="display: flex;"> <div style="display: flex;">
<div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div> <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>

2
fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
View File

@ -283,7 +283,7 @@ export default {
<div style="display: flex; justify-content: space-between;margin-bottom: 10px"> <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
<div style="display: flex;"> <div style="display: flex;">
<div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div> <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
<span>油价配置</span> <span>油品配置</span>
</div> </div>
<div> <div>
<el-button type="primary" @click="oilTypeMethods(1)" <el-button type="primary" @click="oilTypeMethods(1)"

4
fuintAdmin/src/views/oilConfig/oilTank/list.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索框--> <!-- 搜索框-->
<div class="card-box" style="height: 86vh; margin-bottom: 0px;"> <div class="card-box" style="height: 86.5vh; margin-bottom: 0px;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="tankName"> <el-form-item label="" prop="tankName">
<el-input <el-input
@ -53,7 +53,7 @@
<!-- </div>--> <!-- </div>-->
<!-- 列表--> <!-- 列表-->
<div style="height: 69vh;overflow: auto"> <div style="height: 72vh;overflow: auto">
<el-table ref="tables" <el-table ref="tables"
v-loading="loading" v-loading="loading"
:data="tankList" :data="tankList"

77
fuintAdmin/src/views/order/order_Added.vue
View File

@ -130,60 +130,55 @@
<!-- 归还记录信息--> <!-- 归还记录信息-->
<el-drawer <el-drawer
title="归还详情"
:visible.sync="drawer" :visible.sync="drawer"
direction="rtl" direction="rtl"
size="55%" size="55%"
:before-close="handleClose"> :before-close="handleClose">
<div style="display: grid; place-items: center;"> <template #title>
<div style="background-color: #f5f5f5;width: 90%;box-sizing: border-box;padding: 15px;padding-top: 20px"> <span style="font-size: 24px; margin-left: 30px;">归还详情</span>
<div slot="header" class="clearfix"> </template>
<div style="position: relative;"> <div style="display: grid;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);"> <table style="width: 75%; margin-left: 50px;">
<h2>单据号：{{ record.orderNo }}</h2> <tr>
</div> <td >订单号：{{record.orderNo}}</td>
</div> <td >挂账单位：{{record.unitName}}</td>
<br> <td >挂账人：{{record.personCredit}}</td>
<div style="display: flex; justify-content: space-between;"> </tr>
<span>操作员工：</span> <tr>
<span>{{ record.realName }}</span> <td >联系电话：{{record.contactMobile}}</td>
</div> <td >操作人：{{record.realName}}</td>
<td >操作账号：{{record.mobile}}</td>
</tr>
</table>
</div> </div>
<div style="display: flex;margin-left: 50px; margin-top: 30px;margin-bottom: 14px" >
<div style="height: 21px;width: 3px;background-color: #FF9655;margin-right: 10px"></div>
归还信息</div>
<div> <div>
<div style="display: flex; justify-content: space-between;">
<span>挂账单位</span>
<span>{{ record.unitName }}</span>
</div> <div style="margin:0 auto; width: 90%">
<div style="display: flex; justify-content: space-between;margin: 10px 0">
<span>挂账人</span>
<span>{{ record.personCredit }}</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span>联系电话</span>
<span>{{ record.contactMobile }}</span>
</div>
</div>
</div>
<div style="margin-top: 15px;width: 90%">
<el-table ref="tables" <el-table ref="tables"
border border
v-loading="loading" v-loading="loading"
:data="returnRecordList"> :data="returnRecordList">
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column> <el-table-column label="订单号" align="center" prop="orderNo" width="240"></el-table-column>
<el-table-column label="类型" align="center" prop="returnType"> <el-table-column label="类型" align="center" prop="returnType">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.returnType == 0">挂账</el-tag> <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
<el-tag v-else type="success">归还</el-tag> <el-tag v-else type="success">归还</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="归还金额" align="center" prop="amount"/> <el-table-column label="归还金额（元）" align="center" prop="amount"/>
<el-table-column label="找零金额" align="center" prop="seekZero"/> <el-table-column label="找零金额（元）" align="center" prop="seekZero"/>
<el-table-column label="归还方式" align="center" prop="status"> <el-table-column label="归还方式" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getPayMeth(payList, scope.row.status) }}</span> <span>{{ getPayMeth(payList, scope.row.status) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付状态" align="center" prop="payStatus"> <el-table-column label="状态" align="center" prop="payStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag> <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag> <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
@ -191,24 +186,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" align="center" prop="realName"/> <el-table-column label="操作人" align="center" prop="realName"/>
<el-table-column label="支付时间" align="center" prop="payTime" width="200"> <el-table-column label="完成时间" align="center" prop="payTime" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span> <span>{{ parseTime(scope.row.payTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total2>0"
:total="total2"
:page.sync="queryParams1.page"
:limit.sync="queryParams1.pageSize"
@current-change="getRecordList">
</el-pagination>
</div>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@ -426,7 +409,7 @@ export default {
.box-card { .box-card {
width: 100%; width: 100%;
height: 91vh; height: 91.5vh;
border-radius: 8px; border-radius: 8px;
// margin-bottom: 15px; // margin-bottom: 15px;
background: #fff; background: #fff;

4
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -422,7 +422,7 @@ export default {
.box-card { .box-card {
width: 100%; width: 100%;
height: 91vh; height: 91.3vh;
border-radius: 8px; border-radius: 8px;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
@ -491,7 +491,7 @@ export default {
.table-box { .table-box {
width: 100%; width: 100%;
height: 72vh; height: 76vh;
overflow: auto; overflow: auto;
} }

8
fuintAdmin_zt/src/views/Site/components/afterff.vue
View File

@ -32,7 +32,8 @@ export default {
} }
}, },
props: { props: {
deptId: Number deptId: Number,
stauts: Boolean
}, },
created() { created() {
this.getList(); this.getList();
@ -47,10 +48,13 @@ export default {
}) })
}, },
getList() { getList() {
if(this.stauts){
return
}else {
getAfterListApi({deptId : this.deptId}).then(res => { getAfterListApi({deptId : this.deptId}).then(res => {
this.tableData = res.data.records this.tableData = res.data.records
}) })
}
}, },
getData() { getData() {
getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => { getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {

11
fuintAdmin_zt/src/views/Site/components/before.vue
View File

@ -38,7 +38,8 @@ export default {
} }
}, },
props: { props: {
deptId: Number deptId: Number,
stauts: Boolean
}, },
created() { created() {
this.getList() this.getList()
@ -52,9 +53,14 @@ export default {
}) })
}, },
getList() { getList() {
if(this.stauts){
return
}else {
getBeforeListApi({deptId : this.deptId}).then(res => { getBeforeListApi({deptId : this.deptId}).then(res => {
this.tableData = res.data.records this.tableData = res.data.records
}) })
}
}, },
getData() { getData() {
getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => { getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {
@ -179,10 +185,11 @@ export default {
label="创建人"> label="创建人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if = "this.deptName === '百业兴总部'" v-if = "this.deptName === '百业兴总部' && !stauts"
align="center"> align="center">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<el-button <el-button
v-if="!stauts"
size="mini" size="mini"
@click="handleUpdate1(scope.row)" @click="handleUpdate1(scope.row)"
>新增</el-button> >新增</el-button>

2
fuintAdmin_zt/src/views/Site/components/yearff.vue
View File

@ -148,7 +148,7 @@ export default {
label="创建人"> label="创建人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if = "this.deptName === '百业兴总部'" v-if = "this.deptName === '百业兴总部' && !stauts"
align="center"> align="center">
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<el-button <el-button

10
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -99,6 +99,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 69vh;">
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
@ -160,6 +161,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -298,11 +300,11 @@
</el-row> </el-row>
<el-row> <el-row>
<template v-if="ruleForm.turnoverType === '3'"> <template v-if="ruleForm.turnoverType === '3'">
<beforeff :deptId="queryParams.deptId"></beforeff> <beforeff :deptId="queryParams.deptId" :stauts="stauts"></beforeff>
</template> </template>
<template v-if="ruleForm.turnoverType === '4'"> <template v-if="ruleForm.turnoverType === '4'">
<afterff :deptId="queryParams.deptId"></afterff> <afterff :deptId="queryParams.deptId" :stauts="stauts"></afterff>
</template> </template>
<template v-if="ruleForm.turnoverType === '5'"> <template v-if="ruleForm.turnoverType === '5'">
<yearff :deptId="queryParams.deptId" :stauts="stauts"></yearff> <yearff :deptId="queryParams.deptId" :stauts="stauts"></yearff>
@ -536,7 +538,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div style="height: 67vh;">
<el-table ref="tables" <el-table ref="tables"
v-loading="loading" v-loading="loading"
border border
@ -586,6 +588,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
<pagination <pagination
v-show="total1>0" v-show="total1>0"
:total="total1" :total="total1"

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
View File

@ -86,10 +86,6 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
*/ */
@Override @Override
public DeptPriceInfo insert(DeptPriceInfo deptPriceInfo) { public DeptPriceInfo insert(DeptPriceInfo deptPriceInfo) {
int countByTime = getCountByTime(deptPriceInfo);
if (countByTime>0) {
throw new RuntimeException("该时间段已有数据");
}
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
deptPriceInfo.setCreateName(nowAccountInfo.getRealName()); deptPriceInfo.setCreateName(nowAccountInfo.getRealName());
deptPriceInfo.setDeptId(deptPriceInfo.getDeptId()); deptPriceInfo.setDeptId(deptPriceInfo.getDeptId());

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
View File

@ -39,7 +39,7 @@ public class HangBillController extends BaseController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public ResponseObject list(HangBillVo hangBillVo, public ResponseObject list(HangBillVo hangBillVo,
@RequestParam(value = "page[page]",defaultValue = "1") Integer pageNo, @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
Page page =new Page(pageNo,pageSize); Page page =new Page(pageNo,pageSize);
IPage<HangBillVo> list = hangBillService.selectHangBillList(page,hangBillVo); IPage<HangBillVo> list = hangBillService.selectHangBillList(page,hangBillVo);