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

Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station

Browse Source 
# Conflicts:
#	fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
This commit is contained in:
齐天大圣 2024-10-31 11:20:08 +08:00
commit 28f27d415c
87 changed files with 352 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/cashier/components/hangUpDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="挂单列表" :visible="showDialog" @close="close" width="1000px" destroy-on-close>
<el-dialog center class="common-dialog" title="挂单列表" :visible="showDialog" @close="close" width="1000px" destroy-on-close>
<el-alert title="提示：请选择一个空白位置挂单" type="warning" :closable="false"></el-alert>
<div class="order-list">
<div class="order-item" v-for="orderInfo in orderList">

2
fuintAdmin/src/views/cashier/components/noGoodsCashier.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 积分变更对话框 -->
<el-dialog title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
<el-dialog center title="无商品收款" :visible.sync="showDialog" class="common-dialog" width="700px" @close="close" destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/cashier/components/orderPrintDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="订单打印预览" :visible="showDialog" width="380px" @close="cancel" append-to-body destroy-on-close>
<el-dialog center class="common-dialog" title="订单打印预览" :visible="showDialog" width="380px" @close="cancel" append-to-body destroy-on-close>
<div v-if="orderInfo.id" class="print-area" id="printArea">
<div class="base-info">
<div class="name">{{ storeInfo.name }}</div>

2
fuintAdmin/src/views/cashier/components/payResultDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="支付结果" :visible="showDialog" @close="submit" width="580px" destroy-on-close>
<el-dialog center class="common-dialog" title="支付结果" :visible="showDialog" @close="submit" width="580px" destroy-on-close>
<el-row>
<el-col :span="24">
<div class="main">

2
fuintAdmin/src/views/cashier/components/scanPayCodeDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="扫码收款中..." :visible="showDialog" @close="submit" width="580px" destroy-on-close>
<el-dialog center class="common-dialog" title="扫码收款中..." :visible="showDialog" @close="submit" width="580px" destroy-on-close>
<el-row>
<el-col :span="24">
<div class="main">

2
fuintAdmin/src/views/cashier/components/settlementDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="支付结算" :visible="showDialog" width="1100px" @close="cancel" destroy-on-close>
<el-dialog center class="common-dialog" title="支付结算" :visible="showDialog" width="1100px" @close="cancel" destroy-on-close>
<el-dialog class="common-dialog" width="800px" title="选择卡券" :visible.sync="showCouponDialog" append-to-body destroy-on-close>
<div class="coupon-list">
<div class="none" v-if="!memberInfo || !myCouponList || myCouponList.length < 1">暂无可用卡券</div>

2
fuintAdmin/src/views/cashier/components/switchMemberDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
<el-dialog center class="common-dialog" title="关联会员" :visible="showDialog" @close="close" width="750px" destroy-on-close>
<el-form ref="form" v-if="!memberInfo.id" class="form" :model="form" label-width="100px">
<el-form-item label="会员关键字" class="form-item" prop="keyword">
<el-input class="input-item" v-model="form.keyword" v-focus placeholder="请输入会员手机号码、会员名称或扫码会员二维码" clearable maxlength="200" />

2
fuintAdmin/src/views/cashier/index.vue
View File

@ -131,7 +131,7 @@
</el-drawer>
<!-- 规格详情 start-->
<el-dialog title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
<el-dialog center title="选择商品规格" :visible.sync="openGoodsDialog" class="common-dialog" append-to-body>
<div class="goods-info">
<div class="name">{{ goodsInfo.name }}</div>
<div class="price">￥{{ goodsInfo.price }}</div>

2
fuintAdmin/src/views/content/article/index.vue
View File

@ -92,7 +92,7 @@
/>
<!-- 添加或修改文章对话框 -->
<el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/coupon/confirm/index.vue
View File

@ -17,7 +17,7 @@
</div>
<!--核销对话框 start-->
<el-dialog :close-on-click-modal="false" title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" label-width="120px">
<el-row>
<el-col :span="24">

4
fuintAdmin/src/views/coupon/coupon/index.vue
View File

@ -139,7 +139,7 @@
/>
<!-- 添加或修改卡券对话框 start-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row>
<el-col :span="24">
@ -439,7 +439,7 @@
<!-- 添加或修改卡券对话框 end-->
<!--发券对话框 start-->
<el-dialog :close-on-click-modal="false" title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
<el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/coupon/give/index.vue
View File

@ -111,7 +111,7 @@
@pagination="getList"
/>
<el-dialog :close-on-click-modal="false" title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-dialog center :close-on-click-modal="false" title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-table ref="tables" v-loading="loading" :data="itemList">
<el-table-column label="ID" align="center" prop="id" width="60"/>
<el-table-column label="手机号" align="center" width="120" prop="mobile"/>

2
fuintAdmin/src/views/coupon/group/index.vue
View File

@ -100,7 +100,7 @@
/>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/duty/index.vue
View File

@ -93,7 +93,7 @@
</div>
<!-- 添加或修改角色配置对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openDuty" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openDuty" width="700px" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form1.roleName" @input="$forceUpdate()" style="width: 300px" placeholder="请输入角色名称"/>

2
fuintAdmin/src/views/feedBack/index.vue
View File

@ -91,7 +91,7 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="40%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="反馈内容" prop="content">

12
fuintAdmin/src/views/fleet/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-r">
<div class="app-top">
<div :body-style="{ padding: '0px' }">
<div class="box">
<div class="sb_box">
<div class="nbox" :class="pointerClass" @click="updateRedio('车队信息')">
<div class="fount-box" :style="{ color: radio1 === '车队信息' ? '#FF770F' : '#999999' }">车队信息</div>
<div class="heng-box" v-if="radio1 == '车队信息'"></div>
@ -100,4 +100,14 @@ export default {
height: 2px;
margin-top: 10px;
}
.sb_box{
width: 100%;
display: flex;
box-sizing: border-box;
padding-left: 15px;
align-items: center;
background: #fff;
padding-top: 10px;
}
</style>

4
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -128,7 +128,7 @@
/>
</div>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="32%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="32%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="95px">
<el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" />
@ -186,7 +186,7 @@
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="32%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="32%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
<el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="50"/>

10
fuintAdmin/src/views/fleet/tab/fleetMember.vue
View File

@ -149,7 +149,7 @@
</div>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="车队名称" prop="fleetId">
<el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;">
@ -202,7 +202,7 @@
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="30%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
<el-form-item label="副卡额度" prop="secondaryCardLimit">
@ -248,7 +248,7 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open2" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open2" width="30%" append-to-body>
<el-form ref="form2" :model="form2" :rules="rules" label-width="80px">
<el-form-item label="副卡额度" prop="secondaryCardLimit">
@ -280,7 +280,7 @@
</el-dialog>
<!-- 批量添加用户认证信息 -->
<el-dialog :title="title" :visible.sync="open3" width="30%"
<el-dialog center :title="title" :visible.sync="open3" width="30%"
:close-on-click-modal="false" append-to-body>
<el-form ref="form2" :model="form3" :rules="rules">
<el-row>
@ -341,7 +341,7 @@
<!-- 批量导入结果-->
<el-dialog :close-on-click-modal="false" width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<el-dialog center :close-on-click-modal="false" width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<div class="huiyuan">
认证总数：<span class="num">{{result.total}}</span> 人
</div>

2
fuintAdmin/src/views/goods/cate/index.vue
View File

@ -111,7 +111,7 @@
/>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/member/balanceRecharge.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 充值对话框 -->
<el-dialog :close-on-click-modal="false" class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
<el-dialog center :close-on-click-modal="false" class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/member/creditIndex.vue
View File

@ -113,7 +113,7 @@
</div>
<!-- 新增挂账单位信息-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open1" width="700px" append-to-body>
<el-form ref="formName" :model="form1" :rules="rules1" label-width="120px">
<el-row>
<el-col :span="24">

8
fuintAdmin/src/views/member/fixingLevel.vue
View File

@ -348,7 +348,7 @@
</el-card>
<!-- 批量添加用户认证信息 -->
<el-dialog :title="title" :visible.sync="openMembers"
<el-dialog center :title="title" :visible.sync="openMembers"
:close-on-click-modal="false" append-to-body>
<el-form ref="form2" :model="form2" :rules="rules2">
<el-row>
@ -423,7 +423,7 @@
</el-dialog>
<!-- 批量导入结果-->
<el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<el-dialog center width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<div class="huiyuan">
认证总数：<span class="num">{{result.total}}</span> 人
</div>
@ -440,7 +440,7 @@
</el-dialog>
<!-- 添加用户认证或修改对话框 -->
<el-dialog :title="title" :visible.sync="openMember"
<el-dialog center :title="title" :visible.sync="openMember"
:close-on-click-modal="false" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules1">
<el-row>
@ -578,7 +578,7 @@
</el-dialog>
<!-- 添加企业会员等级或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" class="roll-dialog"
<el-dialog center :title="title" :visible.sync="open" class="roll-dialog"
:close-on-click-modal="false" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>

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

@ -406,7 +406,7 @@
<div style="width: 100%;height: 10px;"></div>
<!-- 添加会员信息，选择是否批量录入-->
<el-dialog :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
<el-alert
type="info"
:closable="false">
@ -425,7 +425,7 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row>
<el-col :span="24">
@ -580,7 +580,7 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="openMassSend" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="openMassSend" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
<el-row>
<el-col :span="24">
@ -637,7 +637,7 @@
</el-dialog>
<!-- 批量录入会员信息-->
<el-dialog :title="title" :close-on-click-modal="false" width="500px" :visible.sync="openUpload" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" width="500px" :visible.sync="openUpload" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules1" label-width="90px">
<el-row>
<el-col :span="24">
@ -694,7 +694,7 @@
</el-dialog>
<!-- 批量导入结果-->
<el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<el-dialog center width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
<div class="huiyuan">
会员总数：<span class="num">{{ result.total }}</span> 人
</div>

4
fuintAdmin/src/views/member/manage.vue
View File

@ -369,7 +369,7 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<div class="flax_box">
<el-form-item label="分组名称" prop="groupName">
@ -509,7 +509,7 @@
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="35%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
<el-form-item label="活动名称" prop="name">

2
fuintAdmin/src/views/member/pointRecharge.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 积分变更对话框 -->
<el-dialog :close-on-click-modal="false" title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
<el-dialog center :close-on-click-modal="false" title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

8
fuintAdmin/src/views/member/userInfo.vue
View File

@ -155,7 +155,7 @@
</el-card>
<!-- 会员充值-->
<el-dialog :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
<el-dialog center :close-on-click-modal="false" width="60%" :title="title" :visible.sync="openRecharge" append-to-body>
<template>
<el-tabs v-model="activeRecharge" type="card" @tab-click="handleClick">
<el-tab-pane label="电子储值卡" name="balance">
@ -393,7 +393,7 @@
</el-dialog>
<!-- 选择员工-->
<el-dialog :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff"
<el-dialog center :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff"
append-to-body>
<select-staff @send-data="handleDataFromChild">
@ -401,7 +401,7 @@
</el-dialog>
<!-- 确认充值-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
<div v-if="isPay"
v-loading="loading">
@ -491,7 +491,7 @@
</el-dialog>
<!-- 更换手机号对话框-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openMobile" style="margin-top: 200px"
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="openMobile" style="margin-top: 200px"
width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>

