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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhaohengkun 2024-10-31 14:45:03 +08:00
commit 807e73cf02
13 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -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="请输入油罐名称" />

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

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

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