yangshi

src/assets/styles/element-ui.scss

@@ -89,6 +89,12 @@
     border-radius: 4px !important;
 }
 
+.el-input__inner:hover {
+    border: 1px solid #ff3b30 !important;
+    box-shadow: 0px 0px 2px #ff3b30;
+    color: #ff3b30 !important;
+}
+
 .el-form-item {
     margin-bottom: 10px;
 }

src/views/login.vue

@@ -12,17 +12,19 @@
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="password">
+      <el-form-item prop="password" >
         <el-input
           v-model="loginForm.password"
           :type="passwordtxt"
           auto-complete="off"
           placeholder="密码"
           @keyup.enter.native="handleLogin"
+          style="position:relative !important;width:100%;background:red;display:block"
+
         >
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-          <svg-icon slot="prefix" icon-class="eye"  class="el-input__icon input-icon"  style="position:absolute;right:-340px"  @click="eyeTab" v-show="passwordtxt =='password'" />
-          <svg-icon slot="prefix" icon-class="eye-open"  class="el-input__icon input-icon"  style="position:absolute;right:-340px"  @click="eyeTab" v-show="passwordtxt =='text'" />
+          <svg-icon slot="prefix" icon-class="eye"  class="el-input__icon input-icon"  style="position:absolute;right:10px"  @click="eyeTab" v-show="passwordtxt =='password'" />
+          <svg-icon slot="prefix" icon-class="eye-open"  class="el-input__icon input-icon"  style="position:absolute;right:10px"  @click="eyeTab" v-show="passwordtxt =='text'" />
         </el-input>
 
       </el-form-item>
