From 3e03b110e9a8a63f4d2759a7917624a8338ac248 Mon Sep 17 00:00:00 2001
From: cookiemy <1946749843@qq.com>
Date: Tue, 2 Jul 2024 16:47:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/product/base/attribute/index.vue    | 38 +++++----------
 .../src/views/product/base/mfrs/index.vue     | 47 +++++--------------
 .../src/views/product/base/unit/index.vue     | 32 +++++--------
 3 files changed, 35 insertions(+), 82 deletions(-)

diff --git a/jjj_erp_admin/src/views/product/base/attribute/index.vue b/jjj_erp_admin/src/views/product/base/attribute/index.vue
index 01418fa..e2649bc 100644
--- a/jjj_erp_admin/src/views/product/base/attribute/index.vue
+++ b/jjj_erp_admin/src/views/product/base/attribute/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="product-list bgset">
+  <div class="product-list bgset set-main">
     <!--搜索表单-->
     <div class="common-seach-wrap">
       <el-form
@@ -28,8 +28,9 @@
         >
       </el-form>
     </div>
-    <div class="common-level-rail">
-      <el-button
+    <div class="common-level-rail d-b-c">
+       <div class="d-s-c flex-1">
+         <el-button
         size="small"
         type="primary"
         icon="Plus"
@@ -37,17 +38,15 @@
         v-auth="'/product/base/attribute/add'"
         >新增</el-button
       >
-      <!-- <el-button
-        size="small"
-        type="warning"
-        @click="showBatchDelivery"
-        v-auth="'/product/base/attribute/delete'"
-        >删除</el-button
-      > -->
+       </div>
+         <!-- 分页 -->
+			<el-pagination small @size-change="handleSizeChange" @current-change="handleCurrentChange" background
+				:page-sizes="[20, 50, 100]" :current-page="curPage" :page-size="pageSize"
+				layout="total, prev, next, jumper,sizes" :total="totalDataNumber">
+			</el-pagination>
+     
     </div>
     <!--内容-->
-    <div class="product-content">
-      <div class="table-wrap">
         <el-table
           size="small"
           :data="tableData"
@@ -80,7 +79,6 @@
           <el-table-column prop="createTime" label="创建时间"></el-table-column>
           <el-table-column prop="updateTime" label="更新时间"></el-table-column>
         </el-table>
-      </div>
 
       <Add
         v-if="open_add"
@@ -93,20 +91,6 @@
         :form="categoryModel"
         @closeDialog="closeDialogFunc($event, 'edit')"
       ></Edit>
-      <!--分页-->
-      <div class="pagination">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          background
-          :current-page="curPage"
-          :page-size="pageSize"
-          layout="total, prev, pager, next, jumper"
-          :total="totalDataNumber"
-        >
-        </el-pagination>
-      </div>
-    </div>
   </div>
 </template>
 <script>
diff --git a/jjj_erp_admin/src/views/product/base/mfrs/index.vue b/jjj_erp_admin/src/views/product/base/mfrs/index.vue
index 75029f5..67a7de3 100644
--- a/jjj_erp_admin/src/views/product/base/mfrs/index.vue
+++ b/jjj_erp_admin/src/views/product/base/mfrs/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="product-list bgset">
+  <div class="product-list bgset set-main">
     <!--搜索表单-->
     <div class="common-seach-wrap">
       <el-tabs v-model="activeName" @tab-change="handleClick">
@@ -23,22 +23,6 @@
             placeholder="请输入品牌名称"
           ></el-input
         ></el-form-item>
-        <!-- <el-form-item label="状态">
-          <el-select
-            size="small"
-            v-model="searchForm.categoryId"
-            placeholder="所有分类"
-          >
-            <el-option label="全部" value="0"></el-option>
-            <el-option
-              v-for="(item, index) in categoryList"
-              :key="index"
-              :label="item.name"
-              :value="item.categoryId"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
-
         <el-form-item>
           <el-button size="small" type="primary" icon="Search" @click="onSubmit"
             >查询</el-button
@@ -46,16 +30,23 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="common-level-rail">
-      <el-button size="small" type="primary" icon="Plus" @click="addClick"
+    <div class="common-level-rail d-b-c">
+      <div class="d-s-c flex-1">
+				 <el-button size="small" type="primary" icon="Plus" @click="addClick"
         >新增</el-button
       >
+			</div>
+			<!-- 分页 -->
+			<el-pagination small @size-change="handleSizeChange" @current-change="handleCurrentChange" background
+				:page-sizes="[20, 50, 100]" :current-page="curPage" :page-size="pageSize"
+				layout="total, prev, next, jumper,sizes" :total="totalDataNumber">
+			</el-pagination>
+     
     </div>
 
     <!--内容-->
-    <div class="product-content">
-      <div class="table-wrap">
         <el-table
+         class="flex-1"
           size="small"
           :data="tableData"
           border
@@ -97,20 +88,6 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间"></el-table-column>
         </el-table>
-      </div>
-    </div>
-    <!--分页-->
-    <div class="pagination">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        background
-        :current-page="curPage"
-        :page-size="pageSize"
-        layout="total, prev, pager, next, jumper"
-        :total="totalDataNumber"
-      ></el-pagination>
-    </div>
   </div>
 </template>
 
diff --git a/jjj_erp_admin/src/views/product/base/unit/index.vue b/jjj_erp_admin/src/views/product/base/unit/index.vue
index b2ae9e0..45b6e66 100644
--- a/jjj_erp_admin/src/views/product/base/unit/index.vue
+++ b/jjj_erp_admin/src/views/product/base/unit/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="product bgset">
+  <div class="product bgset set-main">
     <!--搜索表单-->
     <div class="common-seach-wrap">
       <el-form
@@ -41,8 +41,9 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="common-level-rail">
-      <el-button
+    <div class="common-level-rail d-b-c">
+       <div class="d-s-c flex-1">
+				  <el-button
         size="small"
         type="primary"
         icon="Plus"
@@ -68,12 +69,18 @@
         :disabled="selectedRows.length == 0 || selectedRows[0].enabled == null"
         >禁用</el-button
       >
+			</div>
+      <!-- 分页 -->
+			<el-pagination small @size-change="handleSizeChange" @current-change="handleCurrentChange" background
+				:page-sizes="[20, 50, 100]" :current-page="curPage" :page-size="pageSize"
+				layout="total, prev, next, jumper,sizes" :total="totalDataNumber">
+			</el-pagination>
+     
     </div>
     <!--内容-->
-    <div class="product-content">
-      <div class="table-wrap">
         <el-table
           size="small"
+           class="flex-1"
           :data="tableData"
           border
           style="width: 100%"
@@ -117,7 +124,6 @@
             width="140"
           ></el-table-column>
         </el-table>
-      </div>
       <Add
         v-if="open_add"
         :open_add="open_add"
@@ -129,20 +135,6 @@
         :editForm="categoryModel"
         @closeDialog="closeDialogFunc($event, 'edit')"
       ></Edit>
-      <!--分页-->
-      <div class="pagination">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          background
-          :current-page="curPage"
-          :page-size="pageSize"
-          layout="total, prev, pager, next, jumper"
-          :total="totalDataNumber"
-        >
-        </el-pagination>
-      </div>
-    </div>
   </div>
 </template>