Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

hella_online_20240816
parent
commit
37dbd68a75
  1. 4
      src/api/wms/purchasereturnRequestMain/index.ts
  2. 3
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

4
src/api/wms/purchasereturnRequestMain/index.ts

@ -52,6 +52,10 @@ export const getPurchasereturnRequestMain = async (id: number) => {
export const createPurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => { export const createPurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
return await request.post({ url: `/wms/purchasereturn-request-main/create`, data }) return await request.post({ url: `/wms/purchasereturn-request-main/create`, data })
} }
// 新增采购退货申请主 --新版
export const createPurchasereturnRequestMainNew = async (data: PurchasereturnRequestMainVO) => {
return await request.post({ url: `/wms/purchasereturn-request-main/createReturnNew`, data })
}
// 修改采购退货申请主 // 修改采购退货申请主
export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => { export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {

3
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@ -263,6 +263,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField=='itemCode'){ if(formField=='itemCode'){
setV['itemName'] = val[0]['name']
// //
let res = await PurchasereturnRequestDetailApi.getPurchasereturnSupplierByCode({ let res = await PurchasereturnRequestDetailApi.getPurchasereturnSupplierByCode({
itemCode:val[0][searchField] itemCode:val[0][searchField]
@ -899,7 +900,7 @@ const submitForm = async (formType, submitData) => {
try { try {
if (formType === 'create') { if (formType === 'create') {
data.returnSourceType='1' data.returnSourceType='1'
await PurchasereturnRequestMainApi.createPurchasereturnRequestMain(data) await PurchasereturnRequestMainApi.createPurchasereturnRequestMainNew(data)
message.success(t('common.createSuccess')) message.success(t('common.createSuccess'))
} else { } else {
data.returnSourceType='1' data.returnSourceType='1'

Loading…
Cancel
Save