@@ -260,6 +262,7 @@ export default {
   text-align: left;
   color: #000000;
   font-size: 20px;
+  font-weight: 700;
   span{
     margin-left:10px;
     opacity: 0.25;
@@ -270,10 +273,11 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 456px;
-  padding: 63px 35px;
+  padding: 48px;
   .el-input {
     height: 40px;
     font-size: 16px !important;
+    margin-top:10px !important;
     input {
       height: 40px;
     }
@@ -293,6 +297,7 @@ export default {
   width: 33%;
   height: 36px;
   float: right;
+  margin-top:10px !important;
   img {
     cursor: pointer;
     vertical-align: middle;

src/views/monitor/jobTaskIndex/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="任务名称" prop="jobName">
+      <el-form-item label="任务名称:" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
           placeholder="请输入任务名称"
@@ -11,7 +11,7 @@
           @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="请选择任务状态" clearable size="small" style="width: 140px">
           <el-option
             v-for="dict in statusOptions"
@@ -21,9 +21,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -31,14 +31,14 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="任务编号" align="center" prop="jobId" />
-      <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-      <!-- <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" /> -->
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-      <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center">
+    <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" border>
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="任务编号" align="left" prop="jobId" />
+      <el-table-column label="任务名称" align="left" prop="jobName" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" /> -->
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget" :show-overflow-tooltip="true" />
+      <el-table-column label="cron执行表达式" align="left" prop="cronExpression" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="left">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -48,7 +48,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/monitor/jobTaskLog/log.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="任务名称" prop="jobName">
+      <el-form-item label="任务名称:" prop="jobName">
         <el-input
           v-model="queryParams.jobName"
           placeholder="请输入任务名称"
@@ -11,7 +11,7 @@
           @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="请选择执行状态"
@@ -27,7 +27,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="执行时间" >
+      <el-form-item label="执行时间:" >
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -39,27 +39,27 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
 
 
-    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange" >
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="日志编号" width="80" align="center" prop="jobLogId"  show-overflow-tooltip />
-      <el-table-column label="任务名称" align="center" prop="jobName"  show-overflow-tooltip  />
-      <!-- <el-table-column label="任务组名" align="center" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" /> -->
-      <el-table-column label="调用目标字符串" align="center" prop="invokeTarget"  show-overflow-tooltip />
-      <el-table-column label="日志信息" align="center" prop="jobMessage"  show-overflow-tooltip  />
-      <el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="执行时间" align="center" prop="createTime"  show-overflow-tooltip >
+    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange" border>
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="日志编号" width="80" align="left" prop="jobLogId"  show-overflow-tooltip />
+      <el-table-column label="任务名称" align="left" prop="jobName"  show-overflow-tooltip  />
+      <!-- <el-table-column label="任务组名" align="left" prop="jobGroup" :formatter="jobGroupFormat" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="调用目标字符串" align="left" prop="invokeTarget"  show-overflow-tooltip />
+      <el-table-column label="日志信息" align="left" prop="jobMessage"  show-overflow-tooltip  />
+      <el-table-column label="执行状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="执行时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/monitor/logininfor/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="登录地址" prop="ipaddr">
+      <el-form-item label="登录地址:" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"
           placeholder="请输入登录地址"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称" prop="userName" >
+      <el-form-item label="用户名称:" prop="userName" >
         <el-input
           v-model="queryParams.userName"
           placeholder="请输入用户名称"
@@ -49,23 +49,23 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="访问编号" align="center" prop="infoId"  show-overflow-tooltip />
-      <el-table-column label="用户名称" align="center" prop="userName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="登录地址" align="center" prop="ipaddr"  show-overflow-tooltip  />
-      <el-table-column label="登录地点" align="center" prop="loginLocation"  show-overflow-tooltip  />
-      <el-table-column label="浏览器" align="center" prop="browser"  show-overflow-tooltip  />
-      <el-table-column label="操作系统" align="center" prop="os"  show-overflow-tooltip />
-      <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat"  show-overflow-tooltip />
-      <el-table-column label="操作信息" align="center" prop="msg"  show-overflow-tooltip />
-      <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
+    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" border>
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="访问编号" align="left" prop="infoId"  show-overflow-tooltip />
+      <el-table-column label="用户名称" align="left" prop="userName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="登录地址" align="left" prop="ipaddr"  show-overflow-tooltip  />
+      <el-table-column label="登录地点" align="left" prop="loginLocation"  show-overflow-tooltip  />
+      <el-table-column label="浏览器" align="left" prop="browser"  show-overflow-tooltip  />
+      <el-table-column label="操作系统" align="left" prop="os"  show-overflow-tooltip />
+      <el-table-column label="登录状态" align="left" prop="status" :formatter="statusFormat"  show-overflow-tooltip />
+      <el-table-column label="操作信息" align="left" prop="msg"  show-overflow-tooltip />
+      <el-table-column label="登录日期" align="left" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.loginTime) }}</span>
         </template>

src/views/monitor/operlog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="系统模块" prop="title">
+      <el-form-item label="系统模块:" prop="title">
         <el-input
           v-model="queryParams.title"
           placeholder="请输入系统模块"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="操作人员" prop="operName" >
+      <el-form-item label="操作人员:" prop="operName" >
         <el-input
           v-model="queryParams.operName"
           placeholder="请输入操作人员"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类型" prop="businessType" >
+      <el-form-item label="类型:" prop="businessType" >
         <el-select
           v-model="queryParams.businessType"
           placeholder="操作类型"
@@ -37,7 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status" >
+      <el-form-item label="状态:" prop="status" >
         <el-select
           v-model="queryParams.status"
           placeholder="操作状态"
@@ -53,7 +53,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="操作时间">
+      <el-form-item label="操作时间:">
         <el-date-picker
           v-model="dateRange"
           size="small"
@@ -65,34 +65,34 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
 
 
-    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="日志编号" align="center" prop="operId"  show-overflow-tooltip />
-      <el-table-column label="系统模块" align="center" prop="title"  show-overflow-tooltip />
-      <el-table-column label="操作类型" align="center" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />
-      <el-table-column label="请求方式" align="center" prop="requestMethod" />
-      <el-table-column label="操作人员" align="center" prop="operName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
-      <el-table-column label="操作地址" align="center" prop="operIp" width="130"  show-overflow-tooltip  />
-      <el-table-column label="操作地点" align="center" prop="operLocation"  show-overflow-tooltip  />
-      <el-table-column label="操作状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="操作日期" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
+    <el-table ref="tables" v-loading="loading" :data="list"  @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange" border>
+      <!-- <el-table-column type="selection" width="55" align="left" /> -->
+      <el-table-column label="日志编号" align="left" prop="operId"  show-overflow-tooltip />
+      <el-table-column label="系统模块" align="left" prop="title"  show-overflow-tooltip />
+      <el-table-column label="操作类型" align="left" prop="businessType" :formatter="typeFormat"  show-overflow-tooltip />
+      <el-table-column label="请求方式" align="left" prop="requestMethod" />
+      <el-table-column label="操作人员" align="left" prop="operName"  show-overflow-tooltip  sortable="custom" :sort-orders="['descending', 'ascending']" />
+      <el-table-column label="操作地址" align="left" prop="operIp" width="130"  show-overflow-tooltip  />
+      <el-table-column label="操作地点" align="left" prop="operLocation"  show-overflow-tooltip  />
+      <el-table-column label="操作状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="操作日期" align="left" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            class="lvs"
+            class="hongs"
             @click="handleView(scope.row,scope.index)"
             v-hasPermi="['monitor:operlog:query']"
           >详细</el-button>

src/views/recharge/admin/index.vue

@@ -97,16 +97,16 @@
     </el-row>
 
     <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="身份信息" align="center" prop="adminId" />
-      <el-table-column label="充值到账比例" align="center" prop="adminName"/>
-      <el-table-column label="创建人" align="center" prop="adminValue" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="身份信息" align="left" prop="adminId" />
+      <el-table-column label="充值到账比例" align="left" prop="adminName"/>
+      <el-table-column label="创建人" align="left" prop="adminValue" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -331,4 +331,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/recharge/cateringManagement/foodManagement/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="餐品名称" prop="name">
+      <el-form-item label="餐品名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入餐品名称"
@@ -12,25 +12,25 @@
 
         />
       </el-form-item>
-      <el-form-item label="餐别" >
+      <el-form-item label="餐别:" >
          <el-select v-model="queryParams.type" style="width: 160px" placeholder="请选择餐别" clearable size="small">
           <el-option :label="item.value"  :value="item.value" v-for="(item,index) in mTypeList" :key="index" />
         </el-select>
       </el-form-item>
-      <el-form-item label="上下架" >
+      <el-form-item label="上下架:" >
          <el-select v-model="queryParams.status" style="width: 160px" placeholder="请选择上下架" clearable size="small">
           <el-option :label="item.name"  :value="item.value" v-for="(item,index) in statusList" :key="index" />
         </el-select>
       </el-form-item>
-      <el-form-item label="推荐菜品" >
+      <el-form-item label="推荐菜品:" >
          <el-select v-model="queryParams.isRecommend" style="width: 160px" placeholder="请选择推荐菜品" clearable size="small">
           <el-option :label="item.name"  :value="item.value" v-for="(item,index) in isRecommendList" :key="index" />
         </el-select>
       </el-form-item>
 
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -67,20 +67,20 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="餐别" align="center" prop="type" show-overflow-tooltip >
+      <el-table-column label="餐别" align="left" prop="type" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.type}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="餐品名称" align="center" prop="name" show-overflow-tooltip />
-      <el-table-column label="价格（元）" align="center" prop="price" show-overflow-tooltip />
-      <el-table-column label="上下架状态" align="center" prop="status" show-overflow-tooltip >
+      <el-table-column label="餐品名称" align="left" prop="name" show-overflow-tooltip />
+      <el-table-column label="价格（元）" align="left" prop="price" show-overflow-tooltip />
+      <el-table-column label="上下架状态" align="left" prop="status" show-overflow-tooltip >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -91,7 +91,7 @@
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="推荐状态" align="center" prop="isRecommend" show-overflow-tooltip >
+      <el-table-column label="推荐状态" align="left" prop="isRecommend" show-overflow-tooltip >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isRecommend"
@@ -102,11 +102,10 @@
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope" >
           <el-button
             type="text"
-            icon="el-icon-edit"
             size="small"
             @click="handleUpdate(scope.row)"
           >修改</el-button>

src/views/recharge/cateringManagement/personnel/index.vue

@@ -25,8 +25,8 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="name">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+          <el-form-item label="用户名称:" prop="name">
             <el-input
               v-model="queryParams.name"
               placeholder="请输入用户名称"
@@ -36,9 +36,9 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+          <el-form-item class="right">
             <el-button plain size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
           </el-form-item>
           <br>
           <el-form-item>
@@ -47,12 +47,12 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" >
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="sid" align="center" key="sid" prop="sid" v-if="columns[0].visible"  show-overflow-tooltip />
-          <el-table-column label="用户名称" align="center" key="userName" prop="name" v-if="columns[1].visible"  show-overflow-tooltip  />
-          <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
-          <el-table-column label="配送员设置" align="center" key="people" v-if="columns[5].visible" >
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
+          <el-table-column type="selection" width="50" align="left" />
+          <el-table-column label="sid" align="left" key="sid" prop="sid" v-if="columns[0].visible"  show-overflow-tooltip />
+          <el-table-column label="用户名称" align="left" key="userName" prop="name" v-if="columns[1].visible"  show-overflow-tooltip  />
+          <el-table-column label="部门" align="left" key="deptName" prop="deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
+          <el-table-column label="配送员设置" align="left" key="people" v-if="columns[5].visible" >
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.people"
@@ -62,7 +62,7 @@
               ></el-switch>
             </template>
           </el-table-column>
-            <el-table-column label="公众号推送设置" align="center" key="isSend" v-if="columns[5].visible" >
+            <el-table-column label="公众号推送设置" align="left" key="isSend" v-if="columns[5].visible" >
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.isSend"
@@ -119,29 +119,23 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item class="right">
+              <el-button plain  size="mini" @click="resetQuery2">重置</el-button>
+              <el-button type="primary"  size="mini" @click="handleQuery2">搜索</el-button>
+            </el-form-item>
+            <br>
             <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
-            <el-button type="warning" icon="el-icon-circle-plus-outline" size="mini" @click="peopleChange()" style="margin:-50px 10px 30px">配餐员批量处理</el-button>
-            <!-- <el-button
-              type="success"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              :loading="exportLoading"
-              style="margin-left:0px;"
-            >配送人员导出</el-button> -->
-          </el-form-item>
+              <el-button type="primary" size="mini" @click="peopleChange()" style="margin:0px 0px 0px">配餐员批量处理</el-button>
+            </el-form-item>
           </el-form>
 
 
           <el-table v-loading="loading" :data="userList2" @selection-change="handleSelectionChange" height="60vh">
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="sid" align="center" key="sid" prop="sid" v-if="columns[0].visible"  show-overflow-tooltip />
-            <el-table-column label="用户名称" align="center" key="userName" prop="name" v-if="columns[1].visible"  show-overflow-tooltip  />
-            <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
-            <el-table-column label="配送员设置" align="center" key="people" v-if="columns[5].visible" >
+            <el-table-column type="selection" width="50" align="left" />
+            <el-table-column label="sid" align="left" key="sid" prop="sid" v-if="columns[0].visible"  show-overflow-tooltip />
+            <el-table-column label="用户名称" align="left" key="userName" prop="name" v-if="columns[1].visible"  show-overflow-tooltip  />
+            <el-table-column label="部门" align="left" key="deptName" prop="deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
+            <el-table-column label="配送员设置" align="left" key="people" v-if="columns[5].visible" >
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.people"
@@ -151,7 +145,7 @@
                 ></el-switch>
               </template>
             </el-table-column>
-            <el-table-column label="公众号推送设置" align="center" key="isSend" v-if="columns[5].visible" >
+            <el-table-column label="公众号推送设置" align="left" key="isSend" v-if="columns[5].visible" >
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.isSend"

src/views/recharge/cateringManagement/record/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="订餐时间">
+      <el-form-item label="订餐时间:">
          <el-date-picker
          style="margin-top:5px;"
           v-model="dateRange"
@@ -13,15 +13,15 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="餐别" >
+      <el-form-item label="餐别:" >
          <el-select v-model="queryParams.mType" style="width: 160px" placeholder="请选择餐别" clearable size="small">
           <el-option :label="item.value"  :value="item.value" v-for="(item,index) in mTypeList" :key="index" />
         </el-select>
       </el-form-item>
 
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -35,62 +35,63 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="订餐人" align="center" prop="orderUserName"  show-overflow-tooltip />
-      <el-table-column label="订餐人电话" align="center" prop="phone"  show-overflow-tooltip />
-      <el-table-column label="订餐时间" align="center" prop="orderTime" show-overflow-tooltip width="160" >
+      <el-table-column label="订餐人" align="left" prop="orderUserName"  show-overflow-tooltip />
+      <el-table-column label="订餐人电话" align="left" prop="phone"  show-overflow-tooltip />
+      <el-table-column label="订餐时间" align="left" prop="orderTime" show-overflow-tooltip width="160" >
         <template slot-scope="scope">
           <span>{{scope.row.orderTime ? scope.row.orderTime : ''}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="餐别" align="center" prop="mType" show-overflow-tooltip >
+      <el-table-column label="餐别" align="left" prop="mType" show-overflow-tooltip >
         <template slot-scope="scope">
           <span >{{scope.row.mType}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="价格(元)" align="center" prop="totalMoney" show-overflow-tooltip >
+      <el-table-column label="价格(元)" align="left" prop="totalMoney" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.totalMoney).toFixed(2) || '0.00'}}</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="接单人" align="center" prop="receiveUserName"  show-overflow-tooltip />
-      <el-table-column label="接单时间" align="center" prop="receiveTime" show-overflow-tooltip width="160">
+      <el-table-column label="接单人" align="left" prop="receiveUserName"  show-overflow-tooltip />
+      <el-table-column label="接单时间" align="left" prop="receiveTime" show-overflow-tooltip width="160">
          <template slot-scope="scope">
           <span>{{scope.row.receiveTime ? scope.row.receiveTime : ''}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="送单人" align="center" prop="sendUserName"  show-overflow-tooltip />
-       <el-table-column label="流程状态" align="center" prop="orderStatus" show-overflow-tooltip >
+      <el-table-column label="送单人" align="left" prop="sendUserName"  show-overflow-tooltip />
+       <el-table-column label="流程状态" align="left" prop="orderStatus" show-overflow-tooltip >
          <template slot-scope="scope">
           <span>{{scope.row.orderStatus == "0" ? "待接单" : scope.row.orderStatus == "1" ? "配餐中" : scope.row.orderStatus == "2" ? "送餐中" :  "已完成"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成时间" align="center" prop="sendEndTime" show-overflow-tooltip width="160">
+      <el-table-column label="完成时间" align="left" prop="sendEndTime" show-overflow-tooltip width="160">
         <template slot-scope="scope">
           <span>{{scope.row.sendEndTime ? scope.row.sendEndTime : ''}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="详情" align="center" prop="topRadio" show-overflow-tooltip >
+      <el-table-column label="详情" align="left" prop="topRadio" show-overflow-tooltip >
         <template slot-scope="scope" >
           <el-button
             type="text"
-            icon="el-icon-view"
+            class="hongs"
             size="small"
             @click="getOne(scope.row)"
           >查看</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope" >
           <el-button
             type="text"
             size="small"
+            class="hongs"
             :disabled="scope.row.orderStatus != 0"
             @click="handleUpdate(scope.row.id,1)"
           >接单</el-button>
@@ -98,12 +99,14 @@
            :disabled="scope.row.orderStatus != 1"
             type="text"
             size="small"
+            class="hongs"
             @click="handleUpdate(scope.row.id,2)"
           >送餐</el-button>
            <el-button
            :disabled="scope.row.orderStatus != 2"
             type="text"
             size="small"
+            class="hongs"
             @click="handleUpdate(scope.row.id,3)"
           >完成</el-button>
         </template>
@@ -131,13 +134,13 @@
       </el-row>
 
       <el-table v-loading="loading" :data="details.dishes" height="30vh" stripe style="border:1px solid #dfe6ec;overflow-y:scroll">
-        <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+        <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
           <template slot-scope="scope">
           {{scope.$index + 1}}
           </template>
         </el-table-column>
-        <el-table-column label="餐品" align="center" prop="mName"  show-overflow-tooltip />
-        <el-table-column label="数量(份)" align="center" prop="mCount" show-overflow-tooltip />
+        <el-table-column label="餐品" align="left" prop="mName"  show-overflow-tooltip />
+        <el-table-column label="数量(份)" align="left" prop="mCount" show-overflow-tooltip />
       </el-table>
       <div slot="footer" class="dialog-footer">
          <el-button

src/views/recharge/channel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="72px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
       <el-form-item label="渠道名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
@@ -13,8 +13,8 @@
         />
       </el-form-item>
       <el-form-item class="right">
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -26,33 +26,33 @@
         >新增</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip border>
+    <el-table v-loading="loading" :data="adminList"  border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip border>
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="渠道名称" align="center" prop="name" show-overflow-tooltip />
-      <el-table-column label="渠道标识" align="center" prop="aliasName" show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="渠道名称" align="left" prop="name" show-overflow-tooltip />
+      <el-table-column label="渠道标识" align="left" prop="aliasName" show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            class="lans"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:admin:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            class="hongs"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:admin:remove']"
           >删除</el-button>

src/views/recharge/consumePlaces/bookingManagement/index.vue

@@ -52,20 +52,20 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="预约人" align="center" prop="a" show-overflow-tooltip/>
-      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
-      <el-table-column label="商品名称" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="预约日期" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="预约时段" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="状态" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="单价（元、每次）" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="预约人" align="left" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品类型" align="left" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品名称" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="预约日期" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="预约时段" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="状态" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="单价（元、每次）" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="d"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/recharge/consumePlaces/commodityManagement/index.vue

@@ -60,20 +60,20 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="商品名称" align="center" prop="a" show-overflow-tooltip/>
-      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
-      <el-table-column label="生效状态" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="重复周期" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="开始时间" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="截止时间" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="单价（元、每次）" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="商品名称" align="left" prop="a" show-overflow-tooltip/>
+      <el-table-column label="商品类型" align="left" prop="a" show-overflow-tooltip/>
+      <el-table-column label="生效状态" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="重复周期" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="开始时间" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="截止时间" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="单价（元、每次）" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="d"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/recharge/consumePlaces/commodityType/index.vue

@@ -40,16 +40,16 @@
     </el-form>
 
     <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="商品类型" align="center" prop="a" show-overflow-tooltip/>
-      <el-table-column label="生效状态" align="center" prop="b" show-overflow-tooltip />
-      <el-table-column label="备注" align="center" prop="c" show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="d"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="商品类型" align="left" prop="a" show-overflow-tooltip/>
+      <el-table-column label="生效状态" align="left" prop="b" show-overflow-tooltip />
+      <el-table-column label="备注" align="left" prop="c" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="d"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/recharge/consumption/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="姓名" prop="nameOrPhone" label-width="40px">
+      <el-form-item label="姓名:" prop="nameOrPhone" >
         <el-input
           v-model.trim="queryParams.nameOrPhone"
           placeholder="请输入姓名"
           clearable
           size="small"
-          style="width: 160px"
+          style="width: 140px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="消费时间">
+      <el-form-item label="消费时间:">
          <el-date-picker
          style="margin-top:5px;"
           v-model="dateRange"
@@ -23,47 +23,47 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="卡编号" align="center" prop="cardNo" show-overflow-tooltip />
-      <el-table-column label="消费金额（元）" align="center" prop="amt" show-overflow-tooltip >
+      <el-table-column label="姓名" align="left" prop="name"  show-overflow-tooltip />
+      <el-table-column label="卡编号" align="left" prop="cardNo" show-overflow-tooltip />
+      <el-table-column label="消费金额（元）" align="left" prop="amt" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.amt).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="消费终端名称" align="center" prop="termName" show-overflow-tooltip />
-      <el-table-column label="消费类型" align="center" prop="shopName" show-overflow-tooltip />
-      <el-table-column label="交易类型" align="center" prop="type" show-overflow-tooltip >
+      <el-table-column label="消费终端名称" align="left" prop="termName" show-overflow-tooltip />
+      <el-table-column label="消费类型" align="left" prop="shopName" show-overflow-tooltip />
+      <el-table-column label="交易类型" align="left" prop="type" show-overflow-tooltip >
          <template slot-scope="scope">
-          <span v-if="scope.row.type == 1" style="color:#67C23A">消费</span>
-          <span v-if="scope.row.type == 1001" style="color:#F56C6C">消费撤单</span>
+          <span v-if="scope.row.type == 1" style="color:#1abc5e">消费</span>
+          <span v-if="scope.row.type == 1001" style="color:#ff3b30">消费撤单</span>
         </template>
       </el-table-column>
-      <el-table-column label="餐饮时段" align="center" prop="part" show-overflow-tooltip >
+      <el-table-column label="餐饮时段" align="left" prop="part" show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.part == 1" style="color:#909399">早餐</span>
           <span v-if="scope.row.part == 2" style="color:#E6A23C">午餐</span>
           <span v-if="scope.row.part == 3" style="color:#409EFF">晚餐</span>
-          <span v-if="scope.row.part == 4" style="color:#F56C6C">夜宵</span>
+          <span v-if="scope.row.part == 4" >夜宵</span>
         </template>
       </el-table-column>
 
-      <el-table-column label="余额（元）" align="center" prop="balance" show-overflow-tooltip >
+      <el-table-column label="余额（元）" align="left" prop="balance" show-overflow-tooltip >
        <template slot-scope="scope">
           <span>{{Number(scope.row.balance).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/recharge/department/index.vue

@@ -28,11 +28,11 @@
           @selection-change="handletableSelectionChange" height="calc(100vh - 12vh - 120px)" row-key="id"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
 
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="id" align="center" prop="id" show-overflow-tooltip />
-      <el-table-column label="部门名称" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column type="selection" width="50" align="left" />
+      <el-table-column label="id" align="left" prop="id" show-overflow-tooltip />
+      <el-table-column label="部门名称" align="left" prop="name"  show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/recharge/detailed/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="姓名" prop="userName" label-width="40px">
+      <el-form-item label="姓名:" prop="userName" >
         <el-input
           v-model.trim="queryParams.userName"
           placeholder="请输入姓名"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="userPhone">
+      <el-form-item label="手机号:" prop="userPhone">
         <el-input
           v-model.trim="queryParams.userPhone"
           placeholder="请输入手机号"
@@ -21,14 +21,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="支付方式" prop="payType">
+      <el-form-item label="支付方式:" prop="payType">
          <el-select v-model="queryParams.payType" style="width: 160px" placeholder="请选择支付方式" clearable size="small">
           <el-option label="现金支付" :value="1"/>
           <el-option label="微信" :value="2"/>
           <el-option label="支付宝" :value="3"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="支付状态" prop="orderFlag">
+      <el-form-item label="支付状态:" prop="orderFlag">
         <el-select v-model="queryParams.orderFlag" style="width: 160px" placeholder="请选择支付状态" clearable size="small">
           <el-option label="未支付" :value="0"/>
           <el-option label="支付等待中" :value="1"/>
@@ -56,7 +56,7 @@
           style="width: 140px"
           @keyup.enter.native="handleQuery"></el-input-number>
       </el-form-item>
-      <el-form-item label="支付时间">
+      <el-form-item label="支付时间:">
          <el-date-picker
          style="margin-top:5px;"
           v-model="dateRange"
@@ -68,14 +68,14 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
         <el-button
-          type="primary"
+          plain
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
@@ -84,53 +84,53 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="userName"  show-overflow-tooltip />
-      <el-table-column label="手机号" align="center" prop="userPhone" show-overflow-tooltip />
-      <el-table-column label="充值金额（元）" align="center" prop="money" show-overflow-tooltip >
+      <el-table-column label="姓名" align="left" prop="userName"  show-overflow-tooltip />
+      <el-table-column label="手机号" align="left" prop="userPhone" show-overflow-tooltip />
+      <el-table-column label="充值金额（元）" align="left" prop="money" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.money).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="到账金额（元）" align="center" prop="realMoney" show-overflow-tooltip />
-      <el-table-column label="到账比例" align="center" prop="topRadio" show-overflow-tooltip />
-      <el-table-column label="支付状态" align="center" prop="orderFlag" show-overflow-tooltip >
+      <el-table-column label="到账金额（元）" align="left" prop="realMoney" show-overflow-tooltip />
+      <el-table-column label="到账比例" align="left" prop="topRadio" show-overflow-tooltip />
+      <el-table-column label="支付状态" align="left" prop="orderFlag" show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if="scope.row.orderFlag == 0" style="color:#909399">未支付</span>
           <span v-if="scope.row.orderFlag == 1" style="color:#000000">支付等待中</span>
-          <span v-if="scope.row.orderFlag == 2" style="color:#E6A23C">支付失败</span>
-          <span v-if="scope.row.orderFlag == 3" style="color:#F56C6C">卡充值失败</span>
+          <span v-if="scope.row.orderFlag == 2" style="color:#ff3b30">支付失败</span>
+          <span v-if="scope.row.orderFlag == 3" style="color:##ff3b30">卡充值失败</span>
           <span v-if="scope.row.orderFlag == 4" style="color:#409EFF">支付成功</span>
           <span v-if="scope.row.orderFlag == 5" style="color:#303133">取消支付</span>
           <span v-if="scope.row.orderFlag == 6" style="color:#67C23A">已成功</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="到账金额" align="center" prop="realMoney" show-overflow-tooltip /> -->
-      <el-table-column label="支付方式" align="center" prop="payType" show-overflow-tooltip >
+      <!-- <el-table-column label="到账金额" align="left" prop="realMoney" show-overflow-tooltip /> -->
+      <el-table-column label="支付方式" align="left" prop="payType" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ scope.row.payType == 1 ? '现金支付':scope.row.payType ==2 ? '微信':scope.row.payType ==3 ? '支付宝': '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="充值场景" align="center" prop="scene" show-overflow-tooltip >
+      <el-table-column label="充值场景" align="left" prop="scene" show-overflow-tooltip >
         <template slot-scope="scope">
-          <span v-if="scope.row.scene == 1" style="color:#dda8eb">后台充值</span>
+          <span v-if="scope.row.scene == 1" style="color:#ff9500">后台充值</span>
           <span v-if="scope.row.scene == 2" style="color:#E6A23C">游客充值</span>
-          <span v-if="scope.row.scene == 3" style="color:#67C23A">ERPapp充值</span>
+          <span v-if="scope.row.scene == 3" style="color:#ff3b30">ERPapp充值</span>
           <span v-if="scope.row.scene == 6" style="color:#00dd88e0">公众号充值</span>
         </template>
       </el-table-column>
-      <el-table-column label="充值渠道" align="center" prop="channelName"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip width="180">
+      <el-table-column label="充值渠道" align="left" prop="channelName"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <!-- <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope" >
           <el-button v-if="scope.row.orderFlag ==3"
             type="text"

src/views/recharge/fileExport/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="文件id：">
+      <el-form-item label="文件id:">
         <el-input
           v-model.trim="queryParams.asyncTaskId"
           placeholder="请输入文件id"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="文件名称：" >
+      <el-form-item label="文件名称:" >
         <el-input
           v-model.trim="queryParams.userName"
           placeholder="请输入文件名称"
@@ -21,34 +21,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item >
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="文件名称" align="center" prop="funcType"  show-overflow-tooltip />
-      <el-table-column label="文件大小" align="center" prop="fileSize"  show-overflow-tooltip >
+      <el-table-column label="id" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="文件名称" align="left" prop="funcType"  show-overflow-tooltip />
+      <el-table-column label="文件大小" align="left" prop="fileSize"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span v-if = "scope.row.fileSize">{{(scope.row.fileSize / 1024).toFixed(2)}}Kb</span>
           <span v-if = "!scope.row.fileSize"></span>
         </template>
       </el-table-column>
-      <el-table-column label="任务开始时间" align="center" prop="startTime"  show-overflow-tooltip />
-      <el-table-column label="任务结束时间" align="center" prop="endTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"   >
+      <el-table-column label="任务开始时间" align="left" prop="startTime"  show-overflow-tooltip />
+      <el-table-column label="任务结束时间" align="left" prop="endTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width"   >
         <template slot-scope="scope">
           <el-button v-if ="scope.row.isSuccess && scope.row.url && scope.row.activeFlag == '1' && scope.row.delFlag == '0'"
             size="mini"
             type="text"
-            icon="el-icon-bottom"
             @click="handleExport(scope.row)"
             :loading="exportLoading"
           >下载</el-button>
@@ -59,7 +58,6 @@
           <el-button v-if ="!scope.row.isSuccess || !scope.row.url || scope.row.activeFlag != '1' || scope.row.delFlag != '0'"
             size="mini"
             type="text"
-            icon="el-icon-bottom"
             disabled
             @click="handleExport(scope.row)"
           >下载</el-button>

src/views/recharge/fileManagement/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="文件名称" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="文件名称:" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入文件名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="上传时间" label-width="80px">
+      <el-form-item label="上传时间:" >
          <el-date-picker
           style="margin-top:5px;"
           v-model="dateRange"
@@ -23,9 +23,9 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -44,43 +44,41 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="文件名称" align="center" prop="oriName"  show-overflow-tooltip />
-      <el-table-column label="文件大小" align="center" prop="fileSize"  show-overflow-tooltip >
+      <el-table-column label="id" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="文件名称" align="left" prop="oriName"  show-overflow-tooltip />
+      <el-table-column label="文件大小" align="left" prop="fileSize"  show-overflow-tooltip >
         <template slot-scope="scope">
           {{(scope.row.fileSize / 1024).toFixed(2)}}Kb
         </template>
       </el-table-column>
-      <el-table-column label="上传时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="文件失效时间" align="center" prop="expriceAt"  show-overflow-tooltip />
-      <!-- <el-table-column label="文件是否生效" align="center" prop="activeFlag"  show-overflow-tooltip >
+      <el-table-column label="上传时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="文件失效时间" align="left" prop="expriceAt"  show-overflow-tooltip />
+      <!-- <el-table-column label="文件是否生效" align="left" prop="activeFlag"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.activeFlag == '0' ? 'danger' :  'success'">{{scope.row.activeFlag == '0' ? '未生效' :  '生效'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="文件状态" align="center" prop="delFlag"  show-overflow-tooltip >
+      <el-table-column label="文件状态" align="left" prop="delFlag"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span :class="scope.row.delFlag == '0' ? 'success' :  'danger'">{{scope.row.delFlag == '0' ? '未删除' :  '删除'}}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"   >
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width"   >
         <template slot-scope="scope">
           <el-button v-if ="scope.row.url && scope.row.delFlag == '0' && scope.row.activeFlag == '1'"
             size="mini"
             type="text"
-            icon="el-icon-bottom"
             @click="handleExport(scope.row)"
           >下载</el-button>
           <el-button v-if ="!scope.row.url || scope.row.delFlag != '0' || scope.row.activeFlag != '1'"
             size="mini"
             type="text"
-            icon="el-icon-bottom"
             disabled
             @click="handleExport(scope.row)"
           >下载</el-button>

src/views/recharge/personnel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container" v-loading="loading">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="人员名称" prop="name">
+      <el-form-item label="人员名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入人员名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="手机号" prop="phone">
+      <el-form-item label="手机号:" prop="phone">
         <el-input
           v-model.trim="queryParams.phone"
           placeholder="请输入手机号"
@@ -21,7 +21,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="卡号" prop="card">
+      <el-form-item label="卡号:" prop="card">
         <el-input
           v-model.trim="queryParams.card"
           placeholder="请输入卡号"
@@ -31,9 +31,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -55,39 +55,39 @@
         </el-upload>
       </el-form-item>
     </el-form>
-    <el-table  :data="adminList" @selection-change="handleSelectionChange" >
-      <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="id" align="center" prop="id"  show-overflow-tooltip />
-      <el-table-column label="人员名称" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="部门" align="center" prop="dept"  show-overflow-tooltip />
+    <el-table  :data="adminList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="50" align="left" />
+      <el-table-column label="id" align="left" prop="id"  show-overflow-tooltip />
+      <el-table-column label="人员名称" align="left" prop="name"  show-overflow-tooltip />
+      <el-table-column label="部门" align="left" prop="dept"  show-overflow-tooltip />
 
-      <!-- <el-table-column label="人员信息" align="center" prop="identity"  show-overflow-tooltip /> -->
-      <el-table-column label="手机号" align="center" prop="contacts"  show-overflow-tooltip />
-      <el-table-column label="卡号" align="center" prop="cardId"  show-overflow-tooltip />
-      <el-table-column label="余额（元）" align="center" prop="balance"  show-overflow-tooltip >
+      <!-- <el-table-column label="人员信息" align="left" prop="identity"  show-overflow-tooltip /> -->
+      <el-table-column label="手机号" align="left" prop="contacts"  show-overflow-tooltip />
+      <el-table-column label="卡号" align="left" prop="cardId"  show-overflow-tooltip />
+      <el-table-column label="余额（元）" align="left" prop="balance"  show-overflow-tooltip >
         <template slot-scope="scope">
           {{Number(scope.row.balance).toFixed(2) || '0.00'}}
         </template>
       </el-table-column>
-      <el-table-column label="充值到账比例" align="center" prop="proportion"  show-overflow-tooltip >
+      <el-table-column label="充值到账比例" align="left" prop="proportion"  show-overflow-tooltip >
          <template slot-scope="scope">
           {{scope.row.proportion  ||   1}}
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-link"
+            class="hongs"
             @click="radio(scope.row)"
             v-hasPermi="['recharge:role:wz']"
           >微信、支付宝充值</el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-link"
+            class="lvs"
             @click="cash(scope.row)"
             v-hasPermi="['recharge:role:x']"
           >现金</el-button>
@@ -102,14 +102,14 @@
           {{scop.$index+1}}
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="userName"  show-overflow-tooltip />
-      <el-table-column label="手机号" align="center" prop="userPhone"  show-overflow-tooltip />
-      <el-table-column label="订单金额（元）" align="center" prop="money"  show-overflow-tooltip >
+      <el-table-column label="姓名" align="left" prop="userName"  show-overflow-tooltip />
+      <el-table-column label="手机号" align="left" prop="userPhone"  show-overflow-tooltip />
+      <el-table-column label="订单金额（元）" align="left" prop="money"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{scope.row.money.toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="异常提示" align="center" prop="errorMessage"  show-overflow-tooltip min-width="150%">
+      <el-table-column label="异常提示" align="left" prop="errorMessage"  show-overflow-tooltip min-width="150%">
         <template slot-scope="scop">
           <span class="danger ">{{scop.row.errorMessage}}</span>
         </template>

src/views/recharge/qrCode/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="86px">
-      <el-form-item label="二维码名称" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="二维码名称:" prop="name">
         <el-input
           v-model.trim="queryParams.name"
           placeholder="请输入身份信息"
@@ -11,9 +11,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -26,15 +26,15 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="二维码名称" align="center" prop="name"  show-overflow-tooltip />
-      <el-table-column label="渠道名称" align="center" prop="topChannelName" show-overflow-tooltip />
-      <el-table-column label="二维码" align="center" prop="qrPath" show-overflow-tooltip  >
+      <el-table-column label="二维码名称" align="left" prop="name"  show-overflow-tooltip />
+      <el-table-column label="渠道名称" align="left" prop="topChannelName" show-overflow-tooltip />
+      <el-table-column label="二维码" align="left" prop="qrPath" show-overflow-tooltip  >
         <template slot-scope="scope" >
           <el-image
             v-if="scope.row.qrPath"
@@ -44,12 +44,12 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/recharge/radio/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="身份信息" prop="identity">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="身份信息:" prop="identity">
         <el-input
           v-model.trim="queryParams.identity"
           placeholder="请输入身份信息"
@@ -11,9 +11,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -27,21 +27,21 @@
     </el-form>
 
 
-    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="身份信息" align="center" prop="identity"  show-overflow-tooltip />
-      <el-table-column label="充值到账比例" align="center" prop="proportion" show-overflow-tooltip />
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="身份信息" align="left" prop="identity"  show-overflow-tooltip />
+      <el-table-column label="充值到账比例" align="left" prop="proportion" show-overflow-tooltip />
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/recharge/reportForm/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
-      <el-form-item label="时间" label-width="40px">
+      <el-form-item label="时间:" >
          <el-date-picker
           style="margin-top:5px;"
           v-model="dateRange"
@@ -13,7 +13,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="报表种类" prop="type">
+      <el-form-item label="报表种类:" prop="type">
          <el-select v-model="queryParams.type" placeholder="请选择报表种类" size="small"  style="width: 80px">
           <el-option label="日" :value="1"/>
           <el-option label="周" :value="2"/>
@@ -21,9 +21,9 @@
           <el-option label="年" :value="4"/>
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain  size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -37,34 +37,34 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="时间" align="center" prop="reportDate"  show-overflow-tooltip />
-      <el-table-column label="报表种类" align="center" show-overflow-tooltip >
+      <el-table-column label="时间" align="left" prop="reportDate"  show-overflow-tooltip />
+      <el-table-column label="报表种类" align="left" show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ scope.row.type == 1 ? '日':scope.row.type ==2 ? '周':scope.row.type ==3 ? '月':scope.row.type ==4 ? '年': '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="总金额" align="center" prop="totalMoney"  show-overflow-tooltip >
+      <el-table-column label="总金额" align="left" prop="totalMoney"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.totalMoney).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="现金" align="center" prop="cashMoney"  show-overflow-tooltip >
+      <el-table-column label="现金" align="left" prop="cashMoney"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.cashMoney).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="微信" align="center" prop="wxMoney"  show-overflow-tooltip >
+      <el-table-column label="微信" align="left" prop="wxMoney"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.wxMoney).toFixed(2) || "0.00"}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付宝" align="center" prop="zfbMoney"  show-overflow-tooltip >
+      <el-table-column label="支付宝" align="left" prop="zfbMoney"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{Number(scope.row.zfbMoney).toFixed(2) || "0.00"}}</span>
         </template>

