Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-elevue

src/views/data/config/index.vue

@@ -1,11 +1,10 @@
 <template>
   <PageWrapper>
     <el-row :gutter="10" class="mt-3">
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+      <el-col :xs="24" :sm="24" :md="7" :lg="7" :xl="7">
         <el-card shadow="hover" class="border-0">
           <template #header>
-            <el-row>
+            <el-space>
-              <el-col :span="18">
                 <el-input type="text" v-model="params.name" clearable placeholder="请输入配置名称">
                   <template #prefix>
                     <el-icon class="el-input__icon">
@@ -13,8 +12,6 @@
                     </el-icon>
                   </template>
                 </el-input>
-              </el-col>
-              <el-col :span="6" style="text-align: right">
                 <el-button
                   type="primary"
                   icon="Search"
@@ -25,8 +22,7 @@
                 >
                   查询
                 </el-button>
-              </el-col>
+            </el-space>
-            </el-row>
             <div style="margin-top: 15px">
               <el-button type="primary" icon="Plus" @click="handleAdd" v-perm="['sys:config:add']"
                 >新建</el-button
@@ -65,7 +61,7 @@
           />
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
+      <el-col :xs="24" :sm="24" :md="17" :lg="17" :xl="17">
         <el-card shadow="hover" class="mb-4 border-0 proCard">
           <configItem :configId="configId" v-if="configItemShow" />
         </el-card>

src/views/data/dict/index.vue

@@ -1,11 +1,10 @@
 <template>
   <PageWrapper>
     <el-row :gutter="10" class="mt-3">
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+      <el-col :xs="24" :sm="24" :md="7" :lg="7" :xl="7">
         <el-card shadow="hover" class="border-0">
           <template #header>
-            <el-row>
+            <el-space>
-              <el-col :span="10">
                 <el-input type="text" v-model="params.name" clearable placeholder="请输入字典名称">
                   <template #prefix>
                     <el-icon class="el-input__icon">
@@ -13,8 +12,6 @@
                     </el-icon>
                   </template>
                 </el-input>
-              </el-col>
-              <el-col :span="14" style="text-align: right">
                 <el-button
                   type="primary"
                   icon="Search"
@@ -28,12 +25,10 @@
                   type="primary"
                   icon="RefreshRight"
                   @click="dictRefresh"
-                  style="margin-left: 8px"
                   v-perm="['sys:dict:cache']"
                   >刷新缓存</el-button
                 >
-              </el-col>
+            </el-space>
-            </el-row>
             <div style="margin-top: 15px">
               <el-button type="primary" icon="Plus" @click="handleAdd" v-perm="['sys:dict:add']"
                 >新建</el-button
@@ -72,7 +67,7 @@
           />
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
+      <el-col :xs="24" :sm="24" :md="17" :lg="17" :xl="17">
         <el-card shadow="hover" class="mb-4 border-0 proCard">
           <dictItem :dictId="dictId" v-if="dictItemShow" />
         </el-card>