仓库定义组件

src/views/warehouseManagement/picking/index.vue

@@ -135,7 +135,7 @@
             minWidth: 110
           },
           {
-            prop: 'createName',
+            prop: 'createUserName',
             label: '拣货人',
             align: 'center',
             showOverflowTooltip: true,

src/views/warehouseManagement/warehouseDefinition/index.vue

@@ -178,99 +178,29 @@
         </div>
       </div>
       <div v-else class="warehouse-container">
-        <el-table
+        <ele-pro-table
           ref="table"
-          :data="warehouse"
-          tooltip-effect="dark"
-          style="width: 100%"
-          stripe
+          :columns="columns"
+          :datasource="warehouse"
+          height="calc(100vh - 350px)"
+          style="margin-bottom: 10px"
+          full-height="calc(100vh - 116px)"
+          tool-class="ele-toolbar-form"
+          :selection.sync="selection"
+          :page-size="20"
+          @columns-change="handleColumnChange"
+          :cache-key="cacheKeyUrl"
+          :needPage="false"
         >
-          <el-table-column label="序号" type="index" width="50" align="center">
-          </el-table-column>
-          <el-table-column
-            label="仓库名称"
-            prop="name"
-            :show-overflow-tooltip="true"
-            width="120"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="仓库编码"
-            prop="code"
-            :show-overflow-tooltip="true"
-            align="center"
-          ></el-table-column>
-          <el-table-column label="状态" prop="status" align="center">
-            <template slot-scope="{ row, $index }">
-              {{
-                row.status !== null
-                  ? warehouseDefinition_statusList.filter(
-                      (item) => item.code == row.status
-                    )[0].label
-                  : ''
-              }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="所属工厂"
-            prop="factoryName"
-            align="center"
-            :show-overflow-tooltip="true"
-            width="120"
-          >
-            <template slot-scope="{ row, $index }">
-              <!-- {{ filterFactoryId(row.factoryName) }} -->
-              {{ row.factoryName }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="仓库类型"
-            prop="inventoryName"
-            :show-overflow-tooltip="true"
-            align="center"
-          >
-            <!-- <template slot-scope="{ row, $index }">
-              {{ getDictValue('仓库类型', row.inventoryType) }}
-            </template> -->
-          </el-table-column>
-          <el-table-column
-            label="库区数"
-            prop="areaNumber"
-            :show-overflow-tooltip="true"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="货架数"
-            prop="goodNumber"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="货位数"
-            prop="allocationNumber"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            label="空货位数"
-            prop="emptyAllocationNumber"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            width="300"
-            align="center"
-            fixed="right"
-          >
-            <template v-slot="{ row, $index }">
-              <el-button type="text" @click="add(row)">修改</el-button>
-              <el-button type="text" @click="locationManage(row)"
-                >货位</el-button
-              >
-              <el-button type="text" @click="details(row)">详情</el-button>
-              <el-button type="text" @click="remove(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+          <!-- 操作列 -->
+          <template v-slot:action="{ row }">
+            <el-button type="text" @click="add(row)">修改</el-button>
+            <el-button type="text" @click="locationManage(row)">货位</el-button>
+            <el-button type="text" @click="details(row)">详情</el-button>
+            <el-button type="text" @click="remove(row)">删除</el-button>
+          </template>
+        </ele-pro-table>
+      
       </div>
     </el-card>
     <WarehouseEdit ref="warehouseEditRef" @success="handleList" />
@@ -293,14 +223,15 @@
   // import selectTree from '@/components/selectTree';
   import WarehouseEdit from './components/WarehouseEdit';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
-  // import dictMixins from '@/mixins/dictMixins';
+  import tabMixins from '@/mixins/tableColumnsMixin';
+
   export default {
     // components: { selectTree, tablePagination, WarehouseEdit },
     components: { WarehouseEdit },
     computed: {
       ...mapGetters(['dict', 'getDict', 'getDictValue'])
     },
-    // mixins: [dictMixins],
+    mixins: [tabMixins],
     data() {
       return {
         isTable: false,
@@ -313,6 +244,98 @@
           emptyAllocationEnd: '',
           emptyAllocationStart: ''
         },
+        cacheKeyUrl: 'wms-c2e9664a-warehouseDefinition-index',
+
+        columns: [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            showOverflowTooltip: true,
+            fixed: 'left'
+          },
+          {
+            prop: 'name',
+            label: '仓库名称',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180
+          },
+          {
+            prop: 'code',
+            label: '仓库编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180
+          },
+          {
+            prop: 'code',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            formatter: (_row, _column, cellValue) => {
+              return _row.status !== null
+                ? warehouseDefinition_statusList.filter(
+                    (item) => item.code == _row.status
+                  )[0].label
+                : '';
+            }
+          },
+          {
+            prop: 'factoryName',
+            label: '所属工厂',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180
+          },
+          {
+            prop: 'inventoryName',
+            label: '仓库类型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180
+          },
+          {
+            prop: 'areaNumber',
+            label: '库区数',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 130
+          },
+          {
+            prop: 'goodNumber',
+            label: '货架数',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 130
+          },
+          {
+            prop: 'allocationNumber',
+            label: '货位数',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 130
+          },
+          {
+            prop: 'emptyAllocationNumber',
+            label: '空货位数',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 130
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 250,
+            align: 'center',
+            resizable: false,
+            slot: 'action',
+            showOverflowTooltip: true,
+            fixed: 'right'
+          }
+        ],
         warehouseDefinition_statusList,
         warehouseDefinition_inventoryList: [
           { code: 1, label: '物料仓' },