From 16b48b758e4c05ee1b6ac0ac0f7108cf6e53b14a Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 25 Apr 2024 19:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E3=80=81=E5=A4=87=E4=BB=B6--?= =?UTF-8?q?-=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain.data.ts | 131 ++++++--- .../sparereceiptJobMain.data.ts | 253 ++++++++++++------ 2 files changed, 273 insertions(+), 111 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index acbec7612..c70bb358f 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -25,6 +25,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ width: 180 }, isSearch: false, + sortTableDefault:2, }, { label: '发货单号', @@ -33,6 +34,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:3, isSearch: true }, { @@ -87,6 +89,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ } }, isSearch: false, + sortTableDefault:5, }, { label: '运输方式', @@ -189,6 +192,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6 }, { label: '过期时间', @@ -699,8 +703,32 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, isSearch:true, hiddenInMain:true, + sortTableDefault:1002, sortSearchDefault:1002 }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1002 + }, + { + label: '包装数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + sortTableDefault:1002 + }, { label: '器具号', field: 'containerNumber', @@ -709,6 +737,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '批次', @@ -717,10 +746,10 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:1000, sortSearchDefault:1000, isSearch:true, hiddenInMain:true, + sortTableDefault:8, }, { label: '替代批次', @@ -729,6 +758,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, hiddenInMain:true, }, { @@ -742,6 +772,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1005, hiddenInMain:true, form: { component: 'DatePicker', @@ -764,6 +795,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1005, hiddenInMain:true, form: { component: 'DatePicker', @@ -786,6 +818,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:1005, hiddenInMain:true, form: { component: 'DatePicker', @@ -808,6 +841,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain:true, + sortTableDefault:1006, }, { label: '来源库位', @@ -816,7 +850,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:1005 + sortTableDefault:1007, }, { label: '目标库位', @@ -825,7 +859,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:1006 + sortTableDefault:1007, }, { label: '采购订单号', @@ -835,7 +869,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, isSearch:true, - + sortTableDefault:6, + }, { label: '订单行', @@ -844,30 +879,23 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6, }, { - label: '包装数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - sortTableDefault:1003 - }, - { - label: '包装规格', - field: 'packUnit', - dictClass: 'string', - isTable: true, + label: '行类型', + field: 'poLineType', sort: 'custom', table: { - width: 150 + width: 180 }, - sortTableDefault:1002 + sortTableDefault:6, + hiddenInMain:true, + isForm: false, + tableForm:{ + disabled: true + } }, + { label: '供应商计量数量', field: 'supplierQty', @@ -875,6 +903,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1009, hiddenInMain:true, form: { component: 'InputNumber', @@ -890,6 +919,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1009, hiddenInMain:true, }, { @@ -902,25 +932,28 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', }, + sortTableDefault:1009, hiddenInMain:true, }, { - label: '从货主代码', + label: '从货主', field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, hiddenInMain:true, + sortTableDefault:1008, }, { - label: '到货主代码', + label: '到货主', field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, hiddenInMain:true, + sortTableDefault:1008, }, { label: '物料代码', @@ -929,6 +962,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:7, isSearch:true }, { @@ -938,6 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:7, }, { label: '物料描述1', @@ -947,6 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain:true, + sortTableDefault:7, }, { label: '物料描述2', @@ -956,6 +992,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain:true, + sortTableDefault:7, }, { label: '项目代码', @@ -965,29 +1002,51 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain:true, + sortTableDefault:1010, }, { - label: '数量', - field: 'qty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', + sortTableDefault:1004 + }, + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 }, hiddenInMain:true, + sortTableDefault:1004 }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '收货数量', + field: 'receivedQty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault:1004 + }, + { + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + isTable:false, + form: { + component: 'InputNumber', + }, sortTableDefault:1004 }, { @@ -998,14 +1057,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 180 }, hiddenInMain:true, + sortTableDefault:1011, }, { label: '备注', - fiield: 'remark', + field: 'remark', sort: 'custom', table: { width: 150 }, + sortTableDefault:1012, hiddenInMain:true, }, { @@ -1016,6 +1077,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, hiddenInMain:true, + sortTableDefault:1012 }, { label: '创建时间', @@ -1037,6 +1099,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ } }, hiddenInMain:true, + sortTableDefault:1012 }, { label: '操作', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 3f2f1c6ae..5a0770710 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -24,6 +24,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:2, }, { label: '发货单号', @@ -32,6 +33,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + sortTableDefault:3, isSearch: true }, { @@ -54,21 +56,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ isSearch: true, sortSearchDefault:2 }, - { - label: '数据来源', - field: 'sourceType', - dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, - sort: 'custom', - table: { - width: 150 - }, - form: { - componentProps: { - disabled: true - } - }, - isSearch: false, - }, { label: '到月台代码', field: 'toDockCode', @@ -87,6 +74,22 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, sortTableDefault:1010 }, + { + label: '数据来源', + field: 'sourceType', + dictType: DICT_TYPE.PURCHASERECEIPT_SOURCE_TYPE, + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + isSearch: false, + sortTableDefault:5, + }, { label: '运输方式', field: 'transferMode', @@ -188,6 +191,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6 }, { label: '过期时间', @@ -608,7 +612,28 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ fixed: 'right' }, }, - + { + label: '批次', // 实际是子表的到批次，为了不影响页面，单独放上面 + field: 'toBatch', + sort: 'custom', + isForm:false, + isTableForm:false, + table: { + width: 150 + }, + sortTableDefault:1001, + }, + { + label: '包装号', // 实际是子表的到包装号，为了不影响页面，单独放上面 + field: 'toPackingNumber', + sort: 'custom', + isForm:false, + isTableForm:false, + table: { + width: 150 + }, + sortTableDefault:1001, + }, ])) //表单校验 @@ -674,18 +699,43 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - sortTableDefault:1001, - isSearch: true, + isSearch:true, + hiddenInMain:true, + sortTableDefault:1002, sortSearchDefault:1002 }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1002 + }, + { + label: '包装数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + }, + sortTableDefault:1002 + }, { label: '器具号', field: 'containerNumber', sort: 'custom', + hiddenInMain:true, table: { width: 150 }, - hiddenInMain: true, + isTable:false, }, { label: '批次', @@ -694,9 +744,10 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true, - sortTableDefault:1000, sortSearchDefault:1000, + isSearch:true, + hiddenInMain:true, + sortTableDefault:8, }, { label: '替代批次', @@ -705,7 +756,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + isTable:false, + hiddenInMain:true, }, { label: '到货日期', @@ -718,7 +770,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - hiddenInMain: true, + sortTableDefault:1005, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -740,7 +793,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - hiddenInMain: true, + sortTableDefault:1005, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -762,7 +816,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - hiddenInMain: true, + sortTableDefault:1005, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -783,25 +838,26 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1006, }, { - label: '从库位代码', + label: '来源库位', field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, - sortTableDefault:1005 + sortTableDefault:1007, }, { - label: '到库位代码', + label: '目标库位', field: 'toLocationCode', sort: 'custom', table: { width: 150 }, - sortTableDefault:1006 + sortTableDefault:1007, }, { label: '采购订单号', @@ -810,7 +866,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true + isSearch:true, + sortTableDefault:6, + }, { label: '订单行', @@ -819,30 +877,23 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:6, }, { - label: '包装数量', - field: 'packQty', + label: '行类型', + field: 'poLineType', sort: 'custom', table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - sortTableDefault:1003 - }, - { - label: '包装规格', - field: 'packUnit', - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 + width: 180 }, - sortTableDefault:1002 + sortTableDefault:6, + hiddenInMain:true, + isForm: false, + tableForm:{ + disabled: true + } }, + { label: '供应商计量数量', field: 'supplierQty', @@ -850,7 +901,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + sortTableDefault:1009, + hiddenInMain:true, form: { component: 'InputNumber', } @@ -861,11 +913,12 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, - hiddenInMain: true, sort: 'custom', table: { width: 150 }, + sortTableDefault:1009, + hiddenInMain:true, }, { label: '转换率', @@ -874,28 +927,31 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, form: { component: 'InputNumber', - } + }, + sortTableDefault:1009, + hiddenInMain:true, }, { - label: '从货主代码', + label: '从货主', field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1008, }, { - label: '到货主代码', + label: '到货主', field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1008, }, { label: '物料代码', @@ -904,7 +960,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isSearch: true + sortTableDefault:7, + isSearch:true }, { label: '物料名称', @@ -913,6 +970,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:7, }, { label: '物料描述1', @@ -921,7 +979,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:7, }, { label: '物料描述2', @@ -930,7 +989,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:7, }, { label: '项目代码', @@ -939,30 +999,52 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1010, }, { - label: '数量', - field: 'qty', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - hiddenInMain: true, - form: { - component: 'InputNumber', - } + sortTableDefault:1004 }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault:1004 + }, + { + label: '收货数量', + field: 'receivedQty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault:1004 + }, + { + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + isTable:false, + form: { + component: 'InputNumber', + }, sortTableDefault:1004 }, { @@ -972,16 +1054,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1011, }, { label: '备注', - fiield: 'remark', + field: 'remark', sort: 'custom', table: { width: 150 }, - hiddenInMain: true, + sortTableDefault:1012, + hiddenInMain:true, }, { label: '创建者', @@ -990,7 +1074,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1012 }, { label: '创建时间', @@ -1011,8 +1096,22 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, - hiddenInMain: true, + hiddenInMain:true, + sortTableDefault:1012 + }, + { + label: '操作', + hiddenInMain:true, + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:true, }, + ])) //表单校验