Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei

src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue

@@ -102,6 +102,7 @@
                 <el-date-picker
                   v-model="page.params.createTime"
                   type="datetimerange"
+                  style="width: 105%"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   range-separator="~"
                   start-placeholder="开始时间"
@@ -120,14 +121,15 @@
                   :size="$store.getters.size"
                   icon="el-icon-search"
                   @click="search"
-                  >&nbsp;&nbsp;查询
+                  >查询
                 </el-button>
                 <el-button
+                  type="info"
                   :size="$store.getters.size"
                   icon="el-icon-refresh"
                   @click="page.params = {}"
                 >
-                  &nbsp;&nbsp;重置
+                  重置
                 </el-button>
               </div>
             </el-col>

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 = {}
@@ -158,11 +158,12 @@
           <!-- 分页组件结束 -->
         </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="基础个人价">
             <template slot-scope="scope">
               <div>
@@ -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"
@@ -292,7 +295,7 @@ export default {
                 return ('禁用');
                }
             }
-          }, 
+          },
             {
               label: '基础个人价',
               value: 'personalPriceBase'