From 04fd71bcdd2f4d13f7fcb1f59952f6decdbb3d65 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 09 九月 2024 08:23:32 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/base/mat/index.vue | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index 721af7e..47f7cf4 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,11 @@
let tableData = ref([]);
getColumns();
getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
const state = reactive({
selectedRowKeys: [],
@@ -41,148 +47,200 @@
state.columns = [
{
+ title: '#ID',
+ 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'),
},
{
@@ -190,24 +248,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,13 +300,16 @@
dataIndex: 'memo',
width: 140,
ellipsis: true,
+ ...getColumnSearchProps('memo'),
},
];
//鍔犺浇鎵╁睍瀛楁
async function getColumns() {
- let fieldResp = await post('/api/matField/list', {})
+ let fieldResp = await post('/api/matField/list', {
+ fieldType: 0
+ })
let fieldResult = fieldResp.data;
let tmp = state.columns;
if (fieldResult.code == 200) {
@@ -381,7 +446,7 @@
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="state.columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
--
Gitblit v1.9.1