From 6d62e856b5b858b9d7785a81c11a94f906cd0e15 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 5 Jul 2024 15:54:52 +0800
Subject: [PATCH] no message

---
 .../activeConsumption/index.vue               |  8 ++--
 .../views/convenienceStore/damage/index.vue   | 18 +++----
 .../src/views/convenienceStore/goodsFile.vue  | 38 +++++++--------
 .../src/views/convenienceStore/index.vue      | 14 ++++--
 .../convenienceStore/inventory/index.vue      | 12 ++---
 .../views/convenienceStore/purchase/index.vue | 14 +++---
 .../views/convenienceStore/returns/index.vue  | 16 +++----
 .../views/convenienceStore/saleStatistic.vue  | 24 ++++++----
 .../views/convenienceStore/stockStatistic.vue | 47 ++++++++++---------
 .../src/views/convenienceStore/supplier.vue   | 14 +++---
 fuintAdmin/src/views/duty/index.vue           | 14 ++++--
 fuintAdmin/src/views/integral/gift/index.vue  |  8 ++--
 .../src/views/integral/giftCategory/index.vue | 14 +++---
 .../views/integral/order/pointsCashier.vue    | 14 +++---
 .../src/views/integral/order/pointsMall.vue   | 18 ++++---
 fuintAdmin/src/views/member/fixingLevel.vue   | 24 ++++++----
 .../src/views/oilConfig/oilInventory/list.vue | 14 ++++--
 .../src/views/oilConfig/oilPurchase/list.vue  | 18 ++++---
 .../views/oilConfig/oilStatistics/list.vue    | 18 ++++---
 .../src/views/oilConfig/oilSuppliers/list.vue | 18 ++++---
 .../src/views/oilConfig/oilTank/list.vue      | 10 ++--
 .../views/staffCommission/staffCommission.vue |  2 +-
 22 files changed, 204 insertions(+), 173 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 908013d54..40d91df61 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -3,10 +3,10 @@
     <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 
-      <el-form-item label="活动名称" prop="name">
+      <el-form-item label="" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入活动名称"
+          placeholder="活动名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,13 +17,13 @@
 <!--          <el-option label="禁用" value="1"></el-option>-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-form-item label="上线/下线">
+      <el-form-item label="">
         <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线">
           <el-option label="上线" value="0"></el-option>
           <el-option label="已下线" value="1"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="float: right">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 
       </el-form-item>
diff --git a/fuintAdmin/src/views/convenienceStore/damage/index.vue b/fuintAdmin/src/views/convenienceStore/damage/index.vue
index 7b334820b..a67598385 100644
--- a/fuintAdmin/src/views/convenienceStore/damage/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/damage/index.vue
@@ -2,21 +2,21 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="业务单号" prop="orderNumber">
-          <el-input v-model="queryParams.orderNumber" placeholder="请输入业务单号" />
+        <el-form-item label="" prop="orderNumber">
+          <el-input v-model="queryParams.orderNumber" placeholder="业务单号" />
         </el-form-item>
-        <el-form-item label="供应商" v-model="queryParams.supplierId" prop="status">
+        <el-form-item label="" v-model="queryParams.supplierId" prop="status">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="全部"
+            placeholder="供应商"
             clearable
-            style="width: 230px"
+            style=""
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px" clearable>
+        <el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
+          <el-select v-model="queryParams.approvalStatus" placeholder="状态" style="" clearable>
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"
@@ -35,7 +35,7 @@
             </el-date-picker>
         </el-form-item> -->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -173,7 +173,7 @@ export default {
         name: 'damage-details'
       });
     },
-  
+
 
     // 处理单据
     dispose(data) {
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index 9aec279f9..c1d9443fd 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -6,12 +6,11 @@
           <el-tab-pane label="商品档案" name="goods"></el-tab-pane>
           <el-tab-pane label="商品回收站" name="recovery"></el-tab-pane>
         </el-tabs>
-        <el-form-item label="商品分类" prop="cvsGoodId">
+        <el-form-item label="" prop="cvsGoodId">
           <el-select
             v-model="queryParams.cvsGoodId"
-            placeholder="全部"
+            placeholder="商品分类"
             clearable
-            style="width: 300px"
           >
             <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
@@ -20,58 +19,53 @@
 <!--                       :props="{ checkStrictly: true }"-->
 <!--                       clearable></el-cascader>-->
         </el-form-item>
-        <el-form-item label="供应商" prop="supplierId">
+        <el-form-item label="" prop="supplierId">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="全部"
+            placeholder="供应商"
             clearable
-            style="width: 300px"
+            style=""
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品名称" prop="name">
+        <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入商品名称"
+            placeholder="商品名称"
             clearable
-            style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="拼音码" prop="pinyinCode">
+        <el-form-item label="" prop="pinyinCode">
           <el-input
             v-model="queryParams.pinyinCode"
-            placeholder="请输入拼音码"
+            placeholder="拼音码"
             clearable
-            style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="条形码" prop="goodsNo">
+        <el-form-item label="" prop="goodsNo">
           <el-input
             v-model="queryParams.goodsNo"
-            placeholder="请输入商品条形码"
+            placeholder="条形码"
             clearable
-            style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="货架号" prop="shelfNumber">
+        <el-form-item label="" prop="shelfNumber">
           <el-input
             v-model="queryParams.shelfNumber"
-            placeholder="请输入商品所在货架号"
+            placeholder="货架号"
             clearable
-            style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="上架状态" prop="status">
+        <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="全部"
+            placeholder="上架状态"
             clearable
-            style="width: 240px"
           >
 <!--            <el-option-->
 <!--              v-for="dict in dict.type.zhzt"-->
@@ -83,7 +77,7 @@
             <el-option label="下架" value="jy"/>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue
index be90376b1..95c81d335 100644
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@@ -3,11 +3,11 @@
     <el-card style="margin-top: 20px;">
         <!-- 查询类别 -->
       <el-form :inline="true" :model="queryParams">
-            <el-form-item label="品类名称" prop="name">
-                <el-input v-model="queryParams.name" placeholder="请输入品类名称" clearable  @keyup.enter.native="handleQuery"></el-input>
+            <el-form-item label="" prop="name">
+                <el-input v-model="queryParams.name" placeholder="品类名称" clearable  @keyup.enter.native="handleQuery"></el-input>
             </el-form-item>
-            <el-form-item label="状态">
-                <el-select v-model="queryParams.status" placeholder="请选择品类状态" clearable >
+            <el-form-item label="">
+                <el-select v-model="queryParams.status" placeholder="状态" clearable >
                     <el-option
                     v-for="dict in dict.type.zhzt"
                     :key="dict.value"
@@ -19,7 +19,7 @@
 <!--                <el-button type="primary" icon="el-icon-search" @click="onQuery">搜索</el-button>-->
 <!--                <el-button @click="resetForm" icon="el-icon-refresh" >重置</el-button>-->
 <!--            </el-form-item>-->
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         </el-form-item>
       </el-form>
@@ -812,4 +812,8 @@ export default {
     height: 100%;
     background: #f6f8f9;
   }
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
+
 </style>
diff --git a/fuintAdmin/src/views/convenienceStore/inventory/index.vue b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
index df97be688..34d88610c 100644
--- a/fuintAdmin/src/views/convenienceStore/inventory/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/inventory/index.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="盘点批次号" prop="orderNumber">
-          <el-input v-model="queryParams.orderNumber" placeholder="请输入盘点批次号" />
+        <el-form-item label="" prop="orderNumber">
+          <el-input v-model="queryParams.orderNumber" placeholder="盘点批次号" />
         </el-form-item>
-        <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px" clearable>
+        <el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
+          <el-select v-model="queryParams.approvalStatus" placeholder="状态" style="" clearable>
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"
@@ -25,7 +25,7 @@
             </el-date-picker>
         </el-form-item> -->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -49,7 +49,7 @@
                 :data="inventoryList"
                 :default-sort="defaultSort">
         <el-table-column label="盘点批次" align="center" prop="orderNumber">
-          
+
         </el-table-column>
         <el-table-column label="盘点数量" align="center" prop="inventoryQuantity">
           <template slot-scope="scope">
diff --git a/fuintAdmin/src/views/convenienceStore/purchase/index.vue b/fuintAdmin/src/views/convenienceStore/purchase/index.vue
index 8af1d8cff..3be9080e4 100644
--- a/fuintAdmin/src/views/convenienceStore/purchase/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/index.vue
@@ -2,21 +2,21 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="业务单号" prop="orderNumber">
-          <el-input v-model="queryParams.orderNumber" placeholder="请输入业务单号" />
+        <el-form-item label="" prop="orderNumber">
+          <el-input v-model="queryParams.orderNumber" placeholder="业务单号" />
         </el-form-item>
-        <el-form-item label="供应商" v-model="queryParams.supplierId" prop="status">
+        <el-form-item label="" v-model="queryParams.supplierId" prop="status">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="全部"
+            placeholder="供应商"
             clearable
             style="width: 230px"
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px" clearable>
+        <el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
+          <el-select v-model="queryParams.approvalStatus" placeholder="状态" style="150px" clearable>
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"
@@ -35,7 +35,7 @@
             </el-date-picker>
         </el-form-item> -->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
diff --git a/fuintAdmin/src/views/convenienceStore/returns/index.vue b/fuintAdmin/src/views/convenienceStore/returns/index.vue
index 158f4fc87..74f50c3b0 100644
--- a/fuintAdmin/src/views/convenienceStore/returns/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/returns/index.vue
@@ -2,21 +2,21 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="业务单号" prop="orderNumber">
-          <el-input v-model="queryParams.orderNumber" placeholder="请输入业务单号" />
+        <el-form-item label="" prop="orderNumber">
+          <el-input v-model="queryParams.orderNumber" placeholder="业务单号" />
         </el-form-item>
-        <el-form-item label="供应商" v-model="queryParams.supplierId" prop="status">
+        <el-form-item label="" v-model="queryParams.supplierId" prop="status">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="全部"
+            placeholder="供应商"
             clearable
             style="width: 230px"
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" v-model="queryParams.approvalStatus" prop="status">
-          <el-select v-model="queryParams.approvalStatus" placeholder="请选择状态" style="150px">
+        <el-form-item label="" v-model="queryParams.approvalStatus" prop="status">
+          <el-select v-model="queryParams.approvalStatus" placeholder="状态" style="">
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
               :key="dict.value"
@@ -35,7 +35,7 @@
             </el-date-picker>
         </el-form-item> -->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -174,7 +174,7 @@ export default {
         name: 'returns-details'
       });
     },
-  
+
 
     // 处理单据
     dispose(data) {
diff --git a/fuintAdmin/src/views/convenienceStore/saleStatistic.vue b/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
index 0967aa89e..153c74504 100644
--- a/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
@@ -3,34 +3,34 @@
     <!--    搜索框-->
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="商品名称" prop="name">
+        <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入商品名称"
+            placeholder="商品名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="拼音码" prop="pinyinCode">
+        <el-form-item label="" prop="pinyinCode">
           <el-input
             v-model="queryParams.pinyinCode"
-            placeholder="请输入拼音码"
+            placeholder="拼音码"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="条形码" prop="goodsNo">
+        <el-form-item label="" prop="goodsNo">
           <el-input
             v-model="queryParams.goodsNo"
-            placeholder="请输入商品条形码"
+            placeholder="条形码"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="销售时间">
+        <el-form-item label="">
 <!--          <el-date-picker-->
 <!--            v-model="dateRange"-->
 <!--            style="width: 240px"-->
@@ -45,17 +45,17 @@
             v-model="beginTime"
             style="width: 160px"
             type="date"
-            placeholder="开始日期">
+            placeholder="销售开始日期">
           </el-date-picker>
           至
           <el-date-picker
             v-model="endTime"
             style="width: 160px"
             type="date"
-            placeholder="结束日期">
+            placeholder="销售结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -290,4 +290,8 @@ export default {
     height: 100vh;
     background: #f6f8f9;
   }
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
+
 </style>
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index 2bbbb4442..aecc24c42 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -3,72 +3,71 @@
     <!--    搜索框-->
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="商品分类" prop="cvsGoodId">
+        <el-form-item label="" prop="cvsGoodId">
 <!--          <el-cascader v-model="cvsGoodId"-->
 <!--                       :options="cvsGoodOptions"-->
 <!--                       :props="{ checkStrictly: true }"-->
 <!--                       clearable></el-cascader>-->
           <el-select
             v-model="queryParams.cvsGoodId"
-            placeholder="全部"
+            placeholder="商品分类"
             clearable
-            style="width: 300px"
           >
             <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="供应商" prop="supplierId">
+        <el-form-item label="" prop="supplierId">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="全部"
+            placeholder="供应商"
             clearable
-            style="width: 300px"
+            style=""
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品名称" prop="name">
+        <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入商品名称"
+            placeholder="商品名称"
             clearable
-            style="width: 240px;"
+            style=""
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="拼音码" prop="pinyinCode">
+        <el-form-item label="" prop="pinyinCode">
           <el-input
             v-model="queryParams.pinyinCode"
-            placeholder="请输入拼音码"
+            placeholder="拼音码"
             clearable
-            style="width: 240px;"
+            style=""
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="条形码" prop="goodsNo">
+        <el-form-item label="" prop="goodsNo">
           <el-input
             v-model="queryParams.goodsNo"
-            placeholder="请输入商品条形码"
+            placeholder="条形码"
             clearable
-            style="width: 240px;"
+            style=""
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="货架号" prop="shelfNumber">
+        <el-form-item label="" prop="shelfNumber">
           <el-input
             v-model="queryParams.shelfNumber"
-            placeholder="请输入商品所在货架号"
+            placeholder="货架号"
             clearable
-            style="width: 240px;"
+            style=""
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="上架状态" prop="status">
+        <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="全部"
+            placeholder="上架状态"
             clearable
-            style="width: 240px"
+            style=""
           >
 <!--            <el-option-->
 <!--              v-for="dict in dict.type.zhzt"-->
@@ -80,7 +79,7 @@
             <el-option label="下架" value="jy"/>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -404,4 +403,8 @@ export default {
   .box-card {
     width: 90%;
   }
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
+
 </style>
diff --git a/fuintAdmin/src/views/convenienceStore/supplier.vue b/fuintAdmin/src/views/convenienceStore/supplier.vue
index c9d4b5217..ea1a18b36 100644
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@@ -2,35 +2,35 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="供应商" prop="name">
+        <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="请输入供应商名称"
+            placeholder="供应商"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="联系人" prop="contacts">
+        <el-form-item label="" prop="contacts">
           <el-input
             v-model="queryParams.contacts"
-            placeholder="请输入联系人"
+            placeholder="联系人"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="联系电话" prop="mobile">
+        <el-form-item label="" prop="mobile">
           <el-input
             v-model="queryParams.mobile"
-            placeholder="请输入联系电话"
+            placeholder="联系电话"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
index 491970370..52b23d22a 100644
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -2,25 +2,25 @@
   <div class="app-container">
     <el-card>
       <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="100px">
-        <el-form-item label="角色名称" prop="dutyName">
+        <el-form-item label="" prop="dutyName">
           <el-input
             v-model="queryParams1.dutyName"
-            placeholder="请输入角色名称"
+            placeholder="角色名称"
             clearable
             @keyup.enter.native="handleQuery1"
           />
         </el-form-item>
-        <el-form-item label="角色状态" prop="status">
+        <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams1.status"
-            placeholder="全部"
+            placeholder="角色状态"
             clearable
           >
             <el-option label="启用" value="A"></el-option>
             <el-option label="禁用" value="D"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
         </el-form-item>
       </el-form>
@@ -359,4 +359,8 @@ export default {
     height: 100%;
     background: #f6f8f9;
   }
+
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
 </style>
diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue
index fc061a367..e3742b7c5 100644
--- a/fuintAdmin/src/views/integral/gift/index.vue
+++ b/fuintAdmin/src/views/integral/gift/index.vue
@@ -2,17 +2,17 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="礼品名称" prop="giftName">
+        <el-form-item label="" prop="giftName">
           <el-input
             v-model="queryParams.giftName"
-            placeholder="请输入礼品名称"
+            placeholder="礼品名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
         <el-form-item>
-          <el-select v-model="queryParams.status" style="width: 217px" placeholder="全部" clearable
+          <el-select v-model="queryParams.status" style="width: 217px" placeholder="状态" clearable
 >
             <el-option
             v-for="dict in dict.type.zhzt"
@@ -22,7 +22,7 @@
             />
         </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
        </el-form-item>
diff --git a/fuintAdmin/src/views/integral/giftCategory/index.vue b/fuintAdmin/src/views/integral/giftCategory/index.vue
index 4ab06f8ad..2d108a53b 100644
--- a/fuintAdmin/src/views/integral/giftCategory/index.vue
+++ b/fuintAdmin/src/views/integral/giftCategory/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
 
-    <el-card > 
+    <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="分类名称" prop="categoryName">
+        <el-form-item label="" prop="categoryName">
           <el-input
             v-model="queryParams.categoryName"
-            placeholder="请输入分类名称"
+            placeholder="分类名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
@@ -23,12 +23,12 @@
             />
         </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
        </el-form-item>
-      </el-form> 
-    </el-card>  
+      </el-form>
+    </el-card>
 
     <el-card style="margin-top: 20px" >
       <el-row :gutter="10" class="mb8">
@@ -221,7 +221,7 @@ export default {
       this.dataForm = {}
       this.dataForm.status = '启用'
       this.open = true
-      this.title = '添加分类' 
+      this.title = '添加分类'
     },
     // 取消按钮
     cancel() {
diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue
index 04dd61459..1a6a27941 100644
--- a/fuintAdmin/src/views/integral/order/pointsCashier.vue
+++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue
@@ -2,32 +2,32 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
-        <el-form-item label="交易单号" prop="giftName">
+        <el-form-item label="" prop="giftName">
           <el-input
             v-model="queryParams.orderNumber"
-            placeholder="请输入交易单号"
+            placeholder="交易单号"
             clearable
             style="width: 220px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="兑换状态">
+        <el-form-item label="">
           <el-select v-model="queryParams.status" style="width: 150px" placeholder="兑换状态" clearable>
             <el-option  label="未支付" value="unpaid">未支付</el-option>
             <el-option  label="付款成功" value="paid">付款成功</el-option>
             <el-option  label="付款失败" value="payFail">付款失败</el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="手机号码" prop="giftName">
+        <el-form-item label="" prop="giftName">
           <el-input
             v-model="queryParams.mobile"
-            placeholder="请输入用户手机号"
+            placeholder="手机号码"
             clearable
             style="width: 160px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="时间">
+        <el-form-item label="">
 <!--        <el-date-picker-->
 <!--          v-model="dateRange"-->
 <!--          style="width: 240px"-->
@@ -54,7 +54,7 @@
           </el-date-picker>
       </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
        </el-form-item>
diff --git a/fuintAdmin/src/views/integral/order/pointsMall.vue b/fuintAdmin/src/views/integral/order/pointsMall.vue
index 5699891fc..311b8867f 100644
--- a/fuintAdmin/src/views/integral/order/pointsMall.vue
+++ b/fuintAdmin/src/views/integral/order/pointsMall.vue
@@ -2,28 +2,26 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
-        <el-form-item label="礼品名称" prop="giftName">
+        <el-form-item label="" prop="giftName">
           <el-input
             v-model="queryParams.giftName"
-            placeholder="请输入礼品名称"
+            placeholder="礼品名称"
             clearable
-            style="width: 200px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="手机号码" prop="mobile">
+        <el-form-item label="" prop="mobile">
           <el-input
             v-model="queryParams.mobile"
-            placeholder="请输入用户手机号"
+            placeholder="手机号码"
             clearable
-            style="width: 160px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="配送方式">
-          <el-select v-model="queryParams.shippingType" style="width: 150px" placeholder="全部" clearable>
+        <el-form-item label="">
+          <el-select v-model="queryParams.shippingType" style="" placeholder="配送方式" clearable>
             <el-option
             v-for="dict in dict.type.shippingMethod"
                 :key="dict.label"
@@ -33,7 +31,7 @@
         </el-select>
         </el-form-item>
 
-        <el-form-item label="注册时间">
+        <el-form-item label="">
 <!--        <el-date-picker-->
 <!--          v-model="dateRange"-->
 <!--          style="width: 240px"-->
@@ -60,7 +58,7 @@
           </el-date-picker>
       </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
        </el-form-item>
diff --git a/fuintAdmin/src/views/member/fixingLevel.vue b/fuintAdmin/src/views/member/fixingLevel.vue
index 93ad722ac..7b8b963b8 100644
--- a/fuintAdmin/src/views/member/fixingLevel.vue
+++ b/fuintAdmin/src/views/member/fixingLevel.vue
@@ -4,29 +4,29 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="认证企业会员" name="member">
           <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="手机号" prop="mobile">
+            <el-form-item label="" prop="mobile">
               <el-input
                 v-model="queryParam.mobile"
-                placeholder="请输入会员手机号"
+                placeholder="手机号"
                 clearable
                 style="width: 240px;"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="认证类型" prop="fixingLevelId">
+            <el-form-item label="" prop="fixingLevelId">
               <el-select
                 v-model="queryParam.fixingLevelId"
-                placeholder="请选择"
+                placeholder="认证类型"
                 clearable
                 style="width: 300px"
               >
                 <el-option v-for="item in fixingLevelList" :key="item.id+''" :label="item.name" :value="item.id+''"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="认证状态" prop="status">
+            <el-form-item label="" prop="status">
               <el-select
                 v-model="queryParam.status"
-                placeholder="全部"
+                placeholder="认证状态"
                 clearable
                 style="width: 240px"
               >
@@ -51,17 +51,17 @@
 <!--              ></el-date-picker>-->
 <!--            </el-form-item>-->
 
-            <el-form-item>
+            <el-form-item style="float: right">
               <el-button type="primary" icon="el-icon-search" @click="handleQueryMember">搜索</el-button>
             </el-form-item>
           </el-form>
         </el-tab-pane>
         <el-tab-pane label="设置企业会员等级" name="fixingLevel">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item label="等级状态" prop="status">
+            <el-form-item label="" prop="status">
               <el-select
                 v-model="queryParams.status"
-                placeholder="全部"
+                placeholder="等级状态"
                 clearable
                 style="width: 240px"
               >
@@ -86,7 +86,7 @@
 <!--              ></el-date-picker>-->
 <!--            </el-form-item>-->
 
-            <el-form-item>
+            <el-form-item style="float: right;">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
             </el-form-item>
           </el-form>
@@ -1435,4 +1435,8 @@ export default {
     margin: 2px;
     border-radius: 50%;
   }
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
+
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
index 1ee01b05b..e52f845e8 100644
--- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="业务单号" prop="tankName">
-          <el-input v-model="queryParams.inventoryNumber" placeholder="请输入业务单号名称" />
+        <el-form-item label="" prop="tankName">
+          <el-input v-model="queryParams.inventoryNumber" placeholder="业务单号" />
         </el-form-item>
 
 
-        <el-form-item label="状态" v-model="queryParams.status" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%"     clearable
+        <el-form-item label="" v-model="queryParams.status" prop="status">
+          <el-select v-model="queryParams.status" placeholder="状态" style="width:100%"     clearable
 >
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
@@ -28,7 +28,7 @@
 <!--            </el-date-picker>-->
 <!--        </el-form-item>-->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
 <!--                              <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
         </el-form-item>
@@ -212,4 +212,8 @@ export default {
   height: 100%;
   background: #f6f8f9;
 }
+.el-form--inline .el-form-item {
+  margin-right: 44px;
+}
+
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
index 5062407fa..7032c0b14 100644
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@@ -2,8 +2,8 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="供应商名称" prop="supplierName">
-          <el-select v-model="queryParams.supplierId" placeholder="请选择供应商" style="width:100%"             clearable
+        <el-form-item label="" prop="supplierName">
+          <el-select v-model="queryParams.supplierId" placeholder="供应商名称" style="width:100%"             clearable
 >
             <el-option
               v-for="option in suppliersList"
@@ -14,13 +14,13 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="油罐名称" prop="tankName">
-          <el-input v-model="queryParams.tankName" placeholder="请输入油罐名称" />
+        <el-form-item label="" prop="tankName">
+          <el-input v-model="queryParams.tankName" placeholder="油罐名称" />
         </el-form-item>
 
 
-        <el-form-item label="状态" v-model="queryParams.status" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%"             clearable
+        <el-form-item label="" v-model="queryParams.status" prop="status">
+          <el-select v-model="queryParams.status" placeholder="状态" style="width:100%"             clearable
 >
             <el-option
               v-for="dict in dict.type.oilPurchasedStatus"
@@ -40,7 +40,7 @@
 <!--            </el-date-picker>-->
 <!--        </el-form-item>-->
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
 <!--                              <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
         </el-form-item>
@@ -221,4 +221,8 @@ export default {
   height: 100%;
   background: #f6f8f9;
 }
+.el-form--inline .el-form-item {
+  margin-right: 44px;
+}
+
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
index 68d303778..4b3e34e22 100644
--- a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
@@ -3,8 +3,8 @@
     <!--    搜索框-->
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="油品" prop="oilNumber">
-          <el-select v-model="queryParams.numberId" placeholder="请选择油品" style="width:100%" @change="chooseOilNumber()"             clearable
+        <el-form-item label="" prop="oilNumber">
+          <el-select v-model="queryParams.numberId" placeholder="油品" style="width:100%" @change="chooseOilNumber()"             clearable
 >
             <el-option
               v-for="option in selectOilTypeByPrice"
@@ -16,19 +16,19 @@
         </el-form-item>
 
 
-        <el-form-item label="油罐名称" prop="tankName">
+        <el-form-item label="" prop="tankName">
           <el-input
             v-model="queryParams.tankName"
-            placeholder="请输入油罐名称"
+            placeholder="油罐名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label-width="120px" label="库存统计状态" v-model="queryParams.inventoryStatistics" prop="inventoryStatistics" clearable>
+        <el-form-item label-width="120px" label="" v-model="queryParams.inventoryStatistics" prop="inventoryStatistics" clearable>
           <el-select v-model="queryParams.inventoryStatistics" placeholder="" style="width:100%">
-            <el-option label="全部" value=""></el-option>
+            <el-option label="库存统计状态" value=""></el-option>
             <el-option
               v-for="dict in dict.type.zhzt"
               :key="dict.label"
@@ -38,7 +38,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
                               <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
@@ -355,4 +355,8 @@ export default {
   .box-card {
     width: 90%;
   }
+  .el-form--inline .el-form-item {
+    margin-right: 44px;
+  }
+
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
index 2623842a4..dff4ba4dd 100644
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@@ -3,36 +3,36 @@
 
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-        <el-form-item label="供应商名称" prop="supplierName">
+        <el-form-item label="" prop="supplierName">
           <el-input
             v-model="queryParams.supplierName"
-            placeholder="请输入供应商名称"
+            placeholder="供应商名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="联系人" prop="contactPerson">
+        <el-form-item label="" prop="contactPerson">
           <el-input
             v-model="queryParams.contactPerson"
-            placeholder="请输入联系人"
+            placeholder="联系人"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="供应商电话" prop="contactPhone">
+        <el-form-item label="" prop="contactPhone">
           <el-input
             v-model.number="queryParams.contactPhone"
-            placeholder="请输入供应商电话"
+            placeholder="供应商电话"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
           <!--                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
         </el-form-item>
@@ -256,4 +256,8 @@ export default {
   height: 100vh;
   background: #f6f8f9;
 }
+.el-form--inline .el-form-item {
+  margin-right: 44px;
+}
+
 </style>
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index 0d97c4ad5..00f8cbe84 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -3,17 +3,17 @@
 <!--    搜索框-->
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="油罐名称" prop="tankName">
+        <el-form-item label="" prop="tankName">
           <el-input
             v-model="queryParams.tankName"
-            placeholder="请输入油罐名称"
+            placeholder="油罐名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
 <!--                    <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
         </el-form-item>
@@ -526,4 +526,8 @@ export default {
   height: 100vh;
   background: #f6f8f9;
 }
+.el-form--inline .el-form-item {
+  margin-right: 44px;
+}
+
 </style>
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index adec85110..fa4bb581e 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -44,7 +44,7 @@
                     placeholder="结束日期">
                   </el-date-picker>
                 </el-form-item>
-              <el-form-item>
+              <el-form-item style="float: right">
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
               </el-form-item>