物料分类

ruoyi-admin-vue/src/views/inventory/materials/index.vue

 <template>
-  <div class="app-container" style="overflow: hidden;">
-    <splitpanes class="default-theme">
-      <!-- 树结构：左侧面板 -->
-      <pane size="16" style="overflow: auto;">
+  <div class="app-container">
+    <PageTitle>
+      <template #buttons>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="medium"
+          @click="handleAdd"
+          v-hasPermi="['inventory:materials:add']"
+        >新增</el-button>
+      
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="medium"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['inventory:materials:edit']"
+        >修改</el-button>
+      
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="medium"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['inventory:materials:remove']"
+        >删除</el-button>
+      
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-upload2"
+          size="medium"
+          @click="handleImport"
+          v-hasPermi="['inventory:materials:import']"
+        >导入</el-button>
+      
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="medium"
+          @click="handleExport"
+          v-hasPermi="['inventory:materials:export']"
+        >导出</el-button>
+
+      </template>
+    </PageTitle>
+
+
+    <div class="page-container-noback flex1">
+      <div class="flex-container flex1" style="min-height: 200px;overflow: hidden;">
+        <div class="card-container shadow" style="overflow: auto;min-width: 16%;">
           <TreeComponent
             ref="treeComponent"
             :tree-data="categoryTreeData"
@@ -22,13 +75,16 @@
               </span>
             </template>
           </TreeComponent>
-      </pane>
-
-      <!-- 物料管理：右侧面板 -->
-      <pane size="84" style="overflow: auto;">
-        <!-- 右侧内容保持不变 -->
-        <div style="padding: 10px; display: flex; flex-direction: column;">
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+        </div>
+        <div class="card-container shadow flex1 right-card flex-container" style="flex-direction: column;padding: 20px;min-height: 200px;">
+
+          <page-wrapper-search 
+            :model="queryParams" 
+            ref="queryForm" 
+            size="small" 
+            @search="handleQuery"
+            @reset="resetQuery"
+          >
             <el-form-item label="物料编码" prop="materialCode">
               <el-input
                 v-model="queryParams.materialCode"
@@ -77,71 +133,13 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
+          </page-wrapper-search>
 
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['inventory:materials:add']"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="success"
-                plain
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['inventory:materials:edit']"
-              >修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['inventory:materials:remove']"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="success"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleImport"
-                v-hasPermi="['inventory:materials:import']"
-              >导入</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="warning"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="['inventory:materials:export']"
-              >导出</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-          </el-row>
-
-          <el-table v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange" :scroll-x="true">
+          <!-- 树形数据表格 -->
+          <div style="flex: 1;min-height: 200px;">
+            <el-table v-loading="loading" height="100%" :data="materialsList" @selection-change="handleSelectionChange" :scroll-x="true">
             <!-- 表格列保持不变 -->
-            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column type="selection" width="55" align="center" fixed/>
             <el-table-column type="index" label="序号" align="center"/>
             <el-table-column label="物料编码" align="center" prop="materialCode" width="120"/>
             <el-table-column label="物料名称" align="center" prop="materialName"  width="150"/>
@@ -211,6 +209,8 @@
             </el-table-column>
             </el-table>
 
+          
+          </div>
           <pagination
             v-show="total>0"
             :total="total"
@@ -219,8 +219,8 @@
             @pagination="getList"
           />
         </div>
-      </pane>
-    </splitpanes>
+      </div>
+    </div>
 
     <!-- 添加或修改物料对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
@@ -801,16 +801,8 @@ export default {
 }
 </script>
 
-<style scoped>
-.app-container {
-  height: 100vh;
-}
-
-.custom-tree-node {
-  font-size: 14px;
-}
-
-.mb8 {
-  margin-bottom: 8px;
+<style lang="scss" scoped>
+.right-card {
+  margin-left: var(--container-pd);
 }
 </style>

ruoyi-admin-vue/src/views/inventory/materials_category/index.vue

@@ -6,6 +6,7 @@
         <el-button
           type="primary"
           plain
+          size="medium"
           icon="el-icon-plus"
           @click="handleAdd"
           v-hasPermi="['inventory:materials_category:add']"
@@ -14,6 +15,7 @@
         <el-button
           type="info"
           plain
+          size="medium"
           icon="el-icon-sort"
           @click="toggleExpandAll"
         >展开/折叠</el-button>
@@ -21,6 +23,7 @@
         <el-button
           type="warning"
           plain
+          size="medium"
           icon="el-icon-download"
           @click="handleExport"
           v-hasPermi="['inventory:materials_category:export']"
@@ -30,7 +33,7 @@
     </PageTitle>
 
     <div class="page-container-noback flex1">
-      <div class="flex-container flex1" style="min-height: 200px;">
+      <div class="flex-container flex1" style="min-height: 200px;overflow: hidden;">
         <div class="card-container shadow" style="overflow: auto;min-width: 16%;">
           <TreeComponent
             :tree-data="categoryOptions"