src/views/system/config/index.vue

@@ -107,19 +107,19 @@
     </el-row>
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="参数主键" align="center" prop="configId" />
-      <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
-      <el-table-column label="参数键值" align="center" prop="configValue" />
-      <el-table-column label="系统内置" align="center" prop="configType" :formatter="typeFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="参数主键" align="left" prop="configId" />
+      <el-table-column label="参数名称" align="left" prop="configName" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键名" align="left" prop="configKey" :show-overflow-tooltip="true" />
+      <el-table-column label="参数键值" align="left" prop="configValue" />
+      <el-table-column label="系统内置" align="left" prop="configType" :formatter="typeFormat" />
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dept/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
+      <el-form-item label="部门名称:" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
           placeholder="请输入部门名称"
@@ -11,7 +11,7 @@
           @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="部门状态" clearable size="small" style="width: 140px">
           <el-option
             v-for="dict in statusOptions"
@@ -21,9 +21,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -41,16 +41,17 @@
       :data="deptList"
       row-key="deptId"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      border
     >
       <el-table-column prop="deptName" label="部门名称" show-overflow-tooltip></el-table-column>
       <!-- <el-table-column prop="orderNum" label="排序" ></el-table-column> -->
       <el-table-column prop="status" label="状态" :formatter="statusFormat" ></el-table-column>
