From f267364fe1c72103b88e52f7f7d853b4cf6c859d Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 24 Dec 2024 18:19:22 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueRequestMain/index.vue | 2 ++ .../issueRequestMain/issueRequestMain.data.ts | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) 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', From 2a8d0c4e1a077a5ebe00d09fb55a75864f666770 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 24 Dec 2024 18:31:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?YT-1662=EF=BC=9A=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E8=83=8C=E7=95=AA+=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 Date: Tue, 24 Dec 2024 18:57:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?YT-1662=EF=BC=9A=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 3 ++- .../productionMainAssemble.data.ts | 3 ++- .../qadProductionPlanMain.data.ts | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index a4cf8f1d0..651f29fe9 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -789,8 +789,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/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', From 91998f5be2f5d1e45cc7d13efc8cc3eab393ab70 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 24 Dec 2024 19:24:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?YT-1662=EF=BC=9A=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 18 +++++++++++++++++- .../supplierdeliverRequestMain.data.ts | 8 ++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) 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/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 307f467b1..1d36e9d90 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -2023,6 +2023,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive Date: Tue, 24 Dec 2024 19:28:00 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=A1=A5=E7=BB=99=E5=93=81=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptJobMain/productreceiptJobMain.data.ts | 1 + .../productreceiptRecordMain/productreceiptRecordMain.data.ts | 1 + 2 files changed, 2 insertions(+) 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: { From f0543991353164b65a273040e656b13dc6866e26 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 24 Dec 2024 19:34:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain.data.ts | 1 - 1 file changed, 1 deletion(-) 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, From 528835a357c80c53ce50fd7b450f0d4f98dd5f57 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 24 Dec 2024 19:36:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8F=B7=E5=8F=A3=E5=93=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleJobMain.data.ts | 1 + .../productreceiptAssembleRecordMain.data.ts | 1 + 2 files changed, 2 insertions(+) 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 },