diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c1b82267f..7b4bd5492 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -677,6 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault: 10, isTableForm: false, + isSearch: true, isForm: false }, // { diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 0b7ac3bb1..62beaada4 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -674,9 +674,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, - sortTableDefault: 10, + }, + sortTableDefault: 10, isTableForm: false, + isSearch: true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 15014d8c3..380f8e7ff 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -999,6 +999,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7, isTableForm: false, + isSearch: true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 6bcfbacf7..379d7e890 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -677,6 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault: 10, isTableForm: false, + isSearch: true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d769fe1e8..840ec3aa2 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -785,6 +785,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, sortTableDefault: 10, isTableForm: false, + isSearch: true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d769fe1e8..95294ec72 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -784,6 +784,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', isSearch: true, @@ -245,7 +245,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', isSearch: false, @@ -258,6 +258,27 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive } } }, + // { + // label: '背番', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // isSearch: true, + // // sortTableDefault: 8, + // // sortSearchDefault: 5, + // tableForm: { + // disabled: true + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '计量单位', field: 'uom', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 15014d8c3..c32725723 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -999,7 +999,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7, isTableForm: false, - isForm: false + isForm: false, + isSearch: true, }, { label: '物料类型', @@ -1018,16 +1019,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas( } } }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain: true, - sortTableDefault: 7 - }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain: true, + // sortTableDefault: 7 + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index e89f88ecd..728c216c9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -678,7 +678,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault: 10, isTableForm: false, - isForm: false + isForm: false, + isSearch: true, }, // { // label: '物料描述1', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 60d477a41..4445a85d1 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -786,7 +786,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ sortTableDefault: 6, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -867,7 +867,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ sortSearchDefault: 5 }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -876,15 +876,36 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ sortTableDefault: 7, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - hiddenInMain:true, + isTableForm: false, + isForm: false, + isSearch: true, sortTableDefault: 8, + sortSearchDefault: 5, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // sortTableDefault: 8, + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index f50117219..c3e402613 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -746,7 +746,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -756,7 +756,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( sortSearchDefault: 6, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -765,15 +765,35 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( sortSearchDefault: 6, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortSearchDefault: 7, - hiddenInMain: true + isTableForm: false, + isForm: false, + isSearch: true, + sortSearchDefault: 6, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortSearchDefault: 7, + // hiddenInMain: true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 8725a4661..926526a66 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -41,7 +41,7 @@ const userDeptArray: any = [userDept] export const PurchasereceiptRecordMain1 = useCrudSchemas( reactive([ { - label: '物料代码', + label: '品番', field: 'itemCode', fixed: 'left', sort: 'custom', @@ -806,7 +806,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -847,7 +847,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -863,22 +863,22 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - isTableForm:false, - isTable:false, - hiddenInMain: true, + sortTableDefault: 7, + isTableForm: false, isForm: false, - tableForm:{ - disabled:true + isSearch: true, + tableForm: { + disabled: true }, form: { - componentProps:{ - disabled:true + componentProps: { + disabled: true } } }, @@ -1603,7 +1603,7 @@ export const PurchasereturnRequestDetailRules = reactive({ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([ { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -1619,7 +1619,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -844,7 +844,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -860,25 +860,36 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - isTableForm:false, - isTable:false, - hiddenInMain: true, + isTableForm: false, isForm: false, - tableForm:{ - disabled:true - }, - form: { - componentProps:{ - disabled:true - } - } + isSearch: true, }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm:false, + // isTable:false, + // hiddenInMain: true, + // isForm: false, + // tableForm:{ + // disabled:true + // }, + // form: { + // componentProps:{ + // disabled:true + // } + // } + // }, { label: '物料描述2', field: 'itemDesc2', @@ -1628,7 +1639,7 @@ export const PurchasereturnRequestDetailRules = reactive({ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([ { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -1643,6 +1654,25 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([ isSearch: true, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -776,7 +776,7 @@ export const PutawayJobDetail = useCrudSchemas(reactive([ sortTableDefault:3, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -785,14 +785,35 @@ export const PutawayJobDetail = useCrudSchemas(reactive([ sortTableDefault:3, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - hiddenInMain: true, + isTableForm: false, + isForm: false, + isSearch: true, + sortTableDefault: 3, + sortSearchDefault: 2, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain: true, + // }, { label: '物料描述2', field: 'itemdesc2', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index 7a0c13fd3..5e6abe769 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -604,7 +604,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive([ hiddenInMain:true, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -615,7 +615,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive([ sortTableDefault:4, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -623,6 +623,27 @@ export const PutawayRecordDetail = useCrudSchemas(reactive([ }, sortTableDefault:4, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isSearch: true, + sortSearchDefault: 2, + sortTableDefault: 4, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index e84f02946..412643247 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -598,7 +598,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ } }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -787,7 +787,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -798,16 +798,37 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - hiddenInMain:true, isTableForm: false, - isForm: false + isForm: false, + isSearch: true, + sortSearchDefault: 2, + sortTableDefault: 3, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // isTableForm: false, + // isForm: false + // }, { label: '物料描述2', field: 'itemDesc2', @@ -985,7 +1006,7 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive([ } } }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isSearch:true, + }, { label: '行类型', field: 'poLineType', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 15014d8c3..380f8e7ff 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -999,6 +999,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7, isTableForm: false, + isSearch: true, isForm: false }, { diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 1d778d264..06a6e51f7 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -677,6 +677,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault: 10, isTableForm: false, + isSearch: true, isForm: false }, // { diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d769fe1e8..840ec3aa2 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -785,6 +785,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive