diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 73a6e4b00..638be60f3 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -195,6 +195,7 @@ const getDefaultPackUnit = async (packUnitList)=>{ // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async() => { + debugger if (type == 'tableForm') { // 明细查询页赋值 if (formField == 'itemCode') { @@ -215,6 +216,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => productionLineCode:formRef.formModel['productionLineCode'],//生产线代码 workStationCode:formRef.formModel['workStationCode'],//工位代码 }) + newRow['itemDesc1'] = item['backNumber']//物料描述1赋值到背番 tableData.value.push(newRow) }) getDefaultPackUnit(packUnitList) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 6e8a7a458..ca5960d0c 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -946,6 +946,25 @@ export const IssueRequestDetail = useCrudSchemas( } } }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + isSearch: true, + isForm:false, + hiddenSearchHigh:true, + table: { + width: 150 + }, + form:{ + componentProps:{ + disabled: true, + } + }, + tableForm: { + disabled: true + }, + }, { label: '包装规格', field: 'packUnit', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index f357d52d5..68bd98e1b 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1020,7 +1020,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive([ }, { label: '背番', - field: 'backNumber', + field: 'itemDesc1', sort: 'custom', + isSearch:true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 2d5808af1..d53f82e56 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -776,8 +776,9 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, { label: '背番', - field: 'backNumber', + field: 'itemDesc1', sort: 'custom', + isSearch:true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts index d0fe02aad..9409a6cac 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts @@ -36,6 +36,22 @@ export const QadProductionPlanMain = useCrudSchemas(reactive([ width: 150, } }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + isSearch: true, +isForm:false, +hiddenSearchHigh:true, + table: { + width: 150 + }, +form:{ + componentProps:{ + disabled: true, + } + } + }, { label: '计划数量', field: 'planQty', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 4ed6c221c..7aa355a1d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -855,6 +855,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + isSearch:true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index ac0438821..4e8429631 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -514,6 +514,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isSearch:true, isTableForm: false, isForm: false, tableForm: { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 4292ab96d..e883644bc 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1037,7 +1037,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, + isSearch:true, isForm: false, sortTableDefault: 1003, sortSearchDefault: 5, @@ -1739,6 +1739,22 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } } }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '批次', field: 'batch', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index d9160451d..38da4828e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -856,6 +856,7 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + isSearch:true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index e4a593f9e..6557b14f6 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -515,6 +515,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( label: '背番', field: 'itemDesc1', sort: 'custom', + isSearch:true, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index c73c07710..48847f519 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1094,7 +1094,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas( table: { width: 150 }, - isTableForm: false, isForm: false, isSearch: true, sortTableDefault: 1003, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 3a6a0b293..9a42d5edf 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -2021,6 +2021,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive