diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index aff706e66..39260c038 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -442,7 +442,7 @@ const handleRefused = async (id: number) => { } /** 审批通过按钮操作 */ -const handleAgree = async (id: number) => {. +const handleAgree = async (id: number) => { try{ await message.confirm(t('common.confirmAgree')) tableObject.loading = true diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 89320ff7c..098be8463 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -148,8 +148,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['supplierQty'] = val[0]['supplierQty'] row['supplierUom'] = val[0]['supplierUom'] row['inventoryStatus'] = val[0]['inventoryStatus'] - row['fromLocationCode'] = val[0]['locationCode'] - row['toLocationCode'] = null + row['fromLocationCode'] = val[0]['toLocationCode'] + row['toLocationCode'] = val[0]['toLocationCode'] row['fromLocationGroupCode'] = val[0]['locationGroupCode'] row['toLocationGroupCode'] = null row['toWarehouseCode'] = null @@ -261,8 +261,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['supplierQty'] = val[0]['supplierQty'] setV['supplierUom'] = val[0]['supplierUom'] setV['inventoryStatus'] = val[0]['inventoryStatus'] - setV['fromLocationCode'] = val[0]['locationCode'] - setV['toLocationCode'] = null + setV['fromLocationCode'] = val[0]['toLocationCode'] + setV['toLocationCode'] = val[0]['toLocationCode'] setV['fromLocationGroupCode'] = val[0]['locationGroupCode'] setV['toLocationGroupCode'] = null setV['toWarehouseCode'] = null @@ -281,6 +281,16 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['singlePrice'] = val[0]['singlePrice'] setV['amount'] = val[0]['amount'] setV['projectCode'] = val[0]['projectCode'] + + if(formField == 'itemCode'){ + setV['batch'] = val[0]['toBatch'] + setV['packingNumber'] = val[0]['toPackingNumber'] + setV['containerNumber'] = val[0]['toContainerNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['fromLocationCode'] = val[0]['fromLocationCode'] + setV['toLocationCode'] = val[0]['toLocationCode'] + } }else { setV[formField] = val[0][searchField] }