-      <!-- <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
+      <!-- <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" width="250" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="250" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dict/data.vue

@@ -84,28 +84,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编码" align="center" prop="dictCode" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编码" align="left" prop="dictCode" />
+      <el-table-column label="字典标签" align="left" prop="dictLabel">
         <template slot-scope="scope">
           <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{scope.row.dictLabel}}</span>
           <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{scope.row.dictLabel}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="字典键值" align="left" prop="dictValue" />
+      <el-table-column label="字典排序" align="left" prop="dictSort" />
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="备注" align="left" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/dict/index.vue

@@ -113,28 +113,28 @@
     </el-row>
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="dictId" show-overflow-tooltip/>
-      <el-table-column label="字典名称" align="center" prop="dictName" show-overflow-tooltip />
-      <el-table-column label="字典类型" align="center" show-overflow-tooltip>
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="字典编号" align="left" prop="dictId" show-overflow-tooltip/>
+      <el-table-column label="字典名称" align="left" prop="dictName" show-overflow-tooltip />
+      <el-table-column label="字典类型" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
+      <el-table-column label="备注" align="left" prop="remark" show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/menu/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="菜单名称" prop="menuName">
+      <el-form-item label="菜单名称:" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
           placeholder="请输入菜单名称"
@@ -11,7 +11,7 @@
           @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="菜单状态" clearable size="small" style="width: 120px">
           <el-option
             v-for="dict in statusOptions"
@@ -21,9 +21,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -41,9 +41,10 @@
       :data="menuList"
       row-key="menuId"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      border
     >
       <el-table-column prop="menuName" label="菜单名称" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="icon" label="图标" align="center" width="100">
+      <el-table-column prop="icon" label="图标" align="left" width="100">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon" />
         </template>
@@ -52,12 +53,12 @@
       <el-table-column prop="perms" label="权限标识" show-overflow-tooltip></el-table-column>
       <el-table-column prop="component" label="组件路径" show-overflow-tooltip></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" show-overflow-tooltip></el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" show-overflow-tooltip>
+      <el-table-column label="创建时间" align="left" prop="createTime" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini"
             type="text"

src/views/system/notice/index.vue

@@ -72,35 +72,35 @@
     </el-row>
 
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="序号" align="left" prop="noticeId" width="100" />
       <el-table-column
         label="公告标题"
-        align="center"
+        align="left"
         prop="noticeTitle"
         :show-overflow-tooltip="true"
       />
       <el-table-column
         label="公告类型"
-        align="center"
+        align="left"
         prop="noticeType"
         :formatter="typeFormat"
         width="100"
       />
       <el-table-column
         label="状态"
-        align="center"
+        align="left"
         prop="status"
         :formatter="statusFormat"
         width="100"
       />
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
+      <el-table-column label="创建者" align="left" prop="createBy" width="100" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/post/index.vue

