From 83f7f6af91c922b1efe612f115b7b6ac82d6150b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 16 七月 2024 09:55:08 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/base/loc/index.vue | 187 ++++++-----
zy-asrs-admin/src/views/base/zpalletBarcode/index.vue | 10
zy-asrs-admin/src/views/base/mat/index.vue | 34 ++
zy-asrs-admin/src/views/system/role/index.vue | 11
zy-asrs-admin/src/views/system/dict/index.vue | 159 +++++----
zy-asrs-admin/src/views/base/locAreaType/index.vue | 14
zy-asrs-admin/src/views/base/orderSettle/index.vue | 122 ++++---
zy-asrs-admin/src/views/system/userLogin/index.vue | 12
zy-asrs-admin/src/views/config/matField/index.vue | 40 +
zy-asrs-admin/src/views/loc/locDetl/index.vue | 42 +
zy-asrs-admin/src/views/base/locType/index.vue | 16 +
zy-asrs-admin/src/views/base/orderType/index.vue | 135 ++++---
zy-asrs-admin/src/views/system/host/index.vue | 10
zy-asrs-admin/src/views/base/locSts/index.vue | 122 ++++---
14 files changed, 566 insertions(+), 348 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index 436defd..c6242b3 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,91 +20,109 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
- {
- title: formatMessage('db.man_loc.loc_no', '搴撲綅鍙�'),
- dataIndex: 'locNo',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.loc_sts_id', '搴撲綅鐘舵��'),
- dataIndex: 'locStsId$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.row1', '鎺�'),
- dataIndex: 'row1',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.bay1', '鍒�'),
- dataIndex: 'bay1',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.lev1', '灞�'),
- dataIndex: 'lev1',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.barcode', '鏉$爜'),
- dataIndex: 'barcode',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.uuid', '缂栧彿'),
- dataIndex: 'uuid',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.flag', '鏍囪瘑'),
- dataIndex: 'flag',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- },
+ {
+ title: formatMessage('db.man_loc.loc_no', '搴撲綅鍙�'),
+ 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'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/base/locAreaType/index.vue b/zy-asrs-admin/src/views/base/locAreaType/index.vue
index b4d167d..9761a92 100644
--- a/zy-asrs-admin/src/views/base/locAreaType/index.vue
+++ b/zy-asrs-admin/src/views/base/locAreaType/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,6 +20,10 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.man_loc_area_type.name', '鍚嶇О'),
@@ -31,54 +36,63 @@
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/locSts/index.vue b/zy-asrs-admin/src/views/base/locSts/index.vue
index 559aa43..550cef9 100644
--- a/zy-asrs-admin/src/views/base/locSts/index.vue
+++ b/zy-asrs-admin/src/views/base/locSts/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,61 +20,74 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
- {
- title: formatMessage('db.man_loc_sts.loc_sts', '搴撲綅鐘舵��'),
- dataIndex: 'locSts',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.name', '鍚嶇О'),
- dataIndex: 'name',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.flag', '鏍囪瘑'),
- dataIndex: 'flag',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_sts.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- },
+ {
+ title: formatMessage('db.man_loc_sts.loc_sts', '搴撲綅鐘舵��'),
+ dataIndex: 'locSts',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('locSts'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.name', '鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('flag'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_loc_sts.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/base/locType/index.vue b/zy-asrs-admin/src/views/base/locType/index.vue
index ea13159..1681896 100644
--- a/zy-asrs-admin/src/views/base/locType/index.vue
+++ b/zy-asrs-admin/src/views/base/locType/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,72 +20,87 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.man_loc_type.name', '鍚嶇О'),
dataIndex: 'name',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.man_loc_type.flag', '搴撲綅绫诲瀷'),
dataIndex: 'flag',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('flag'),
},
{
title: formatMessage('db.man_loc_type.contain', '鍖呭惈鍏崇郴'),
dataIndex: 'contain',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('contain'),
},
{
title: formatMessage('db.man_loc_type.type', '绫诲瀷'),
dataIndex: 'type$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('type$'),
},
{
title: formatMessage('db.man_loc_type.uuid', '缂栧彿'),
dataIndex: 'uuid',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('uuid'),
},
{
title: formatMessage('db.man_loc_type.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('status$'),
},
{
title: formatMessage('db.man_loc_type.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.man_loc_type.create_by', '娣诲姞浜哄憳'),
dataIndex: 'createBy$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
},
{
title: formatMessage('db.man_loc_type.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.man_loc_type.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
},
{
title: formatMessage('db.man_loc_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 721af7e..0afb29c 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,6 +20,10 @@
let tableData = ref([]);
getColumns();
getPage();
+
+const {
+ getColumnSearchProps,
+} = useTableSearch();
const state = reactive({
selectedRowKeys: [],
@@ -45,144 +50,168 @@
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'),
},
{
@@ -190,24 +219,28 @@
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', '娣诲姞鏃堕棿'),
@@ -238,6 +271,7 @@
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
];
diff --git a/zy-asrs-admin/src/views/base/orderSettle/index.vue b/zy-asrs-admin/src/views/base/orderSettle/index.vue
index 792fe0d..f645a4a 100644
--- a/zy-asrs-admin/src/views/base/orderSettle/index.vue
+++ b/zy-asrs-admin/src/views/base/orderSettle/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,61 +20,74 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
- {
- title: formatMessage('db.man_order_settle.settle', '璁㈠崟鐘舵��'),
- dataIndex: 'settle',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.name', '鐘舵�佹弿杩�'),
- dataIndex: 'name',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.flag', '鏍囪瘑'),
- dataIndex: 'flag',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_settle.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- },
+ {
+ title: formatMessage('db.man_order_settle.settle', '璁㈠崟鐘舵��'),
+ dataIndex: 'settle',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('settle'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.name', '鐘舵�佹弿杩�'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('flag'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_settle.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/base/orderType/index.vue b/zy-asrs-admin/src/views/base/orderType/index.vue
index 27c50c7..3546f5b 100644
--- a/zy-asrs-admin/src/views/base/orderType/index.vue
+++ b/zy-asrs-admin/src/views/base/orderType/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,67 +20,81 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
- {
- title: formatMessage('db.man_order_type.name', '鍚嶇О'),
- dataIndex: 'name',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.type', '绫诲瀷'),
- dataIndex: 'type$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.flag', '鏍囪瘑'),
- dataIndex: 'flag',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.uuid', '缂栧彿'),
- dataIndex: 'uuid',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_order_type.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- },
+ {
+ title: formatMessage('db.man_order_type.name', '鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.man_order_type.type', '绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('type$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('flag'),
+ },
+ {
+ title: formatMessage('db.man_order_type.uuid', '缂栧彿'),
+ dataIndex: 'uuid',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('uuid'),
+ },
+ {
+ title: formatMessage('db.man_order_type.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_order_type.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index 4402c12..d59304e 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -7,6 +7,7 @@
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
import ZpalletBarcodePrint from '@/components/print/zpalletBarcodePrint/index.vue';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -25,24 +26,31 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.man_zpallet_barcode.barcode', '瀹瑰櫒鏉$爜'),
dataIndex: 'barcode',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('barcode'),
},
{
title: formatMessage('db.man_zpallet_barcode.flag', '鏍囪瘑'),
dataIndex: 'flag',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('flag'),
},
{
title: formatMessage('db.man_zpallet_barcode.barcode_print', '鎵撳嵃鐘舵��'),
dataIndex: 'barcodePrint$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('barcodePrint$'),
},
// {
// title: formatMessage('db.man_zpallet_barcode.uuid', '缂栧彿'),
@@ -55,6 +63,7 @@
dataIndex: 'status$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('status$'),
},
// {
// title: formatMessage('db.man_zpallet_barcode.create_time', '娣诲姞鏃堕棿'),
@@ -85,6 +94,7 @@
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
{
diff --git a/zy-asrs-admin/src/views/config/matField/index.vue b/zy-asrs-admin/src/views/config/matField/index.vue
index d785f2d..3b3363f 100644
--- a/zy-asrs-admin/src/views/config/matField/index.vue
+++ b/zy-asrs-admin/src/views/config/matField/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,72 +20,87 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.man_mat_field.name', '瀛楁鍚�'),
dataIndex: 'name',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.man_mat_field.type', '绫诲瀷'),
dataIndex: 'type',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('type'),
},
{
title: formatMessage('db.man_mat_field.describe', '鎻忚堪'),
dataIndex: 'describe',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('describe'),
},
{
title: formatMessage('db.man_mat_field.language', '鍥介檯鍖朓D'),
dataIndex: 'language',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('language'),
},
{
title: formatMessage('db.man_mat_field.unique', '绱㈠紩'),
dataIndex: 'unique$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('unique$'),
},
{
title: formatMessage('db.man_mat_field.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('status$'),
},
- {
- title: formatMessage('db.man_mat_field.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_mat_field.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
+ // {
+ // title: formatMessage('db.man_mat_field.create_time', '娣诲姞鏃堕棿'),
+ // dataIndex: 'createTime$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('createTime$'),
+ // },
+ // {
+ // title: formatMessage('db.man_mat_field.create_by', '娣诲姞浜哄憳'),
+ // dataIndex: 'createBy$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('createBy$'),
+ // },
{
title: formatMessage('db.man_mat_field.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.man_mat_field.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
},
{
title: formatMessage('db.man_mat_field.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
{
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index 42d8260..6b6f939 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,6 +20,10 @@
let tableData = ref([]);
getColumns();
getPage();
+
+const {
+ getColumnSearchProps,
+} = useTableSearch();
const state = reactive({
selectedRowKeys: [],
@@ -45,78 +50,91 @@
dataIndex: 'locId$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('locId$'),
},
{
title: formatMessage('db.man_loc_detl.loc_no', '搴撲綅鍙�'),
dataIndex: 'locNo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('locNo'),
},
{
title: formatMessage('db.man_loc_detl.mat_id', '鐗╂枡'),
dataIndex: 'matId$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('matId$'),
},
{
title: formatMessage('db.man_loc_detl.matnr', '鐗╂枡鍙�'),
dataIndex: 'matnr',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('matnr'),
},
{
title: formatMessage('db.man_loc_detl.order_no', '璁㈠崟鍙�'),
dataIndex: 'orderNo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
},
{
title: formatMessage('db.man_loc_detl.batch', '鎵瑰彿'),
dataIndex: 'batch',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('batch'),
},
{
title: formatMessage('db.man_loc_detl.anfme', '鏁伴噺'),
dataIndex: 'anfme',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('anfme'),
},
{
title: formatMessage('db.man_loc_detl.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('status$'),
},
- {
- title: formatMessage('db.man_loc_detl.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.man_loc_detl.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
+ // {
+ // title: formatMessage('db.man_loc_detl.create_time', '娣诲姞鏃堕棿'),
+ // dataIndex: 'createTime$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('createTime$'),
+ // },
+ // {
+ // title: formatMessage('db.man_loc_detl.create_by', '娣诲姞浜哄憳'),
+ // dataIndex: 'createBy$',
+ // width: 140,
+ // ellipsis: true,
+ // ...getColumnSearchProps('createBy$'),
+ // },
{
title: formatMessage('db.man_loc_detl.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.man_loc_detl.update_by', '淇敼浜哄憳'),
dataIndex: 'updateBy$',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
},
{
title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
];
diff --git a/zy-asrs-admin/src/views/system/dict/index.vue b/zy-asrs-admin/src/views/system/dict/index.vue
index 26a3068..74f07d0 100644
--- a/zy-asrs-admin/src/views/system/dict/index.vue
+++ b/zy-asrs-admin/src/views/system/dict/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,79 +20,93 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
- {
- title: formatMessage('db.sys_dict.uuid', '缂栧彿'),
- dataIndex: 'uuid',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.name', '瀛楀吀鍚嶇О'),
- dataIndex: 'name',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.type', '绫诲瀷'),
- dataIndex: 'type$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.flag', '鏍囪瘑'),
- dataIndex: 'flag',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.value', '瀛楀吀鍊�'),
- dataIndex: 'value',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.sort', '鎺掑簭'),
- dataIndex: 'sort',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- },
- {
- title: formatMessage('db.sys_dict.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- },
+ {
+ title: formatMessage('db.sys_dict.uuid', '缂栧彿'),
+ dataIndex: 'uuid',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('uuid'),
+ },
+ {
+ title: formatMessage('db.sys_dict.name', '瀛楀吀鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.sys_dict.type', '绫诲瀷'),
+ dataIndex: 'type$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('type$'),
+ },
+ {
+ title: formatMessage('db.sys_dict.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('flag'),
+ },
+ {
+ title: formatMessage('db.sys_dict.value', '瀛楀吀鍊�'),
+ dataIndex: 'value',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('value'),
+ },
+ {
+ title: formatMessage('db.sys_dict.sort', '鎺掑簭'),
+ dataIndex: 'sort',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('sort'),
+ },
+ {
+ title: formatMessage('db.sys_dict.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ // {
+ // title: formatMessage('db.sys_dict.create_time', '娣诲姞鏃堕棿'),
+ // dataIndex: 'createTime$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ // {
+ // title: formatMessage('db.sys_dict.create_by', '娣诲姞浜哄憳'),
+ // dataIndex: 'createBy$',
+ // width: 140,
+ // ellipsis: true,
+ // },
+ {
+ title: formatMessage('db.sys_dict.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.sys_dict.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.sys_dict.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
{
title: formatMessage('common.operation', '鎿嶄綔'),
diff --git a/zy-asrs-admin/src/views/system/host/index.vue b/zy-asrs-admin/src/views/system/host/index.vue
index d653ffd..6c0f732 100644
--- a/zy-asrs-admin/src/views/system/host/index.vue
+++ b/zy-asrs-admin/src/views/system/host/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,31 +20,40 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.sys_host.name', '鍚嶇О'),
dataIndex: 'name',
width: 140,
+ ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.sys_host.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
+ ...getColumnSearchProps('status$'),
},
{
title: formatMessage('db.sys_host.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
+ ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.sys_host.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
+ ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.sys_host.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
+ ...getColumnSearchProps('memo'),
},
{
diff --git a/zy-asrs-admin/src/views/system/role/index.vue b/zy-asrs-admin/src/views/system/role/index.vue
index d567f88..76cbbeb 100644
--- a/zy-asrs-admin/src/views/system/role/index.vue
+++ b/zy-asrs-admin/src/views/system/role/index.vue
@@ -6,6 +6,7 @@
import { globalState, logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -27,36 +28,46 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.sys_role.name', '鍚嶇О'),
dataIndex: 'name',
width: 140,
+ ...getColumnSearchProps('name'),
},
{
title: formatMessage('db.sys_role.code', '鏍囪瘑'),
dataIndex: 'code',
width: 140,
+ ...getColumnSearchProps('code'),
},
{
title: formatMessage('db.sys_role.status', '鐘舵��'),
dataIndex: 'status$',
width: 140,
+ ...getColumnSearchProps('status$'),
},
{
title: formatMessage('db.sys_role.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
+ ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.sys_role.update_time', '淇敼鏃堕棿'),
dataIndex: 'updateTime$',
width: 140,
+ ...getColumnSearchProps('updateTime$'),
},
{
title: formatMessage('db.sys_role.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
+ ...getColumnSearchProps('memo'),
},
{
diff --git a/zy-asrs-admin/src/views/system/userLogin/index.vue b/zy-asrs-admin/src/views/system/userLogin/index.vue
index e0af397..885edfc 100644
--- a/zy-asrs-admin/src/views/system/userLogin/index.vue
+++ b/zy-asrs-admin/src/views/system/userLogin/index.vue
@@ -6,6 +6,7 @@
import { logout } from '@/config.js';
import EditView from './edit.vue'
import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -19,42 +20,53 @@
let tableData = ref([]);
getPage();
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
const columns = [
{
title: formatMessage('db.sys_user_login.user_id', '鐢ㄦ埛'),
dataIndex: 'userId$',
width: 140,
+ ...getColumnSearchProps('userId$'),
},
{
title: formatMessage('db.sys_user_login.token', '瀵嗛挜'),
dataIndex: 'token',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('token'),
},
{
title: formatMessage('db.sys_user_login.ip', '鐧诲綍ip'),
dataIndex: 'ip',
width: 140,
+ ...getColumnSearchProps('ip'),
},
{
title: formatMessage('db.sys_user_login.type', '绫诲瀷'),
dataIndex: 'type$',
width: 140,
+ ...getColumnSearchProps('type$'),
},
{
title: formatMessage('db.sys_user_login.create_time', '娣诲姞鏃堕棿'),
dataIndex: 'createTime$',
width: 140,
+ ...getColumnSearchProps('createTime$'),
},
{
title: formatMessage('db.sys_user_login.system', '鐧诲綍绯荤粺'),
dataIndex: 'system',
width: 140,
+ ...getColumnSearchProps('system'),
},
{
title: formatMessage('db.sys_user_login.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
+ ...getColumnSearchProps('memo'),
},
{
--
Gitblit v1.9.1