From d69d8c1f77dacd2e9d15c3be21d945786a7ac2f3 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 29 七月 2024 15:36:30 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/order/orderDetl/index.vue | 3 ++-
zy-asrs-admin/src/views/base/loc/index.vue | 3 ++-
zy-asrs-admin/src/views/base/zpalletBarcode/index.vue | 3 ++-
zy-asrs-admin/src/components/order/index.vue | 3 ++-
zy-asrs-admin/src/views/base/mat/index.vue | 3 ++-
zy-asrs-admin/src/utils/tableUtils.jsx | 6 ++++++
zy-asrs-admin/src/views/base/locAreaType/index.vue | 3 ++-
zy-asrs-framework/src/main/resources/templates/vue/Index.txt | 3 ++-
zy-asrs-admin/src/views/base/orderSettle/index.vue | 3 ++-
zy-asrs-admin/src/views/config/matField/index.vue | 3 ++-
zy-asrs-admin/src/views/loc/locDetl/index.vue | 3 ++-
zy-asrs-admin/src/views/base/locType/index.vue | 3 ++-
zy-asrs-admin/src/views/base/orderType/index.vue | 3 ++-
zy-asrs-admin/src/views/order/order/index.vue | 3 ++-
zy-asrs-admin/src/views/base/locSts/index.vue | 3 ++-
15 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/index.vue b/zy-asrs-admin/src/components/order/index.vue
index 35f7132..09f2cc0 100644
--- a/zy-asrs-admin/src/components/order/index.vue
+++ b/zy-asrs-admin/src/components/order/index.vue
@@ -28,6 +28,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -229,7 +230,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/utils/tableUtils.jsx b/zy-asrs-admin/src/utils/tableUtils.jsx
index d7f675e..f56f8f1 100644
--- a/zy-asrs-admin/src/utils/tableUtils.jsx
+++ b/zy-asrs-admin/src/utils/tableUtils.jsx
@@ -17,6 +17,10 @@
});
searchText.value = '';
};
+
+ function handleResizeColumn(w, col) {
+ col.width = w;
+ }
const getColumnSearchProps = (dataIndex) => ({
filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (
@@ -45,12 +49,14 @@
record[dataIndex]
? record[dataIndex].toString().toLowerCase().includes(value.toLowerCase())
: '',
+ resizable: true,
});
return {
searchText,
searchedColumn,
getColumnSearchProps,
+ handleResizeColumn,
};
}
diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue
index c6242b3..6aea9fc 100644
--- a/zy-asrs-admin/src/views/base/loc/index.vue
+++ b/zy-asrs-admin/src/views/base/loc/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -246,7 +247,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/locAreaType/index.vue b/zy-asrs-admin/src/views/base/locAreaType/index.vue
index 9761a92..3d2d908 100644
--- a/zy-asrs-admin/src/views/base/locAreaType/index.vue
+++ b/zy-asrs-admin/src/views/base/locAreaType/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -223,7 +224,7 @@
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/locSts/index.vue b/zy-asrs-admin/src/views/base/locSts/index.vue
index 550cef9..28eb241 100644
--- a/zy-asrs-admin/src/views/base/locSts/index.vue
+++ b/zy-asrs-admin/src/views/base/locSts/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -211,7 +212,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/locType/index.vue b/zy-asrs-admin/src/views/base/locType/index.vue
index 1681896..5cf1d07 100644
--- a/zy-asrs-admin/src/views/base/locType/index.vue
+++ b/zy-asrs-admin/src/views/base/locType/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -231,7 +232,7 @@
<a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
:data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:pagination="{ total: tableData.total, onChange: onPageChange }"
- :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/mat/index.vue b/zy-asrs-admin/src/views/base/mat/index.vue
index eb7d5f5..e67349e 100644
--- a/zy-asrs-admin/src/views/base/mat/index.vue
+++ b/zy-asrs-admin/src/views/base/mat/index.vue
@@ -23,6 +23,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const state = reactive({
@@ -417,7 +418,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;">
diff --git a/zy-asrs-admin/src/views/base/orderSettle/index.vue b/zy-asrs-admin/src/views/base/orderSettle/index.vue
index f645a4a..99e8fa0 100644
--- a/zy-asrs-admin/src/views/base/orderSettle/index.vue
+++ b/zy-asrs-admin/src/views/base/orderSettle/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -211,7 +212,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/orderType/index.vue b/zy-asrs-admin/src/views/base/orderType/index.vue
index 3546f5b..6d5fdb0 100644
--- a/zy-asrs-admin/src/views/base/orderType/index.vue
+++ b/zy-asrs-admin/src/views/base/orderType/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -218,7 +219,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
index d59304e..91ccded 100644
--- a/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
+++ b/zy-asrs-admin/src/views/base/zpalletBarcode/index.vue
@@ -28,6 +28,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -266,7 +267,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/config/matField/index.vue b/zy-asrs-admin/src/views/config/matField/index.vue
index aba1485..5f4e144 100644
--- a/zy-asrs-admin/src/views/config/matField/index.vue
+++ b/zy-asrs-admin/src/views/config/matField/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -232,7 +233,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue
index ee95189..7171860 100644
--- a/zy-asrs-admin/src/views/loc/locDetl/index.vue
+++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -23,6 +23,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const state = reactive({
@@ -271,7 +272,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;">
diff --git a/zy-asrs-admin/src/views/order/order/index.vue b/zy-asrs-admin/src/views/order/order/index.vue
index 7fee432..9a4bd4f 100644
--- a/zy-asrs-admin/src/views/order/order/index.vue
+++ b/zy-asrs-admin/src/views/order/order/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -218,7 +219,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-admin/src/views/order/orderDetl/index.vue b/zy-asrs-admin/src/views/order/orderDetl/index.vue
index 12af892..0addb6c 100644
--- a/zy-asrs-admin/src/views/order/orderDetl/index.vue
+++ b/zy-asrs-admin/src/views/order/orderDetl/index.vue
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -239,7 +240,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
<template #bodyCell="{ column, text, record }">
<template v-if="column.dataIndex === 'oper'">
<div style="display: flex;justify-content: space-evenly;">
diff --git a/zy-asrs-framework/src/main/resources/templates/vue/Index.txt b/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
index 367711a..4bbdddf 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Index.txt
@@ -22,6 +22,7 @@
const {
getColumnSearchProps,
+ handleResizeColumn,
} = useTableSearch();
const columns = [
@@ -148,7 +149,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="columns">
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="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