From 37932ba640c59f103ea0f9b987251b9766de73c4 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Mon, 24 Apr 2023 17:22:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/driver/user/SysCustomerInfoList.vue             | 4 ++--
 src/views/driver/vehicle/OilVehicleOwnerAdd.vue           | 2 +-
 src/views/driver/vehicle/OilVehicleOwnerList.vue          | 4 ++--
 src/views/driver/vehicle/OilVehicleOwnerUpdate.vue        | 2 +-
 src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue | 4 ++--
 .../oilCompanyMatchRecord/OilCompanyMatchRecordList.vue   | 4 ++--
 .../OilCompanyOrderMatchTaskList.vue                      | 4 ++--
 src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue  | 8 ++++----
 src/views/system/auth/sysUser/SysCustomerInfoList.vue     | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/driver/user/SysCustomerInfoList.vue b/src/views/driver/user/SysCustomerInfoList.vue
index 509aae1..f64c5e4 100644
--- a/src/views/driver/user/SysCustomerInfoList.vue
+++ b/src/views/driver/user/SysCustomerInfoList.vue
@@ -623,8 +623,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
diff --git a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
index b1a4501..e769f1a 100644
--- a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
@@ -136,7 +136,7 @@
             <el-col />
           </el-row> -->
         </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;">
           <el-button @click="close">取消</el-button>
           <el-button type="primary" @click="submit">提交</el-button>
         </el-col>
diff --git a/src/views/driver/vehicle/OilVehicleOwnerList.vue b/src/views/driver/vehicle/OilVehicleOwnerList.vue
index e7dd40d..894b4e1 100644
--- a/src/views/driver/vehicle/OilVehicleOwnerList.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerList.vue
@@ -669,8 +669,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
diff --git a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
index c3be845..9e5788b 100644
--- a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
@@ -136,7 +136,7 @@
             <el-col />
           </el-row> -->
         </el-card>
-        <el-col :span="24" style="text-align: right">
+        <el-col :span="24" style="text-align: right;padding: 20px;;">
           <el-button @click="close">取消</el-button>
           <el-button type="primary" @click="submit">提交</el-button>
         </el-col>
diff --git a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
index 30ee8f3..e6c23f4 100644
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
@@ -750,8 +750,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
diff --git a/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue b/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
index 391c61e..511edf3 100644
--- a/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
+++ b/src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
@@ -588,8 +588,8 @@ export default {
 }
 
 .table-div>>>.header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
diff --git a/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue b/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
index 861a497..32b9003 100644
--- a/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
+++ b/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
@@ -772,8 +772,8 @@ export default {
 }
 
 .table-div>>>.header-container {
-  position: sticky;
-  top: 0rem;
+  /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
diff --git a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
index 4cadd24..bf466ba 100644
--- a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
+++ b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
@@ -37,7 +37,7 @@
               </el-select>
             </el-form-item> -->
             <!-- <el-form-item>
-            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" /> 
+            <el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" />
               <el-select v-model="page.params.enableMark" filterable clearable placeholder="油品启用标识">
                 <el-option value="1" label="油品启用" />
                 <el-option value="0" label="油品禁用" />
@@ -91,7 +91,7 @@
             <el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon
                 icon-class="iconiconfonticon02" /> 快速调价任务</el-button>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="8">
             <el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="search">查询</el-button>
             <el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="
               page.params = {}
@@ -162,7 +162,7 @@
       <el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
         <el-table :data="historyData" style="width: 100%">
           <el-table-column prop="createTime" label="创建时间" />
-          
+
           <el-table-column prop="name" label="基础个人价">
             <template slot-scope="scope">
               <div>
@@ -292,7 +292,7 @@ export default {
                 return ('禁用');
                }
             }
-          }, 
+          },
             {
               label: '基础个人价',
               value: 'personalPriceBase'
diff --git a/src/views/system/auth/sysUser/SysCustomerInfoList.vue b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
index 25adf25..fc85f97 100644
--- a/src/views/system/auth/sysUser/SysCustomerInfoList.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
@@ -703,8 +703,8 @@ export default {
   margin-bottom: 20px;
 }
 .table-div >>> .header-container {
-  position: sticky;
-  top: 0rem;
+ /* position: sticky;
+  top: 0rem; */
   min-height: 152px;
   z-index: 4;
   background: #fff;
-- 
2.36.2


From 08890f25ac057fb6bf5733fc75de656f3c58335d Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Tue, 25 Apr 2023 17:32:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/driver/user/SysCustomerInfoAdd.vue  |  2 +-
 src/views/driver/user/SysCustomerInfoList.vue | 43 +++++++++--------
 .../driver/user/SysCustomerInfoUpdate.vue     |  2 +-
 .../driver/vehicle/OilVehicleOwnerAdd.vue     |  2 +-
 .../driver/vehicle/OilVehicleOwnerUpdate.vue  |  2 +-
 .../oilCompanyMatch/OilCompanyMatchAdd.vue    |  2 +-
 .../oilCompanyMatch/OilCompanyMatchList.vue   | 28 ++++++-----
 .../oilCompanyMatch/OilCompanyMatchUpdate.vue |  2 +-
 .../finance/openTicket/openTicketList.vue     |  2 +-
 .../oilSiteOilsPrice/OilSiteOilsPriceList.vue | 11 +++--
 .../auth/sysUser/SysCustomerInfoAdd.vue       |  2 +-
 .../auth/sysUser/SysCustomerInfoList.vue      | 47 ++++++++++---------
 .../auth/sysUser/SysCustomerInfoUpdate.vue    |  2 +-
 13 files changed, 81 insertions(+), 66 deletions(-)

diff --git a/src/views/driver/user/SysCustomerInfoAdd.vue b/src/views/driver/user/SysCustomerInfoAdd.vue
index f758a80..4f39a94 100644
--- a/src/views/driver/user/SysCustomerInfoAdd.vue
+++ b/src/views/driver/user/SysCustomerInfoAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form
         ref="form"
diff --git a/src/views/driver/user/SysCustomerInfoList.vue b/src/views/driver/user/SysCustomerInfoList.vue
index f64c5e4..1f7aa40 100644
--- a/src/views/driver/user/SysCustomerInfoList.vue
+++ b/src/views/driver/user/SysCustomerInfoList.vue
@@ -171,14 +171,15 @@
         </div>
       </ListLayout>
 
-      <!-- 修改密码弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 修改密码抽屉 -->
+      <el-drawer
         title="修改密码"
+        class="table-detail-drawer"
         :visible.sync="updatePwdDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
+      <div style="padding: 20px;">
         <el-form
           ref="form"
           :model="updatePwd"
@@ -193,18 +194,20 @@
           <el-button @click="updatePwdDialog = false;">取消</el-button>
           <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
         </div>
-      </el-dialog>
+      </div>>
+      </el-drawer>
 
-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 添加抽屉 -->
+      <el-drawer
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>
+     
 
       <!-- 导出弹窗 -->
       <el-dialog
@@ -232,20 +235,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
-      <el-dialog
-        destroy-on-close
+      <!-- 修改抽屉 -->
+      <el-drawer
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="55%"
       >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
           v-if="updateDialog"
           :sys-customer-info="sysCustomerInfo"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+   
 
       <!-- 详情抽屉 -->
       <el-drawer
diff --git a/src/views/driver/user/SysCustomerInfoUpdate.vue b/src/views/driver/user/SysCustomerInfoUpdate.vue
index 58c72be..caa9c57 100644
--- a/src/views/driver/user/SysCustomerInfoUpdate.vue
+++ b/src/views/driver/user/SysCustomerInfoUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form
         ref="form"
diff --git a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
index e769f1a..b647fa8 100644
--- a/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerAdd.vue
@@ -6,7 +6,7 @@
         label-width="100px"
         :size="$store.getters.size"
       >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin:  0 20px;">
           <div slot="header" class="clearfix">
             <span>车辆基础信息</span>
           </div>
diff --git a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
index 9e5788b..0c019c4 100644
--- a/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
+++ b/src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
@@ -6,7 +6,7 @@
         label-width="100px"
         :size="$store.getters.size"
       >
-        <el-card class="box-card">
+        <el-card class="box-card" style="margin: 0 20px;">
           <div slot="header" class="clearfix">
             <span>车辆基础信息</span>
           </div>
diff --git a/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue b/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
index 3485638..3d99434 100644
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form :model="oilCompanyMatch" label-width="140px" :rules="ruleForm" ref="ruleForm" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">
diff --git a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
index e6c23f4..9416de5 100644
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
@@ -178,15 +178,17 @@
         </div>
       </ListLayout>
 
-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
+      <!-- 添加抽屉 -->
+      <el-drawer
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
       >
-        <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>
+    
 
       <!-- 导出弹窗 -->
       <el-dialog
@@ -214,20 +216,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
+      <!-- 修改抽屉 -->
+      <el-drawer
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="60%"
       >
-        <OilCompanyMatchUpdate
+      <OilCompanyMatchUpdate
           v-if="updateDialog"
           :oil-company-match="oilCompanyMatch"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+
 
       <!-- 详情抽屉 -->
       <el-drawer
diff --git a/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue b/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
index 5d8b41d..6850b36 100644
--- a/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
+++ b/src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form :model="oilCompanyMatch" :rules="ruleForm" ref="ruleForm" label-width="140px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">
diff --git a/src/views/finance/openTicket/openTicketList.vue b/src/views/finance/openTicket/openTicketList.vue
index 9e8e65d..6219a22 100644
--- a/src/views/finance/openTicket/openTicketList.vue
+++ b/src/views/finance/openTicket/openTicketList.vue
@@ -80,7 +80,7 @@
 
                   <el-col :span="9">
                     <el-form-item>
-                      <gl-date-time-picker v-model="page.params.createTime" style="width: 131%" msg="创建时间"
+                      <gl-date-time-picker v-model="page.params.createTime" style="width: 134%" msg="创建时间"
                         @keyup.enter.native="getByPage" />
                     </el-form-item>
                   </el-col>
diff --git a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
index bf466ba..ba29371 100644
--- a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
+++ b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
@@ -158,9 +158,10 @@
           <!-- 分页组件结束 -->
         </div>
       </ListLayout>
-      <!-- 历史记录弹窗 -->
-      <el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
-        <el-table :data="historyData" style="width: 100%">
+      <!-- 历史记录抽屉 -->
+      <el-drawer :withHeader="false" title="变更历史" :visible.sync="showHistory" direction="ltr" size="55%">
+       <div style="padding: 20px;">
+        <el-table :data="historyData" style="width: 100%" border>
           <el-table-column prop="createTime" label="创建时间" />
 
           <el-table-column prop="name" label="基础个人价">
@@ -196,7 +197,9 @@
               </template>
           </el-table-column>
         </el-table>
-      </el-dialog>
+       </div>
+      </el-drawer>
+
       <!-- 导出弹窗 -->
       <el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
         <OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"
diff --git a/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue b/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
index 41ba625..b6875d4 100644
--- a/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">
diff --git a/src/views/system/auth/sysUser/SysCustomerInfoList.vue b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
index fc85f97..263498c 100644
--- a/src/views/system/auth/sysUser/SysCustomerInfoList.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoList.vue
@@ -212,16 +212,15 @@
         </div>
       </ListLayout>
 
-      <!-- 修改密码弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      <!-- 修改密码抽屉 -->
+      <el-drawer
         title="修改密码"
+        class="table-detail-drawer"
         :visible.sync="updatePwdDialog"
-        @closeDialog="closeDialog"
-        width="55%"
-        :before-close="handleClose"
+        direction="ltr"
+        size="50%"
       >
+      <div style="padding: 20px;">
         <el-form
           ref="form"
           :model="updatePwd"
@@ -236,18 +235,20 @@
           <el-button @click="handleClose">取消</el-button>
           <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
         </div>
-      </el-dialog>
-
-      <!-- 添加弹窗 -->
-      <el-dialog
-        v-el-drag-dialog
-        destroy-on-close
+      </div>
+      
+      </el-drawer>
+     
+      <!-- 添加抽屉 -->
+      <el-drawer
         title="添加"
+        class="table-detail-drawer"
         :visible.sync="addDialog"
-        width="55%"
+        direction="ltr"
+        size="50%"
       >
-        <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
-      </el-dialog>
+      <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
+      </el-drawer>
 
       <!-- 登录授权弹窗 -->
       <el-dialog
@@ -290,20 +291,22 @@
         />
       </el-dialog>
 
-      <!-- 修改弹窗 -->
-      <el-dialog
-        destroy-on-close
+      <!-- 修改抽屉 -->
+      <el-drawer
         title="修改"
+        class="table-detail-drawer"
         :visible.sync="updateDialog"
-        width="55%"
+        direction="ltr"
+        size="50%"
       >
-        <SysCustomerInfoUpdate
+      <SysCustomerInfoUpdate
           v-if="updateDialog"
           :sys-customer-info="sysCustomerInfo"
           @getByPage="getByPage"
           @closeDialog="closeDialog"
         />
-      </el-dialog>
+      </el-drawer>
+    
 
       <!-- 详情抽屉 -->
       <el-drawer
diff --git a/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue b/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
index 19ec144..b244460 100644
--- a/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
+++ b/src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="padding: 20px;">
     <el-row>
       <el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
         <el-row :gutter="gridNum.row.gutter">
-- 
2.36.2