From 2c3da301df3f7c9d61db56348396770b239e95da Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 22 Jul 2024 19:38:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=81=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E3=80=81=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnJobMain/index.vue | 2 +- .../productionreturn/productionreturnRecordMain/index.vue | 2 +- .../productionreturnRequestMain/index.vue | 4 ++-- .../productionreturnRequestMainNo/index.vue | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index fc7c9400a..2d64cb732 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -260,7 +260,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"jobProductionreturnMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index cd2f00442..ae8aebbeb 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -144,7 +144,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"recordProductionreturnMain") } /** 导出按钮操作 */ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index a77b1ffdb..82d8d0dfa 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -191,7 +191,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){ message.warning(`物料${val[0]['itemCode']}已经存在`) return - } + } const isType = await isItemType(val[0]['itemCode'], labelType.value) if(!isType){ @@ -574,7 +574,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestProductionreturnMain") } /** 详情操作——子表表单 */ const detailOpenForm = (type, row) => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index e736a4825..529e57f8a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -181,12 +181,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => message.warning(`物料${val[0]['itemCode']}已经存在`) return } - + const isType = await isItemType(val[0]['itemCode'], labelType.value) if(!isType){ message.warning('当前物料可制造与其他数据不一致,请重新选择!') } else { - + row['batch'] = val[0]['batch']==''?formatTime(new Date(), 'yyyyMMdd'):val[0]['batch'] row['itemCode'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] @@ -524,7 +524,7 @@ const openForm =async (type: string, row?: number) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue) + detailRef.value.openDetail(row, titleName, titleValue,"requestProductionreturnMainNo") } /** 删除按钮操作 */ @@ -716,7 +716,7 @@ const labelPrint = async (row) => { // 批量打印--生产退料 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { - + console.log('批量打印',val) // let rows:any = [] // val.forEach(item=>{