From 43e138fce2a0c88360d54eea5bd90013518079b7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 31 Oct 2024 10:46:02 +0800
Subject: [PATCH 1/2] 10.31

---
 fuintAdmin/src/views/oilConfig/oilGun/list.vue         |  1 +
 fuintAdmin/src/views/oilConfig/oilGun/list1.vue        |  1 +
 fuintAdmin/src/views/oilConfig/oilInventory/order.vue  |  2 +-
 .../src/views/oilConfig/oilPrice/comp/addprice.vue     |  2 +-
 .../src/views/oilConfig/oilPrice/comp/oilcon.vue       |  2 +-
 fuintAdmin/src/views/oilConfig/oilPrice/index1.vue     |  6 +++---
 .../src/views/oilConfig/oilPurchase/purchaseOrder.vue  |  2 +-
 fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue   |  2 +-
 fuintAdmin/src/views/oilConfig/oilTank/list.vue        |  2 +-
 fuintAdmin/src/views/setting/print/index.vue           | 10 +++++-----
 .../src/views/staffCommission/staffCommission.vue      |  2 +-
 fuintAdmin/src/views/userGrade/index.vue               | 10 ++--------
 12 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index d92646d66..773ac16fa 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -98,6 +98,7 @@
       />
     </div>
     <el-dialog
+      center
       :title="title"
       :visible.sync="dialogVisible"
       width="25%"
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list1.vue b/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
index 9c7e872ae..abd060b36 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list1.vue
@@ -42,6 +42,7 @@
         </div>
       </div>
       <el-dialog
+        center
         :title="title"
         :visible.sync="dialogVisible"
         width="30%"
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
index b67b60cd2..e30afe531 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/order.vue
@@ -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">
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
index 41b23d1b1..fecb93a75 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@@ -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%"
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
index 4f9110cdf..7bb1a96b6 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@@ -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()">
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
index 9a9b0d0d7..ab918f7b5 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index1.vue
@@ -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()">
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
index 373dd2ddb..806864ac3 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
@@ -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">
diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
index 274716420..62b1fa655 100644
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@@ -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">
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index bf66d9bf8..7d7bbbda7 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -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="请输入油罐名称" />
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index 626134896..ed6b854ed 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -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>
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index 5ff479a6e..8e491f160 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -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">
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index ec5f56c58..1a2d274f0 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -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">

From d1fb34d38a6e704efa5bef54b59bd721bbf31b22 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 31 Oct 2024 11:08:32 +0800
Subject: [PATCH 2/2] 10.31

---
 .../src/views/oilConfig/oilPrice/comp/addprice.vue     | 10 ++++++++--
 .../src/views/oilConfig/oilPrice/comp/oilcon.vue       | 10 ++++++++--
 fuintAdmin/src/views/oilConfig/oilPrice/index.vue      |  5 +----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
index fecb93a75..14f20573d 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@@ -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>
@@ -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>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
index 7bb1a96b6..192a23410 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@@ -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>
@@ -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>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
index b91221be6..38c689030 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
@@ -1,8 +1,5 @@
 <template>
-  <div class="containers
-
-">
-
+  <div class="containers">
     <oilcon></oilcon>
     <addprice></addprice>
    </div>