Merge remote-tracking branch 'origin/main'

This commit is contained in:
zhaohengkun 2024-10-31 10:02:39 +08:00
commit 31a8ed0e21
70 changed files with 126 additions and 132 deletions

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">

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">

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>

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">

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">

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>

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" />

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>

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">

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">

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">

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"/>

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">

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="请输入角色名称"/>

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">

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>

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"/>

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>

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">

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">

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">

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>

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>

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">

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">

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>

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">

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">

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"
@ -99,12 +100,11 @@
<el-dialog
: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 +117,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 +146,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 +170,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">
请确保输入的集线器正确的枪号否则出现设备显示屏与一件加油页面显示数据不一致例如00010002···
</div>
</el-form-item>
@ -182,11 +179,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>

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"

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(){

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>

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"
@ -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;
}

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"/>

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%"

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"/>

View File

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

View File

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

View File

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

View File

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

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">

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">

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">

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">

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"/>

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">

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">

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">

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">

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">

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">

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

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">

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

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">

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">

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

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="请输入参数名称" />

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" />

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="请输入字典名称" />

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">

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">

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">

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="请输入角色名称" />

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

View File

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

View File

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

View File

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

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

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'))"