@@ -83,18 +83,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
-      <el-table-column label="岗位编码" align="center" prop="postCode" />
-      <el-table-column label="岗位名称" align="center" prop="postName" />
-      <el-table-column label="岗位排序" align="center" prop="postSort" />
-      <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column type="selection" width="55" align="left" />
+      <el-table-column label="岗位编号" align="left" prop="postId" />
+      <el-table-column label="岗位编码" align="left" prop="postCode" />
+      <el-table-column label="岗位名称" align="left" prop="postName" />
+      <el-table-column label="岗位排序" align="left" prop="postSort" />
+      <el-table-column label="状态" align="left" prop="status" :formatter="statusFormat" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/product/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公司名称" prop="name">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+      <el-form-item label="公司名称:" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入公司名称"
@@ -11,8 +11,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item>
+      <el-form-item class="right">
+        <el-button plain size="mini" @click="resetQuery">重置</el-button>
         <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      </el-form-item>
+      <br>
+      <el-form-item>
         <el-button
           type="primary"
           size="mini"
@@ -22,14 +26,14 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="adminList" >
-      <el-table-column label="序号" align="center" prop="" show-overflow-tooltip >
+    <el-table v-loading="loading" :data="adminList" border>
+      <el-table-column label="序号" align="left" prop="" show-overflow-tooltip >
         <template slot-scope="scope">
          {{scope.$index + 1}}
         </template>
       </el-table-column>
-      <el-table-column label="公司名称" align="center" prop="name" show-overflow-tooltip/>
-      <el-table-column label="公司介绍" align="center" prop="introduce" show-overflow-tooltip />
+      <el-table-column label="公司名称" align="left" prop="name" show-overflow-tooltip/>
+      <el-table-column label="公司介绍" align="left" prop="introduce" show-overflow-tooltip />
       <el-table-column label="公司LOGO">
         <template width="90" slot-scope="scope" >
            <el-image
@@ -40,12 +44,12 @@
           </el-image>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/role/authUser.vue

@@ -62,22 +62,22 @@
     </el-row>
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="left" />
       <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
       <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
       <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
       <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/system/role/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="角色名称" prop="roleName">
+      <el-form-item label="角色名称:" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
           placeholder="请输入角色名称"
@@ -11,7 +11,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
+      <el-form-item label="权限字符:" prop="roleKey">
         <el-input
           v-model="queryParams.roleKey"
           placeholder="请输入权限字符"
@@ -21,7 +21,7 @@
           @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="角色状态"
@@ -49,9 +49,9 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+      <el-form-item class="right">
         <el-button plain size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
       <br>
       <el-form-item>
@@ -71,13 +71,13 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" >
-      <el-table-column type="selection" width="55" align="center"  show-overflow-tooltip />
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="55" align="left"  show-overflow-tooltip />
       <el-table-column label="角色编号" prop="roleId"  show-overflow-tooltip />
       <el-table-column label="角色名称" prop="roleName"  show-overflow-tooltip  />
       <el-table-column label="权限字符" prop="roleKey"  show-overflow-tooltip  />
       <el-table-column label="显示顺序" prop="roleSort"  show-overflow-tooltip  />
