From c23243ef2d69063d5c5c539ca975b9fc34247423 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Mar 2024 09:36:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E8=BD=AC=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=20=E4=BF=AE=E5=A4=8D=E9=AA=8C=E8=AF=81=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7=E9=87=8D=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index a35ce47cc..39058e266 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -83,6 +83,7 @@ import { InventorymoveRequestMain,InventorymoveRequestMainRules,InventorymoveReq import * as InventorymoveRequestMainApi from '@/api/wms/inventorymoveRequestMain' import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { log } from 'console' // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -596,9 +597,10 @@ const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.packingNumber == item.packingNumber)) - console.log(rs); - + console.log(item,777777777777); + + let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) ) + console.log(rs,5666); if(rs.length > 1) isExist = true }) if (isExist) { @@ -617,7 +619,7 @@ const submitForm = async (formType, data) => { flag.value = true return; } - }) + }) if(flag.value){ formRef.value.formLoading = false return From 00230c640fd065613d2e4420c4ea85516dd17c69 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Mar 2024 13:02:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 6 +++++- .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 132062985..db7184c0c 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -121,11 +121,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row[formField] = val[0][searchField] } }else{ - const setV = {} + const setV = {} if(formField == 'areaCode') { console.log(val[0]); setV['areaCode'] = val[0]['code'] setV['areaType'] = val[0]['type'] + }else if(formField == 'inPackUnit') { + setV['inPackUnit'] = val[0]['code'] + }else if(formField == 'outPackUnit') { + setV['outPackUnit'] = val[0]['code'] }else{ setV[formField] = setV[0][searchField] } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index efa656f42..156c1f1df 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -603,6 +603,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ width: 150 }, tableForm: { + type: 'Select', disabled: true }, form: {