diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 1c5634cfa..e09c3055c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -698,7 +698,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, isSearch:true, hiddenInMain:true, - sortTableDefault:1001, sortSearchDefault:1002 }, { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 3ce781e10..3f2f1c6ae 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -14,6 +14,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + sortSearchDefault:1 + }, { label: '申请单号', @@ -22,7 +24,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isSearch: true, }, { label: '发货单号', @@ -31,6 +32,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isSearch: true }, { label: '要货计划单号', @@ -39,15 +41,18 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false }, { label: '供应商代码', field: 'supplierCode', sort: 'custom', + sortTableDefault:1, table: { width: 150 }, isSearch: true, + sortSearchDefault:2 }, { label: '数据来源', @@ -71,6 +76,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false }, { label: '承运商', @@ -79,6 +85,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1010 }, { label: '运输方式', @@ -87,6 +94,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1011 }, { label: '车牌号', @@ -95,6 +103,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1012 + }, { label: '从仓库代码', @@ -103,6 +113,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false }, { label: '到仓库代码', @@ -115,6 +126,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -131,6 +143,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -151,6 +164,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -169,7 +183,6 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.JOB_STATUS, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { @@ -187,6 +200,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -211,6 +225,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', } @@ -222,6 +237,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', } @@ -233,6 +249,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '岗位', @@ -241,6 +258,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '承接人', @@ -249,6 +267,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '承接时间', @@ -261,6 +280,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -277,6 +297,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '完成时间', @@ -289,6 +310,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -303,7 +325,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -314,7 +336,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable:false, sort: 'custom', table: { width: 150 @@ -327,6 +349,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '到库区代码范围', @@ -335,6 +358,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '业务类型', @@ -343,6 +367,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '备注', @@ -351,6 +376,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '创建者', @@ -359,6 +385,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '创建时间', @@ -371,6 +398,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -385,7 +413,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -404,7 +432,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -423,7 +451,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -442,7 +470,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -461,7 +489,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -480,7 +508,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -499,7 +527,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -518,7 +546,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -537,7 +565,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -556,7 +584,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable:false, form: { component: 'Switch', value: 'TRUE', @@ -579,7 +607,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ width: 120, fixed: 'right' }, - } + }, + ])) //表单校验 @@ -645,6 +674,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1001, + isSearch: true, + sortSearchDefault:1002 }, { label: '器具号', @@ -653,6 +685,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '批次', @@ -661,6 +694,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, + sortTableDefault:1000, + sortSearchDefault:1000, }, { label: '替代批次', @@ -669,6 +705,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '到货日期', @@ -681,6 +718,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -702,6 +740,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -723,6 +762,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -743,6 +783,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '从库位代码', @@ -751,6 +792,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1005 }, { label: '到库位代码', @@ -759,14 +801,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1006 }, { - label: '订单号', + label: '采购订单号', field: 'poNumber', sort: 'custom', table: { width: 150 }, + isSearch: true }, { label: '订单行', @@ -785,7 +829,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', - } + }, + sortTableDefault:1003 }, { label: '包装规格', @@ -796,6 +841,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1002 }, { label: '供应商计量数量', @@ -804,6 +850,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', } @@ -814,6 +861,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, + hiddenInMain: true, sort: 'custom', table: { width: 150 @@ -826,6 +874,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', } @@ -837,6 +886,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '到货主代码', @@ -845,6 +895,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '物料代码', @@ -853,6 +904,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true }, { label: '物料名称', @@ -869,6 +921,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '物料描述2', @@ -877,6 +930,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '项目代码', @@ -885,6 +939,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '数量', @@ -893,6 +948,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, form: { component: 'InputNumber', } @@ -907,6 +963,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:1004 }, { label: '单据号', @@ -915,6 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + hiddenInMain: true, }, { label: '备注', @@ -923,6 +981,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '创建者', @@ -931,6 +990,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '创建时间', @@ -951,6 +1011,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + hiddenInMain: true, }, ])) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index fe4fc4ed0..fcae8cc81 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -16,6 +16,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ fixed: 'left' }, isSearch: true, + sortSearchDefault:1 }, { label: '申请单号', @@ -24,7 +25,6 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isSearch: true, }, { label: '任务单号', @@ -41,6 +41,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isSearch: true + }, + { + label: 'ERP单据号', + field: 'qadNumber', + sort: 'custom', + table: { + width: 200 + }, }, { label: '要货计划单号', @@ -49,6 +58,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, }, { label: '供应商代码', @@ -58,6 +68,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isTable: false, + sortSearchDefault:2, }, { label: '到月台代码', @@ -66,6 +78,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '承运商', @@ -74,6 +87,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '运输方式', @@ -82,6 +96,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '数据来源', @@ -91,6 +106,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { componentProps: { disabled: true @@ -105,6 +121,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从仓库代码', @@ -113,6 +130,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到仓库代码', @@ -121,13 +139,14 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -138,7 +157,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -151,6 +170,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '到库区代码范围', @@ -159,6 +179,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '出库事务类型', @@ -167,6 +188,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '入库事务类型', @@ -175,6 +197,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '执行时间', @@ -187,6 +210,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -207,6 +231,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -228,6 +253,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -248,6 +274,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -264,6 +291,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, // { // label: '代码', @@ -278,7 +306,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -291,6 +319,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '备注', @@ -299,6 +328,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建者', @@ -307,6 +337,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -319,6 +350,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -334,8 +366,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -359,7 +390,27 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ width: 150, fixed: 'right' }, - } + }, + { + label: '批次', // 实际是子表的从批次,为了不影响页面,单独放上面 + field: 'fromBatch', + sort: 'custom', + isForm:false, + isTableForm:false, + table: { + width: 150 + }, + sortTableDefault:1000 + }, + { + label: '包装号', // 实际是子表的从包装号,为了不影响页面,单独放上面 + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1001 + }, ])) // 表单校验 @@ -423,14 +474,27 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive width: 180, fixed: 'left' }, + hiddenInMain:true }, { - label: '订单号', + label: '检验申请单号', + field: 'inspectNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + hiddenInMain:false + }, + { + label: '采购订单号', field: 'poNumber', sort: 'custom', table: { width: 150 }, + isSearch: true }, { label: '订单行', @@ -447,6 +511,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + isSearch: true }, { label: '物料名称', @@ -463,6 +528,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '物料描述2', @@ -471,6 +537,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '从批次', @@ -479,6 +546,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '到批次', @@ -487,6 +555,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '替代批次', @@ -495,6 +564,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '从包装号', @@ -503,6 +573,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '到包装号', @@ -511,6 +582,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true + }, { label: '从器具号', @@ -519,6 +592,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '到器具号', @@ -527,6 +601,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true }, { label: '数量', @@ -535,6 +610,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1000, form: { component: 'InputNumber', } @@ -544,37 +620,36 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, + sortTableDefault:1000, }, - { - label: '包装数量', - field: 'packQty', + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } + sortTableDefault:1001 }, { - label: '包装规格', - field: 'packUnit', - dictClass: 'string', - isSearch: true, - isTable: true, + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 }, + sortTableDefault:1001, + form: { + component: 'InputNumber', + } }, - { label: '供应商计量数量', field: 'supplierQty', @@ -582,6 +657,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, form: { component: 'InputNumber', } @@ -591,8 +667,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive field: 'supplierUom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, isTable: true, + hiddenInMain:true, sort: 'custom', table: { width: 150 @@ -604,8 +680,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isSearch: true, isTable: true, + hiddenInMain:true, sort: 'custom', table: { width: 150 @@ -618,6 +694,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1100 }, { label: '到库位代码', @@ -626,6 +703,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + sortTableDefault:1101 }, { label: '从库位组代码', @@ -634,6 +712,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '到库位组代码', @@ -642,6 +721,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '从库区代码', @@ -650,6 +730,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '到库区代码', @@ -658,6 +739,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '从货主代码', @@ -666,6 +748,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '到货主代码', @@ -674,6 +757,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '到货日期', @@ -686,6 +770,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -704,6 +789,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD' }, sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -728,6 +814,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -745,6 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, form: { component: 'InputNumber', } @@ -756,6 +844,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '目检照片', @@ -764,18 +853,19 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '不合格原因', field: 'failedReason', dictType: DICT_TYPE.PURCHASE_RETURN_REASON, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, + hiddenInMain:true, }, { label: '单价', @@ -786,7 +876,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', - } + }, + hiddenInMain:true, }, { label: '金额', @@ -797,7 +888,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', - } + }, + hiddenInMain:true, }, // { // label: '任务明细ID', @@ -815,6 +907,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, // { // label: '代码', @@ -829,12 +922,12 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, + hiddenInMain:true, }, { label: '备注', @@ -843,6 +936,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, }, { label: '创建时间', @@ -855,6 +949,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + hiddenInMain:true, form: { component: 'DatePicker', componentProps: { @@ -871,6 +966,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive table: { width: 150 }, + hiddenInMain:true, } ])) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index f89e6b02c..9140e90c4 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -49,14 +49,17 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( }, isForm: false, isSearch: true, + sortSearchDefault:1 }, { - label: '采购订单', + label: '采购订单号', field: 'ppNumber', sort: 'custom', table: { width: 180 }, + isSearch: true, + sortTableDefault:4, form: { // labelMessage: '信息提示说明!!!', componentProps: { @@ -79,6 +82,10 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 180 }, isForm: true, + sortTableDefault:2, + sortSearchDefault:3, + isSearch: true, + }, { label: '供应商代码', @@ -87,6 +94,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortSearchDefault:2, + sortTableDefault:1, isSearch: true, form: { // labelMessage: '信息提示说明!!!', @@ -153,7 +162,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isSearch: true, }, { label: '车牌号', @@ -187,6 +195,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable:false }, { label: '到仓库代码', @@ -196,13 +205,14 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable:false }, { label: '从库区类型范围', field: 'fromAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -214,7 +224,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( field: 'toAreaTypes', dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -229,6 +239,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable:false }, { label: '到库区代码范围', @@ -238,6 +249,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable:false }, { label: '到月台代码', @@ -247,11 +259,13 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable:false }, { label: '业务类型', field: 'businessType', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -292,6 +306,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable:false, isForm: false, }, { @@ -301,6 +316,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, isForm: false, }, { @@ -323,6 +339,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable:false, isForm: false, }, // { @@ -374,8 +391,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isSearch: true, isTable: true, + sortTableDefault:3, isForm:false, sort: 'custom', table: { @@ -393,7 +410,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( field: 'autoCommit', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', isForm:false, table: { @@ -414,7 +431,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( field: 'autoAgree', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -435,7 +452,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( field: 'autoExecute', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, isForm:false, sort: 'custom', table: { @@ -483,6 +500,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( }, isForm: false, isSearch: false, + isTable:false, }, { label: '操作', @@ -541,6 +559,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive