Merge branch 'master' of http://gitlab.91isoft.com:90/zhangbotao/nlt-e-cigarette

src/views/system/dept/index.vue

@@ -99,12 +99,14 @@
             <div>Status</div>
           </template>
           <template slot-scope="scope">
+            <div style="text-align: center">
             <el-switch
               v-model="scope.row.flag"
               active-value="1"
               inactive-value="0"
               @change="handleStatusChange(scope.row)"
             />
+            </div>
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" align="center" prop="createDate" width="200">
@@ -150,7 +152,6 @@
               v-hasPermi="['sys:dept:update']"
               size="mini"
               type="success"
-              style="margin-left: 10px"
               @click="handleUpdate(scope.row)"
             >修改</el-link>
             <el-link
@@ -585,9 +586,9 @@ export default {
     line-height: 20px;
     margin-left: 15px
   }
-  .el-switch{
-    margin-left: 15px;
-  }
+  //.el-switch{
+  //  margin-left: 15px;
+  //}
   .icon-list {
     div {
       white-space: nowrap;

src/views/system/dict/index.vue

@@ -2,82 +2,76 @@
   <div class="app-container-dict">
     <div class="dictSearch">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="auto">
-        <el-row>
-          <el-col :span="19">
-            <el-form-item label="字典名称" prop="dictName">
-              <div slot="label" class="labelClass">
-                <div>字典名称</div>
-                <div>Dict Name</div>
-              </div>
-              <el-input
-                v-model="queryParams.dictName"
-                placeholder="请输入字典名称"
-                clearable
-                :maxlength="30"
-                size="small"
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="字典类型" prop="dictType">
-              <div slot="label" class="labelClass">
-                <div>字典类型</div>
-                <div>Dict Type</div>
-              </div>
-              <el-input
-                v-model="queryParams.dictType"
-                placeholder="请输入字典类型"
-                clearable
-                :maxlength="30"
-                size="small"
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="flag" label-width="50px">
-              <div slot="label" class="labelClass">
-                <div>状态</div>
-                <div>Status</div>
-              </div>
-              <el-select
-                v-model="queryParams.flag"
-                placeholder="字典状态"
-                clearable
-                size="small"
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="dict in statusOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="创建时间">
-              <div slot="label" class="labelClass">
-                <div>创建时间</div>
-                <div>Build Time</div>
-              </div>
-              <el-date-picker
-                v-model="dateRange"
-                size="small"
-                style="width: 300px"
-                value-format="yyyy-MM-dd"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-            <el-form-item style="float: right">
-              <el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
-              <el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-form-item label="字典名称" prop="dictName">
+          <div slot="label" class="labelClass">
+            <div>字典名称</div>
+            <div>Dict Name</div>
+          </div>
+          <el-input
+            v-model="queryParams.dictName"
+            placeholder="请输入字典名称"
+            clearable
+            :maxlength="30"
+            size="small"
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="字典类型" prop="dictType">
+          <div slot="label" class="labelClass">
+            <div>字典类型</div>
+            <div>Dict Type</div>
+          </div>
+          <el-input
+            v-model="queryParams.dictType"
+            placeholder="请输入字典类型"
+            clearable
+            :maxlength="30"
+            size="small"
+            style="width: 200px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="flag" label-width="50px">
+          <div slot="label" class="labelClass">
+            <div>状态</div>
+            <div>Status</div>
+          </div>
+          <el-select
+            v-model="queryParams.flag"
+            placeholder="字典状态"
+            clearable
+            size="small"
+            style="width: 200px"
+          >
+            <el-option
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <div slot="label" class="labelClass">
+            <div>创建时间</div>
+            <div>Build Time</div>
+          </div>
+          <el-date-picker
+            v-model="dateRange"
+            size="small"
+            style="width: 300px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button class="redBtn" type="danger" size="small" @click="handleQuery">查询 Query</el-button>
+          <el-button class="resetBtn" size="small" @click="resetQuery">重置 Reset</el-button>
+        </el-form-item>
         <el-row :gutter="10" class="mb8">
           <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
         </el-row>

src/views/system/user/index.vue

@@ -282,7 +282,6 @@
                 v-hasPermi="['sys:user:update']"
                 size="mini"
                 type="success"
-                style="margin-left: 10px"
                 @click="handleUpdate(scope.row)"
               >修改</el-link>
               <el-link