-      <el-table-column label="状态" align="center"  show-overflow-tooltip >
+      <el-table-column label="状态" align="left"  show-overflow-tooltip >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -87,12 +87,12 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip >
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"

src/views/system/role/selectUser.vue

@@ -32,12 +32,12 @@
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
-        <el-table-column label="状态" align="center" prop="status">
+        <el-table-column label="状态" align="left" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="statusOptions" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <el-table-column label="创建时间" align="left" prop="createTime" width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>

src/views/system/security/index.vue

@@ -8,9 +8,17 @@
           @click="handleAdd"
           v-hasPermi="['system:role:add']"
         >新增</el-button>
+        <!-- <el-button
+          plain
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >删除</el-button> -->
       </el-col>
     </el-row>
-    <el-table v-loading="loading" :data="adminList" >
+    <el-table v-loading="loading" :data="adminList" @selection-change="handleSelectionChange" border>
+      <el-table-column type="selection" width="50" align="left" />
       <el-table-column label="编号" prop="id"   show-overflow-tooltip />
       <el-table-column label="密码长度不少于" prop="pwdLength"  show-overflow-tooltip >
         <template slot-scope="scope">
@@ -25,7 +33,7 @@
             : scope.row.loseDate == 1440 ? "1天" : ""}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="默认账户" align="center" >
+      <el-table-column label="默认账户" align="left" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.isEnable"
@@ -34,7 +42,7 @@
         </template>
       </el-table-column>
 
-      <!-- <el-table-column label="大小写敏感" align="center" width="100">
+      <!-- <el-table-column label="大小写敏感" align="left" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.status"
@@ -44,11 +52,11 @@
           ></el-switch>
         </template>y
       </el-table-column> -->
-      <el-table-column label="创建人" align="center" prop="createBy"  show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime"  show-overflow-tooltip />
-      <!-- <el-table-column label="修改人" align="center" prop="updateBy"  show-overflow-tooltip/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  show-overflow-tooltip/> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="创建人" align="left" prop="createBy"  show-overflow-tooltip />
+      <el-table-column label="创建时间" align="left" prop="createTime"  show-overflow-tooltip />
+      <!-- <el-table-column label="修改人" align="left" prop="updateBy"  show-overflow-tooltip/>
+      <el-table-column label="修改时间" align="left" prop="updateTime"  show-overflow-tooltip/> -->
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" >
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
             size="mini"
@@ -110,8 +118,7 @@
             <el-form-item label="默认账户" prop="isEnable">
               <el-switch
                 v-model="form.isEnable"
-                active-color="#13ce66"
-                inactive-color="#ff4949">
+                >
               </el-switch>
             </el-form-item>
           </el-col>
@@ -301,6 +308,13 @@ export default {
           this.msgSuccess("删除成功");
         }).catch(() => {});
     },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      console.log(this.ids)
+    },
   }
 };
 </script>

src/views/system/user/authRole.vue

@@ -18,16 +18,16 @@
 
     <h4 class="form-header h4">角色信息</h4>
     <el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="table" @selection-change="handleSelectionChange" :data="roles.slice((pageNum-1)*pageSize,pageNum*pageSize)">
-      <el-table-column label="序号" type="index" align="center">
+      <el-table-column label="序号" type="index" align="left">
         <template slot-scope="scope">
           <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-      <el-table-column label="角色编号" align="center" prop="roleId" />
-      <el-table-column label="角色名称" align="center" prop="roleName" />
-      <el-table-column label="权限字符" align="center" prop="roleKey" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="角色编号" align="left" prop="roleId" />
+      <el-table-column label="角色名称" align="left" prop="roleName" />
+      <el-table-column label="权限字符" align="left" prop="roleKey" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>

src/views/system/user/index.vue

@@ -25,8 +25,8 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" >
+          <el-form-item label="用户名称:" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="请输入用户名称"
@@ -36,7 +36,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
+          <el-form-item label="手机号码:" prop="phonenumber">
             <el-input
               v-model="queryParams.phonenumber"
               placeholder="请输入手机号码"
@@ -46,7 +46,7 @@
               @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="用户状态"
@@ -62,7 +62,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
+          <el-form-item label="创建时间:">
             <el-date-picker
               v-model="dateRange"
               size="small"
@@ -74,9 +74,9 @@
               end-placeholder="结束日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item>
-            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
+          <el-form-item class="right">
             <el-button plain size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary"  size="mini" @click="handleQuery">搜索</el-button>
           </el-form-item>
           <br>
           <el-form-item>
@@ -96,14 +96,14 @@
           </el-form-item>
         </el-form>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" >
-          <el-table-column type="selection" width="50" align="center" />
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
+          <el-table-column type="selection" width="50" align="left" />
           <el-table-column label="用户编号" width="80" lign="center" key="userId" prop="userId" v-if="columns[0].visible"  show-overflow-tooltip />
-          <el-table-column label="账户名称" width="120" align="center" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
-          <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip />
-          <el-table-column label="状态" width="80" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column label="账户名称" width="120" align="left" key="userName" prop="userName" v-if="columns[1].visible"  show-overflow-tooltip  />
+          <el-table-column label="用户名称" align="left" key="nickName" prop="nickName" v-if="columns[2].visible"  show-overflow-tooltip  />
+          <el-table-column label="部门" align="left" key="deptName" prop="dept.deptName" v-if="columns[3].visible"  show-overflow-tooltip  />
+          <el-table-column label="手机号码" align="left" key="phonenumber" prop="phonenumber" v-if="columns[4].visible"  show-overflow-tooltip />
+          <el-table-column label="状态" width="80" align="left" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -113,14 +113,14 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible"  show-overflow-tooltip >
+          <el-table-column label="创建时间" align="left" prop="createTime" v-if="columns[6].visible"  show-overflow-tooltip >
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column
             label="操作"
-            align="center"
+            align="left"
             width="160"
             class-name="small-padding fixed-width"
           >