2
fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue
View File

@ -127,7 +127,7 @@
</el-tab-pane>
</el-tabs>
<el-dialog :title="title" :visible.sync="openSubCard1" width="30%">
<el-dialog center :title="title" :visible.sync="openSubCard1" width="30%">
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

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

@ -96,7 +96,7 @@
</div>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="标签名称" prop="labelName">

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

@ -47,9 +47,9 @@
</el-button>
</el-form-item>
</el-form>
<div>
<el-table ref="tables"
<div style="width: 100%;overflow: auto;height: 72vh">
<el-table ref="tables"
v-loading="loading"
:data="gunList"
border
@ -87,6 +87,7 @@
</template>
</el-table-column>
</el-table>
</div>
</div>
<pagination
v-show="total>0"
@ -97,14 +98,14 @@
/>
</div>
<el-dialog
center
:title="title"
:visible.sync="dialogVisible"
width="30%"
width="25%"
:before-close="handleClose"
:close-on-click-modal="false">
<el-form :model="gunForm" :rules="rules" ref="gunForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="油枪名称" prop="gunName">
<el-input style="width: 300px" placeholder="请输入内容" v-model="gunForm.gunName" class="input-with-select">
<el-select style="width: 110px" v-model="gunForm.select" slot="append" placeholder="选择油枪"
@change="chooseName">
@ -117,7 +118,6 @@
</el-select>
</el-input>
</el-form-item>
<el-form-item label="所属油罐" prop="tankId">
<el-select style="width: 300px" v-model="gunForm.tankId" placeholder="请选择所属油罐">
<el-option
@ -147,8 +147,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="gunForm.status">
<el-radio
@ -173,7 +171,7 @@
</el-form-item>
<el-form-item label="设备枪号" prop="name">
<el-input style="width: 300px" v-model="gunForm.oilMachineGunNumber"></el-input>
<div style="font-size: 12px;color: #999999">
<div style="font-size: 12px;width: 300px; color: #999999">
请确保输入的集线器正确的枪号，否则出现设备显示屏与一件加油页面显示数据不一致。例如：0001，0002···
</div>
</el-form-item>
@ -182,11 +180,6 @@
<el-button type="primary" @click="submitForm()">确 定</el-button>
</el-form-item>
</el-form>
<!-- <span slot="footer" class="dialog-footer">-->
<!--/* <el-button v-if="judgement" type="danger" @click="delGun()" style="float: left;">删除</el-button>*/-->
<!-- </span>-->
</el-dialog>
</div>
</template>

1
fuintAdmin/src/views/oilConfig/oilGun/list1.vue
View File

@ -42,6 +42,7 @@
</div>
</div>
<el-dialog
center
:title="title"
:visible.sync="dialogVisible"
width="30%"

2
fuintAdmin/src/views/oilConfig/oilInventory/list.vue
View File

@ -53,7 +53,7 @@
</el-form-item>
</el-form>
<div style="height: 76vh;overflow: auto">
<div style="height: 76vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables"
v-loading="loading"
:data="inventoryList"

2
fuintAdmin/src/views/oilConfig/oilInventory/order.vue
View File

@ -168,7 +168,7 @@
</div>
<!-- 添加采购油品-->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-dialog center :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-container>
<el-header style="">
<el-form ref="tankForm" :model="tankForm" label-width="80px">

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

