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: { 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