From 8bf05b0864422c94384b7155ec04660f5c21094a Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期二, 15 七月 2025 14:48:44 +0800
Subject: [PATCH] 库位管理添加库位状态筛选功能
---
zy-asrs-admin/src/views/base/loc/index.vue | 21 +++-------
zy-asrs-admin/src/views/base/mat/index.vue | 33 ----------------
zy-asrs-admin/src/views/base/locAreaType/index.vue | 9 ----
3 files changed, 6 insertions(+), 57 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index 6ee7b1d..ac3f02a 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -23,6 +23,7 @@
row1: null,
bay1: null,
lev1: null,
+ locStsId: null,
barcode: null,
})
const editChild = ref(null)
@@ -47,98 +48,84 @@
dataIndex: 'locNo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('locNo'),
},
{
title: formatMessage('db.man_loc.loc_sts_id', '搴撲綅鐘舵��'),
dataIndex: 'locStsId$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('locStsId$'),
},
{
title: formatMessage('db.man_loc.row1', '鎺�'),
dataIndex: 'row1',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('row1'),
},
{
title: formatMessage('db.man_loc.bay1', '鍒�'),
dataIndex: 'bay1',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('bay1'),
},
{
title: formatMessage('db.man_loc.lev1', '灞�'),
dataIndex: 'lev1',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('lev1'),
},
{
title: formatMessage('db.man_loc.barcode', '鏉＄爜'),
dataIndex: 'barcode',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('barcode'),
},
{
title: formatMessage('db.man_loc.uuid', '缂栧彿'),
dataIndex: 'uuid',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('uuid'),
},
{
title: formatMessage('db.man_loc.flag', '鏍囪瘑'),
dataIndex: 'flag',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('flag'),
},
{
title: formatMessage('db.man_loc.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('status$'),
},
{
title: formatMessage('db.man_loc.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.man_loc.create_by', '娣诲姞浜哄憳'),
dataIndex: 'createBy$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('createBy$'),
},
{
title: formatMessage('db.man_loc.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.man_loc.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
},
{
title: formatMessage('db.man_loc.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('memo'),
},
{
@@ -282,7 +269,11 @@
style="width: 140px;margin-right: 10px;" />
<a-input v-model:value="searchParam.barcode" :placeholder="formatMessage('page.loc.barcode.input', '璇疯緭鍏ユ潯鐮�')"
style="width: 140px;margin-right: 10px;" />
-
+ <a-select v-model:value="searchParam.locStsId" :placeholder="formatMessage('page.locDetl.orderNo.input', '閫夋嫨搴撲綅鐘舵��')"
+ :options="[
+ { label: '鍏ㄩ儴', value: null }, { label: '鍦ㄥ簱', value: 1 }, { label: '绌哄簱', value: 2 }, { label: '绌烘澘', value: 3 },
+ { label: '鍏ュ簱棰勭害', value: 4 }, { label: '鍑哄簱棰勭害', value: 5 }, { label: '绂佺敤', value: 6 }]" style="width: 140px;margin-right: 10px;">
+ </a-select>
<a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
style="width: 200px;" @search="onSearch" />
</div>
diff --git a/zy-asrs-admin/src/views/base/locAreaType/index.vue b/zy-asrs-admin/src/views/base/locAreaType/index.vue
index 43a1cbf..2e11daf 100644
--- a/zy-asrs-admin/src/views/base/locAreaType/index.vue
+++ b/zy-asrs-admin/src/views/base/locAreaType/index.vue
@@ -42,63 +42,54 @@
dataIndex: 'type$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('type$'),
},
{
title: formatMessage('db.man_loc_area_type.uuid', '缂栧彿'),
dataIndex: 'uuid',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('uuid'),
},
{
title: formatMessage('db.man_loc_area_type.sort', '鎺掑簭'),
dataIndex: 'sort',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('sort'),
},
{
title: formatMessage('db.man_loc_area_type.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('status$'),
},
{
title: formatMessage('db.man_loc_area_type.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.man_loc_area_type.create_by', '娣诲姞浜哄憳'),
dataIndex: 'createBy$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('createBy$'),
},
{
title: formatMessage('db.man_loc_area_type.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.man_loc_area_type.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
},
{
title: formatMessage('db.man_loc_area_type.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('memo'),
},
{
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index 9ab681f..048d5b8 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -67,196 +67,168 @@
dataIndex: 'id',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('id'),
},
{
title: formatMessage('db.man_mat.tag_id', '鎵�灞炲綊绫�'),
dataIndex: 'tagId$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('tagId$'),
},
{
title: formatMessage('db.man_mat.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('matnr'),
},
{
title: formatMessage('db.man_mat.maktx', '鍟嗗搧鍚嶇О'),
dataIndex: 'maktx',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('maktx'),
},
{
title: formatMessage('db.man_mat.name', '鍒悕'),
dataIndex: 'name',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.man_mat.specs', '瑙勬牸'),
dataIndex: 'specs',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('specs'),
},
{
title: formatMessage('db.man_mat.model', '鍨嬪彿'),
dataIndex: 'model',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('model'),
},
{
title: formatMessage('db.man_mat.color', '棰滆壊'),
dataIndex: 'color',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('color'),
},
{
title: formatMessage('db.man_mat.brand', '鍝佺墝'),
dataIndex: 'brand',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('brand'),
},
{
title: formatMessage('db.man_mat.unit', '鍗曚綅'),
dataIndex: 'unit',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('unit'),
},
{
title: formatMessage('db.man_mat.price', '鍗曚环'),
dataIndex: 'price',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('price'),
},
{
title: formatMessage('db.man_mat.sku', 'sku'),
dataIndex: 'sku',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('sku'),
},
{
title: formatMessage('db.man_mat.units', '鍗曚綅閲�'),
dataIndex: 'units',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('units'),
},
{
title: formatMessage('db.man_mat.barcode', '鏉＄爜'),
dataIndex: 'barcode',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('barcode'),
},
{
title: formatMessage('db.man_mat.origin', '浜у湴'),
dataIndex: 'origin',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('origin'),
},
{
title: formatMessage('db.man_mat.manu', '鍘傚'),
dataIndex: 'manu',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('manu'),
},
{
title: formatMessage('db.man_mat.manu_date', '鐢熶骇鏃ユ湡'),
dataIndex: 'manuDate',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('manuDate'),
},
{
title: formatMessage('db.man_mat.item_num', '鍝侀」鏁�'),
dataIndex: 'itemNum',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('itemNum'),
},
{
title: formatMessage('db.man_mat.weight', '閲嶉噺'),
dataIndex: 'weight',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('weight'),
},
{
title: formatMessage('db.man_mat.length', '闀垮害'),
dataIndex: 'length',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('length'),
},
{
title: formatMessage('db.man_mat.volume', '浣撶Н'),
dataIndex: 'volume',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('volume'),
},
{
title: formatMessage('db.man_mat.three_code', '涓夋柟缂栫爜'),
dataIndex: 'threeCode',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('threeCode'),
},
{
title: formatMessage('db.man_mat.supp', '渚涘簲鍟�'),
dataIndex: 'supp',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('supp'),
},
{
title: formatMessage('db.man_mat.supp_code', '渚涘簲鍟嗙紪鐮�'),
dataIndex: 'suppCode',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('suppCode'),
},
{
title: formatMessage('db.man_mat.dead_time', '淇濊川鏈�'),
dataIndex: 'deadTime',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('deadTime'),
},
{
title: formatMessage('db.man_mat.safeStockLimit', '瀹夊叏搴撳瓨涓婇檺'),
dataIndex: 'safeStockLimit',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('safeStockLimit'),
},
{
title: formatMessage('db.man_mat.safeStockMinimum', '瀹夊叏搴撳瓨涓嬮檺'),
dataIndex: 'safeStockMinimum',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('safeStockMinimum'),
},
{
title: formatMessage('db.man_mat.validity', '鏈夋晥鏈�'),
dataIndex: 'validity',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('validity'),
},
{
@@ -264,28 +236,24 @@
dataIndex: 'uuid',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('uuid'),
},
{
title: formatMessage('db.man_mat.flag', '鏍囪瘑'),
dataIndex: 'flag',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('flag'),
},
{
title: formatMessage('db.man_mat.sort', '鎺掑簭'),
dataIndex: 'sort',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('sort'),
},
{
title: formatMessage('db.man_mat.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('status$'),
},
// {
// title: formatMessage('db.man_mat.create_time', '娣诲姞鏃堕棿'),
@@ -316,7 +284,6 @@
dataIndex: 'memo',
width: 140,
ellipsis: true,
- ...getColumnSearchProps('memo'),
},
];
--
Gitblit v1.9.1