@ -207,7 +207,7 @@ export default {
<template>
<div>
<div class="card-change-1-search" style="margin-bottom: 20px">
<div class="card-change-box" style="margin-bottom: 20px">
<div style="display: flex; justify-content: space-between;margin-bottom: 10px">
<div style="display: flex;">
<div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
@ -335,7 +335,7 @@ export default {
</div>
</div>
<el-dialog title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
<el-dialog center title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
<el-form ref="priForm" :model="oilPresetPrices" label-width="140px" :rules="oilPresetPricesRules">
<el-form-item label="预设油品油号" prop="numberId">
<el-select v-model="oilPresetPrices.numberId" placeholder="请选择油品名称" style="width: 100%"
@ -394,5 +394,11 @@ export default {
</template>
<style scoped lang="scss">
.card-change-box{
background: #fff;
box-sizing: border-box;
padding: 10px;
margin: 10px;
border-radius: 8px;
}
</style>

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

@ -279,7 +279,7 @@ export default {
<template>
<div>
<div class="card-change-1-search" style="margin-bottom: 20px">
<div class="card-change-box" >
<div style="display: flex; justify-content: space-between;margin-bottom: 10px">
<div style="display: flex;">
<div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
@ -329,7 +329,7 @@ export default {
</div>
<el-dialog :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-dialog center :title="title" width="26%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-form ref="form" :model="oilNumber" :rules="rules" label-width="130px" >
<el-form-item label="油品类型" prop="oilType">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
@ -410,5 +410,11 @@ export default {
</template>
<style scoped lang="scss">
.card-change-box{
background: #fff;
box-sizing: border-box;
padding: 10px;
margin: 10px;
border-radius: 8px;
}
</style>

5
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -1,8 +1,5 @@
<template>
<div class="containers
">
<div class="containers">
<oilcon></oilcon>
<addprice></addprice>
</div>

6
fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
View File

@ -134,7 +134,7 @@
</el-card>
<el-dialog title="添加" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
<el-dialog center title="添加" :visible.sync="dialogFormVisible" :close-on-click-modal="false">
<el-form ref="oilNumberF" :model="oilNumber" :rules="rules">
<el-form-item label="油品类型" prop="oilType" label-width="130px">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber),oilTypeClick2()">
@ -224,7 +224,7 @@
</div>
</el-dialog>
<el-dialog title="修改" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-dialog center title="修改" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
<el-form ref="form" :model="oilNumber" :rules="rules">
<el-form-item label="油品类型" prop="oilType">
<el-radio-group v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
@ -325,7 +325,7 @@
</div>
</el-dialog>
<el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
<el-dialog center title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
<el-form ref="priForm" :model="oilPresetPrices" label-width="100px" :rules="oilPresetPricesRules">
<el-form-item label="预设油号" prop="numberId" label-width="120px">
<el-select v-model="oilPresetPrices.numberId" placeholder="请选择油号" @change="oilTypeClickByPrice()">

4
fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
View File

@ -1,11 +1,7 @@
<script >
import OilPrice from "@/views/oilConfig/oilPrice/index.vue";
import Oilqiang from "@/views/oilConfig/oilGun/list.vue";
import OilTank from "@/views/oilConfig/oilTank/list.vue";
export default {
components: {OilTank, Oilqiang, OilPrice},
data(){

8
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -52,20 +52,18 @@
placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item style="display:flex;justify-content: end">
<el-form-item style="float: right;margin-right: 0px" >
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button
type="primary"
@click="purchaseAdd"
v-hasPermi="['oilConfig:oilPurchase:list:add']"
>新增采购
</el-button>
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 75vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables"
v-loading="loading"
:data="purchaseList"
@ -284,7 +282,7 @@ export default {
}
.el-form--inline .el-form-item {
margin-right: 44px;
margin-right: 10px;
}
</style>

2
fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
View File

@ -141,7 +141,7 @@
</div>
<!-- 添加采购油品-->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="orderForm" :rules="rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="22">

2
fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
View File

@ -82,7 +82,7 @@
</div>
<!-- 新增/修改-->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="suppliersForm" :rules="rules" label-width="100px">
<el-form-item label="供应商名称" prop="supplierName">

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

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<!-- 搜索框-->
<div class="card-change">
<div class="card-box">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="tankName">
<el-input
@ -53,7 +53,7 @@
<!-- </div>-->
<!-- 列表-->
<div style="height: 70vh;overflow: auto">
<div style="height: 72vh;overflow: auto">
<el-table ref="tables"
v-loading="loading"
:data="tankList"
@ -120,7 +120,7 @@
</div>
<!-- 新增/修改-->
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body :close-on-click-modal="false">
<el-dialog center :title="title" :visible.sync="open" width="30%" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="tankForm" :rules="rules" label-width="80px">
<el-form-item label="油罐名称" prop="tankName">
<el-input v-model="tankForm.tankName" placeholder="请输入油罐名称" />
@ -161,11 +161,6 @@
<template slot="append">{{ tankForm.unit }}</template>
</el-input>
</el-form-item>
<!-- <el-form-item label="存油总价" prop="totalPrice" >-->
<!-- <el-input v-model="tankForm.totalPrice" placeholder="请输入存油总价" style="width:300px" maxlength="30" :disabled="true" @input="changePrice()" @change="changeNumber" >-->
<!-- <template slot="append">元</template>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="折合单价" prop="discountedPrice">
<el-input v-model="tankForm.discountedPrice" placeholder="请输入折合单价" maxlength="30"
:disabled="true">
@ -173,7 +168,6 @@
</el-input>
</el-form-item>
</template>
<el-form-item label="油罐状态" prop="status">
<el-radio-group v-model="tankForm.status">
<el-radio
@ -185,17 +179,6 @@
/>
</el-radio-group>
</el-form-item>
<!-- <el-form-item label="库存统计" prop="inventoryStatistics">-->
<!-- <el-radio-group v-model="tankForm.inventoryStatistics">-->
<!-- <el-radio-->
<!-- v-for="dict in dict.type.zhzt"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- @change="handleIsopenSelect"-->
<!-- />-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="备注信息">
<el-input type="textarea" v-model="tankForm.remarks"></el-input>
</el-form-item>
@ -556,10 +539,14 @@ export default {
<style>
.app-container {
width: 100%;
height: 100vh;
background: #f6f8f9;
}
.card-box{
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
background: #fff;
}
.el-form--inline .el-form-item {
margin-right: 44px;
}

2
fuintAdmin/src/views/order/index.vue
View File

@ -108,7 +108,7 @@
</el-card>
<!-- 商品购买详情 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
<el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品数量" align="center" prop="num"/>

3
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -225,7 +225,7 @@
</el-card>
<!-- 订单详情-->
<el-dialog :close-on-click-modal="false"
<el-dialog center :close-on-click-modal="false"
title="订单详情"
:visible.sync="dialogVisible">
<div>
@ -357,6 +357,7 @@
</el-dialog>
<!-- 订单退款-->
<el-dialog
center
:close-on-click-modal="false"
title="订单退款"
width="25%"

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

@ -180,7 +180,7 @@
<!-- 订单退款-->
<el-dialog
:close-on-click-modal="false"
center
title="订单退款"
width="25%"
:visible.sync="dialogRefund">
@ -210,7 +210,7 @@
</el-dialog>
<!-- 商品购买详情 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
<el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
<el-table-column label="商品名称" align="center" prop="name"/>
<el-table-column label="商品数量" align="center" prop="num"/>

1
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -206,6 +206,7 @@
<!-- 订单退款-->
<el-dialog
center
:close-on-click-modal="false"
title="订单退款"
width="25%"

1
fuintAdmin/src/views/order/order_Ordinary.vue
View File

@ -186,6 +186,7 @@
<!-- 订单退款-->
<el-dialog :close-on-click-modal="false"
center
title="订单退款"
width="25%"
:visible.sync="dialogRefund">

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

@ -132,6 +132,7 @@
<!-- 订单退款-->
<el-dialog :close-on-click-modal="false"
center
title="订单退款"
width="25%"
:visible.sync="dialogRefund">

1
fuintAdmin/src/views/power/banner.vue
View File

@ -90,6 +90,7 @@
</div>
<el-dialog
center
@close="close()"
:title="title"
:close-on-click-modal="false"

2
fuintAdmin/src/views/power/linkManage.vue
View File

@ -75,7 +75,7 @@
</div>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="页面/功能名称" prop="pageName">

10
fuintAdmin/src/views/power/message.vue
View File

@ -213,7 +213,7 @@
@pagination="messageRecordListss"
/>
<!-- 弹出框 -->
<el-dialog :close-on-click-modal="false"
<el-dialog center :close-on-click-modal="false"
title="短信接收人"
:visible.sync="dialogVisible"
width="50%">
@ -333,7 +333,7 @@
@pagination="getMessageCostList"
/>
<el-dialog :close-on-click-modal="false"
<el-dialog center :close-on-click-modal="false"
title="短信充值记录"
:visible.sync="rechargedialogVisible"
width="50%">
@ -361,7 +361,7 @@
</div>
<!-- 短信模板添加/修改 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="95px">
<el-form-item label="短信模板ID" prop="messageId">
@ -458,7 +458,7 @@
</el-dialog>
<!-- 新增费用设置 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open2" width="30%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open2" width="30%" append-to-body>
<el-form ref="form2" :rules="rules" :model="form2" label-width="80px">
<el-form-item label="机构名称" prop="deptId">
@ -485,7 +485,7 @@
</div>
</el-dialog>
<!-- 充值 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open3" width="30%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open3" width="30%" append-to-body>
<el-form ref="form3" :rules="rules" :model="form3" label-width="80px">
<el-form-item label="机构名称" prop="deptId">

2
fuintAdmin/src/views/power/operateLog.vue
View File

@ -115,7 +115,7 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
<el-form-item label="商品名称" prop="name">

2
fuintAdmin/src/views/power/page/mode.vue
View File

@ -87,7 +87,7 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="42%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="42%" append-to-body>
<el-form :model="form" label-width="80px" >
<!-- 通知名称 -->
<el-form-item label="通知名称" :required="true">

4
fuintAdmin/src/views/power/page/record.vue
View File

@ -105,7 +105,7 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :model="form" label-width="80px">
<!-- 通知名称 -->
<el-form-item label="通知名称" :required="true">
@ -154,7 +154,7 @@
<el-button @click="userCe2">取消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
<el-table v-loading="" :data="userList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="50" align="center"/>

12
fuintAdmin/src/views/power/payment/index.vue
View File

@ -197,7 +197,7 @@
</el-table-column>
</el-table>
</div>
<el-dialog :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="26%">
<el-dialog center :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="26%">
<el-form :model="form" ref="formAdd" :rules="rules" :inline="true">
<el-form-item label="所属机构" style="margin-right: 0px" :label-width="formLabelWidth" prop="deptId">
<el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
@ -238,7 +238,7 @@
<el-button type="primary" @click="submitMerchant">确 定</el-button>
</div>
</el-dialog>
<el-dialog :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
<el-dialog center :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
<el-form :model="formRule" ref="formRule" :rules="rules">
<div style="display: flex;align-items: center">
<el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
@ -333,7 +333,7 @@
<el-button type="primary" @click="submitAddRule">确 定</el-button>
</div>
</el-dialog>
<el-dialog :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
<el-dialog center :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
<el-form :model="formRule">
<el-form-item label="开始时间" required>
<div style="display: flex;align-items: center;">
@ -352,7 +352,7 @@
</div>
</el-dialog>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
<el-form :model="form1" ref="form1" :rules="rules" label-width="100px">
<el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
<el-select
@ -382,7 +382,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
<span>请输入备注信息</span>
<el-input placeholder="请输入备注信息" style="margin-top: 20px"
v-model="merchantConfig.remark"
@ -395,7 +395,7 @@
</span>
</el-dialog>
<!-- 编辑通道规则-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogFormVisible"
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="dialogFormVisible"
width="30%">
<el-form :model="form" ref="form">
<el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">

2
fuintAdmin/src/views/refund/index.vue
View File

@ -125,7 +125,7 @@
/>
<!-- 审核对话框 start-->
<el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

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

@ -107,7 +107,7 @@
/>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
<el-dialog center :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
append-to-body >
<el-form :model="deviceInfo" :rules="rules" ref="deviceForm" label-width="95px">
@ -171,12 +171,12 @@
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="deviceInfo.remark" ></el-input>
</el-form-item>
<el-form-item>
<el-button type="" @click="handleCancel">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form>
</el-form>
<div slot="footer" class="dialog-footer" >
<el-button type="" @click="handleCancel">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</div>
</el-dialog>
</div>

2
fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
View File

@ -85,7 +85,7 @@
</el-card>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="设备名称" prop="realName">

2
fuintAdmin/src/views/staff/device/tab/printList.vue
View File

@ -110,7 +110,7 @@
</el-card>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="设备名称" prop="realName">

5
fuintAdmin/src/views/staff/list.vue
View File

@ -147,7 +147,7 @@
</div>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属机构" prop="storeId">
@ -230,6 +230,7 @@
</el-dialog>
<el-dialog :close-on-click-modal="false"
center
:title="title"
:visible.sync="dialogVisible"
style="margin-top: 100px"
@ -243,7 +244,7 @@
</span>
</el-dialog>
<el-dialog :close-on-click-modal="false" title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
<el-dialog center :close-on-click-modal="false" title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
<div class="wrap-box">
<div class="gang-box">

4
fuintAdmin/src/views/staff/tag/list.vue
View File

@ -92,7 +92,7 @@
</el-card>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-form-item label="新增二维码SN号" prop="tagCodeSn">
@ -106,7 +106,7 @@
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
<el-dialog title="新增二维码SN号" :close-on-click-modal="false" :visible.sync="open2" width="50%" append-to-body>
<el-dialog center title="新增二维码SN号" :close-on-click-modal="false" :visible.sync="open2" width="50%" append-to-body>
<el-select v-model="staffId">
<el-option

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

@ -264,7 +264,7 @@
</div>
<!-- 添加或修改提成方案对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/stock/index.vue
View File

@ -113,7 +113,7 @@
@pagination="getList"
/>
<!--编辑商品库存-->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/stock/selectGoodsDialog.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog :close-on-click-modal="false" class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
<el-dialog center :close-on-click-modal="false" class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
<el-form :model="params" ref="queryForm" class="main-search" size="small" :inline="true" label-width="100px">
<el-form-item label="商品关键字" prop="keyword">
<el-input

2
fuintAdmin/src/views/store/list.vue
View File

@ -102,7 +102,7 @@
/>
<!-- 添加或修改对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/system/account/index.vue
View File

@ -149,7 +149,7 @@
</el-row>
<!-- 添加或修改管理员配置对话框 -->
<el-dialog :title="title" :visible.sync="open" class="common-dialog" width="600px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" class="common-dialog" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/system/account/profile/userAvatar.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-dialog center :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper

2
fuintAdmin/src/views/system/config/index.vue
View File

@ -148,7 +148,7 @@
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="参数名称" prop="configName">
<el-input v-model="form.configName" placeholder="请输入参数名称" />

2
fuintAdmin/src/views/system/dict/data.vue
View File

@ -113,7 +113,7 @@
</el-card>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型">
<el-input v-model="form.dictType" :disabled="true" />

2
fuintAdmin/src/views/system/dict/index.vue
View File

@ -134,7 +134,7 @@
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
<el-dialog center :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />

2
fuintAdmin/src/views/system/logs/index.vue
View File

@ -82,7 +82,7 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
<el-dialog center title="操作日志详细" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">

2
fuintAdmin/src/views/system/menu/index.vue
View File

@ -77,7 +77,7 @@
</el-table>
<!-- 添加或修改菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="680px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">

2
fuintAdmin/src/views/system/notice/index.vue
View File

@ -123,7 +123,7 @@
/>
<!-- 添加或修改公告对话框 -->
<el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">

2
fuintAdmin/src/views/system/role/index.vue
View File

@ -107,7 +107,7 @@
/>
<!-- 添加或修改角色配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="700px" class="common-dialog" append-to-body>
<el-dialog center :title="title" :visible.sync="open" width="700px" class="common-dialog" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName" style="width: 300px" placeholder="请输入角色名称" />

2
fuintAdmin/src/views/system/role/selectUser.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 授权用户 -->
<el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-dialog center title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="用户名称" prop="userName">
<el-input

1
fuintAdmin/src/views/tool/build/CodeTypeDialog.vue
View File

@ -1,6 +1,7 @@
<template>
<div>
<el-dialog
center
v-bind="$attrs"
width="500px"
:close-on-click-modal="false"

1
fuintAdmin/src/views/tool/build/IconsDialog.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="icon-dialog">
<el-dialog
center
v-bind="$attrs"
width="980px"
:modal-append-to-body="false"

1
fuintAdmin/src/views/tool/build/TreeNodeDialog.vue
View File

@ -1,6 +1,7 @@
<template>
<div>
<el-dialog
center
v-bind="$attrs"
:close-on-click-modal="false"
:modal-append-to-body="false"

3
fuintAdmin/src/views/tool/gen/importTable.vue
View File

@ -1,9 +1,10 @@
<template>
<!-- 导入表 -->
<el-dialog :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-dialog center :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="表名称" prop="tableName">
<el-input
v-model="queryParams.tableName"
placeholder="请输入表名称"
clearable

3
fuintAdmin/src/views/tool/gen/index.vue
View File

@ -158,9 +158,10 @@
@pagination="getList"
/>
<!-- 预览界面 -->
<el-dialog :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-dialog center :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"
:label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"
:name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))"

10
fuintAdmin/src/views/userGrade/index.vue
View File

@ -140,12 +140,6 @@
</div>
<div class="cot-box" v-if="tabindex == 1">
<!-- <el-row :gutter="10" class="mb8">-->
<!-- <el-col :span="21">-->
<!-- <span style="font-size: 18px">会员等级</span>-->
<!-- <span style="font-size: 14px">（最多支持20个等级）</span>-->
<!-- </el-col>-->
<!-- </el-row>-->
<div>
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="120px">
@ -354,7 +348,7 @@
</div>
<div style="width: 100%;height: 15px "></div>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="46%" append-to-body>
<el-dialog center :title="title" :visible.sync="open" :close-on-click-modal="false" width="46%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="24">
@ -540,7 +534,7 @@
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open2" append-to-body width="42%">
<el-dialog center :title="title" :visible.sync="open2" append-to-body width="42%">
<el-form ref="form2" :model="form2" :rules="rules" label-width="120px">
<el-form-item label="会员等级" prop="gradeId">

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
View File

@ -116,6 +116,20 @@ public class CardValueController extends BaseController {
public ResponseObject selectById(@PathVariable Serializable id) {
return getSuccessResult(this.cardValueService.getOneById(id));
}
/**
*
* 查询储值卡活动 以及优惠券子表
*/
@GetMapping("/cardValueAndRecordList")
public ResponseObject cardValueAndRecordList(CardValue cardValue) {
//获取当前登录用户
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
cardValue.setStoreId(nowAccountInfo.getStoreId());
return getSuccessResult(this.cardValueService.cardValueAndRecordList(cardValue));
}
/**
* 获取使用时的详细信息
*

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueMapper.java
View File

@ -2,6 +2,11 @@ package com.fuint.business.marketingActivity.cardValue.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.vo.CardValueVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 储值卡表(CardValue)表数据库访问层
@ -9,7 +14,11 @@ import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
* @author makejava
* @since 2023-10-31 09:41:57
*/
@Mapper
public interface CardValueMapper extends BaseMapper<CardValue> {
List<CardValueVO> cardValueList(@Param("obj") CardValue cardValue);
}

125
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueMapper.xml Normal file
View File

@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuint.business.marketingActivity.cardValue.mapper.CardValueMapper">
<!-- 嵌套结果映射 -->
<resultMap id="CardValueResultMap" type="com.fuint.business.marketingActivity.cardValue.vo.CardValueVO">
<id property="id" column="cv_id"/>
<result property="chainStoreId" column="cv_chain_store_id"/>
<result property="storeId" column="cv_store_id"/>
<result property="status" column="cv_status"/>
<result property="isonline" column="cv_isonline"/>
<result property="bidBalance" column="cv_bid_balance"/>
<result property="rechargeBalance" column="cv_recharge_balance"/>
<result property="giftBalance" column="cv_gift_balance"/>
<result property="points" column="cv_points"/>
<result property="growthValue" column="cv_growth_value"/>
<result property="refuelMoney" column="cv_refuel_money"/>
<result property="fringeBenefit" column="cv_fringe_benefit"/>
<result property="participationNo" column="cv_participation_no"/>
<result property="employeeCommission" column="cv_employee_commission"/>
<result property="royaltyType" column="cv_royalty_type"/>
<result property="amountCommission" column="cv_amount_commission"/>
<result property="percentageCommissions" column="cv_percentage_commissions"/>
<result property="activeTime" column="cv_active_time"/>
<result property="activityProgress" column="cv_activity_progress"/>
<result property="startTime" column="cv_start_time"/>
<result property="endTime" column="cv_end_time"/>
<result property="activeStatus" column="cv_active_status"/>
<result property="paymentValue" column="cv_payment_value"/>
<result property="groupOriented" column="cv_group_oriented"/>
<!-- <result property="membershipLevel" column="cv_membership_level"/>-->
<result property="sort" column="cv_sort"/>
<result property="createBy" column="cv_create_by"/>
<result property="createTime" column="cv_create_time"/>
<result property="updateBy" column="cv_update_by"/>
<result property="updateTime" column="cv_update_time"/>
<result property="activeName" column="cv_active_name"/>
<collection property="cardValueChildList" ofType="com.fuint.business.marketingActivity.cardValue.entity.CardValueChild">
<id property="id" column="cc_id"/>
<result property="cardValueId" column="cc_card_value_id"/>
<result property="vouchersId" column="cc_vouchers_id"/>
<result property="activeGift" column="cc_active_gift"/>
<result property="giftCardName" column="cc_gift_card_name"/>
<result property="giftCardType" column="cc_gift_card_type"/>
<result property="giftCardDetail" column="cc_gift_card_detail"/>
<result property="giftCardTime" column="cc_gift_card_time"/>
<result property="giftCardTotal" column="cc_gift_card_total"/>
<result property="validityZero" column="cc_validity_zero"/>
<result property="validityOne" column="cc_validity_one"/>
<result property="validityTwo" column="cc_validity_two"/>
<result property="createBy" column="cc_create_by"/>
<result property="instruction" column="cc_instruction"/>
<result property="createTime" column="cc_create_time"/>
<result property="updateBy" column="cc_update_by"/>
<result property="updateTime" column="cc_update_time"/>
<result property="timeType" column="cc_time_type"/>
</collection>
</resultMap>
<select id="cardValueList" resultMap="CardValueResultMap">
SELECT
cv.id AS cv_id,
cv.chain_store_id AS cv_chain_store_id,
cv.store_id AS cv_store_id,
cv.status AS cv_status,
cv.isonline AS cv_isonline,
cv.bid_balance AS cv_bid_balance,
cv.recharge_balance AS cv_recharge_balance,
cv.gift_balance AS cv_gift_balance,
cv.points AS cv_points,
cv.growth_value AS cv_growth_value,
cv.refuel_money AS cv_refuel_money,
cv.fringe_benefit AS cv_fringe_benefit,
cv.participation_no AS cv_participation_no,
cv.employee_commission AS cv_employee_commission,
cv.royalty_type AS cv_royalty_type,
cv.amount_commission AS cv_amount_commission,
cv.percentage_commissions AS cv_percentage_commissions,
cv.active_time AS cv_active_time,
cv.activity_progress AS cv_activity_progress,
cv.start_time AS cv_start_time,
cv.end_time AS cv_end_time,
cv.active_status AS cv_active_status,
cv.payment_value AS cv_payment_value,
cv.group_oriented AS cv_group_oriented,
cv.membership_level AS cv_membership_level,
cv.sort AS cv_sort,
cv.create_by AS cv_create_by,
cv.create_time AS cv_create_time,
cv.update_by AS cv_update_by,
cv.update_time AS cv_update_time,
cv.active_name AS cv_active_name,
cc.id AS cc_id,
cc.card_value_id AS cc_card_value_id,
cc.vouchers_id AS cc_vouchers_id,
cc.active_gift AS cc_active_gift,
cc.gift_card_name AS cc_gift_card_name,
cc.gift_card_type AS cc_gift_card_type,
cc.gift_card_detail AS cc_gift_card_detail,
cc.gift_card_time AS cc_gift_card_time,
cc.gift_card_total AS cc_gift_card_total,
cc.validity_zero AS cc_validity_zero,
cc.validity_one AS cc_validity_one,
cc.validity_two AS cc_validity_two,
cc.create_by AS cc_create_by,
cc.instruction AS cc_instruction,
cc.create_time AS cc_create_time,
cc.update_by AS cc_update_by,
cc.update_time AS cc_update_time,
cc.time_type AS cc_time_type
FROM
card_value cv
LEFT JOIN
card_value_child cc ON cv.id = cc.card_value_id
where
(cv.active_time = '1' and cv.store_id = #{obj.storeId} and cv.active_status = '1')
or
(cv.active_time = '2' and cv.store_id = #{obj.storeId} and cv.active_status = '1' and CURRENT_TIMESTAMP BETWEEN cv.start_time AND cv.end_time )
</select>
</mapper>

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
View File

@ -46,6 +46,9 @@ public interface CardValueService extends IService<CardValue> {
CardValueVO getOneById(Serializable id);
List<CardCoupon> getCoupons(Integer userId,Integer cardValueId);
List<CardValueVO> cardValueAndRecordList(CardValue cardValue);
/**
* 新增数据
* @param cardValueDTO

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
View File

@ -331,6 +331,13 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
}
@Override
public List<CardValueVO> cardValueAndRecordList(CardValue cardValue) {
List<CardValueVO> cardValues = super.baseMapper.cardValueList(cardValue);
return cardValues;
}
/**
* 新增数据
* @param cardValueDTO

4
fuintCashierWeb/src/api/newHome/newHome.js
View File

@ -29,10 +29,10 @@ export function cashRegisterGoodsList() {
method: 'get',
})
}
// 查询储值卡活动 以及优惠券子表
export function cardValueList() {
return request({
url: '/business/marketingActivity/cardValue/cardValueList',
url: '/business/marketingActivity/cardValue/cardValueAndRecordList',
method: 'get',
})
}

60
fuintCashierWeb/src/views/cashier/NewComponents/newHomeComponents/memberRecharge.vue
View File

@ -119,14 +119,16 @@ export default {
oilNumberId:null
},
this.selectCard.cardType = index
this.getCardValueList()
//切换 电子储值卡 囤油卡 礼品卡 初始化
this.getCardValueList()
},
chooseActive(data){
data.cardType = this.selectCard.cardType
this.selectCard = data
this.selectCard.cardCouponList = []
this.selectCard.cardCouponList = data.cardCouponList
},
//切换初始化
getCardValueList(){
let that = this
cardValueList().then(res=>{
@ -154,7 +156,7 @@ export default {
<template>
<div>
<div class="top-dd">
<div class="tab-dv" v-for="(item,index) in tabList" :key="index" :class="{ 'active':selectCard.cardType==item.num}" @click="selectTab(item.num)" >
<div class="tab-dv" v-for="(item,index) in tabList" :key="index" :class="{ 'active':selectCard.cardType==item.num}" @click="selectTab(item.num)" >
{{item.name}}
</div>
</div>
@ -163,37 +165,12 @@ export default {
<el-form-item label="充值金额" prop="price" style="margin-bottom: 10px" >
</el-form-item>
<div class="d-s">
<div class="k_kang" v-for="(item,index) in cardList" :key="index" @click="chooseActive(item)" >
{{item.activeName}}
<img src="../imgs/r-j.png" class="p-img" v-if="selectCard.id == item.id" >
</div>
</div>
<el-form-item label="充值本金" prop="region" >
<el-input v-model="selectCard.rechargeBalance" style="width: 330px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<div style="display: flex">
<el-form-item label="赠送金额" prop="text">
<el-input v-model="selectCard.giftBalance" style="width: 150px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="赠送积分" prop="text">
<el-input v-model="selectCard.points" style="width: 150px">
<template slot="append">积分</template>
</el-input>
</el-form-item>
<el-form-item label="赠送成长值" prop="text">
<el-input v-model="selectCard.growthValue" style="width: 150px">
<template slot="append">成长值</template>
</el-input>
</el-form-item>
</div>
<!-- 选择优惠券-->
<div class="xh-box" v-if="selectCard.cardCouponList.length>0">
<div class="xh-box" >
<div style="margin: 10px 0px;width: 800px;margin-left: 25px">
<el-table
:data="selectCard.cardCouponList"
@ -235,9 +212,32 @@ export default {
width="240">
</el-table-column>
</el-table>
</div>
</div>
<el-form-item label="充值本金" prop="region" >
<el-input v-model="selectCard.rechargeBalance" style="width: 330px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<div style="display: flex">
<el-form-item label="赠送金额" prop="text">
<el-input v-model="selectCard.giftBalance" style="width: 150px">
<template slot="append">元</template>
</el-input>
</el-form-item>
<el-form-item label="赠送积分" prop="text">
<el-input v-model="selectCard.points" style="width: 150px">
<template slot="append">积分</template>
</el-input>
</el-form-item>
<el-form-item label="赠送成长值" prop="text">
<el-input v-model="selectCard.growthValue" style="width: 150px">
<template slot="append">成长值</template>
</el-input>
</el-form-item>
</div>
<el-form-item label="提成员工" prop="region" >
<el-select filterable v-model="selectCard.chooseStaff" placeholder="请选择提成员工" style="width: 330px">
<el-option v-for="data in staffList" :label="data.realName" :value="data.id"></el-option>