From 223842fef950560d0a14b258aa3495a6433d3a33 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Mon, 16 Oct 2023 11:57:16 +0800
Subject: [PATCH] tableForm
---
src/components/TableForm/src/TableForm.vue | 382 +++++++++++----------
src/utils/disposition/tableColumns.ts | 26 +-
src/views/wms/itembasic/ItembasicForm.vue | 63 ++--
3 files changed, 257 insertions(+), 214 deletions(-)
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c5cf173fa..170575188 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,219 +1,134 @@
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index 7fe51ed8d..8ab5e9392 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -12,7 +12,7 @@ export const ItemBasic = useCrudSchemas(reactive([
width:700
},
tableForm:{
- width: 300,
+ minWidth:200,
sortable:false
}
},
@@ -24,7 +24,7 @@ export const ItemBasic = useCrudSchemas(reactive([
width: 150
},
tableForm:{
- width: 300,
+ minWidth:200,
sortable:false
}
},
@@ -60,6 +60,10 @@ export const ItemBasic = useCrudSchemas(reactive([
} ,
form: {
component: 'Switch',
+ },
+ tableForm:{
+ width: 100,
+ type:'Switch',
}
},
{
@@ -72,7 +76,11 @@ export const ItemBasic = useCrudSchemas(reactive([
isTable: true,
table: {
width: 120
- }
+ } ,
+ tableForm:{
+ width: 200,
+ type:'Select',
+ }
},
{
label: '替代计量单位',
@@ -100,6 +108,10 @@ export const ItemBasic = useCrudSchemas(reactive([
},
form: {
component: 'Switch',
+ },
+ tableForm:{
+ width: 180,
+ type:'Radio',
}
},
{
@@ -131,6 +143,10 @@ export const ItemBasic = useCrudSchemas(reactive([
} ,
form: {
component: 'Radio',
+ },
+ tableForm:{
+ width: 180,
+ type:'Checkbox',
}
},
{
@@ -326,6 +342,10 @@ export const ItemBasic = useCrudSchemas(reactive([
componentProps: {
type: 'datetimerange',
}
+ },
+ tableForm:{
+ width: 200,
+ type:'FormDateTime',
}
},
{
diff --git a/src/views/wms/itembasic/ItembasicForm.vue b/src/views/wms/itembasic/ItembasicForm.vue
index f1e15aff2..557c60bb8 100644
--- a/src/views/wms/itembasic/ItembasicForm.vue
+++ b/src/views/wms/itembasic/ItembasicForm.vue
@@ -4,7 +4,7 @@
@@ -29,6 +29,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formData = ref('')
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
+const tableFormRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
@@ -118,6 +119,7 @@ const Butttondata = [
const buttonBaseClick = (val, item) => {
// 保存
if (val == 'save') {
+ tableFormRef.value.validateForm()
}
// 关闭
else if (val == 'close') {
@@ -125,28 +127,43 @@ const buttonBaseClick = (val, item) => {
}
}
-const tableData = ref([{
- code: '',
- name:'物料',
- unit:'吨',
- num: '20',
- isStdPack:'FALSE'
-}, {
- code: 'GOODS-0202-12',
- name: '物料',
- unit: '吨',
- num: '20'
-}, {
- code: 'GOODS-0202-12',
- name: '物料',
- unit: '吨',
- num: '20'
-}, {
- code: 'GOODS-0202-12',
- name: '物料',
- unit: '吨',
- num: '20'
-}])
+// const tableData = ref([{
+// code: '',
+// name:'物料',
+// unit:'吨',
+// num: '20',
+// isStdPack:'FALSE'
+// }, {
+// code: 'GOODS-0202-12',
+// name: '物料',
+// unit: '吨',
+// num: '20'
+// }, {
+// code: 'GOODS-0202-12',
+// name: '物料',
+// unit: '吨',
+// num: '20'
+// }, {
+// code: 'GOODS-0202-12',
+// name: '物料',
+// unit: '吨',
+// num: '20'
+// }])
+const tableData = ref([])
+// 添加明细
+const handleAdd = ()=>{
+ tableData.value.push({
+ code: '',
+ name: '',
+ unit: '',
+ num: ''
+ })
+}
+// 删除明细
+
+const handleDelete =(item,index)=>{
+ tableData.value.splice(index,1)
+}