Browse Source

HL-4976问题修改

linshi20240813
zhaoxuebing 3 months ago
parent
commit
64b1853d8e
  1. 2
      src/api/wms/balance/index.ts
  2. 4
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
  3. 179
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

2
src/api/wms/balance/index.ts

@ -58,7 +58,7 @@ export const getBalancePageReturn= async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/balance/senior', data })
return await request.post({ url: '/wms/balance/seniorReturn', data })
} else {
return await request.get({ url: `/wms/balance/pageReturn`, params })
}

4
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@ -304,6 +304,8 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
tableData.value.push(newRow)
}
})
row['fromLocationCode'] = val[0]['locationCode']
row['batch'] = val[0]['batch']
// row['inventoryBalance'] = val[0]['qty'] //
}else{
row[formField] = val[0][searchField]
@ -450,6 +452,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
} else if (formField == 'packingNumber'){
setV[formField] = val[0][searchField]
setV['inventoryBalance'] = val[0]['qty']
setV['batch'] = val[0]['batch']
setV['fromLocationCode'] = val[0]['locationCode']
}
else {
setV[formField] = val[0][searchField]

179
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@ -1023,71 +1023,74 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
tableForm: {
enterSearch: true,
// labelMessage: '信息提示说明!!!',
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位代码信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
searchCondition: [{
key: 'businessType',
value: 'PurchaseReturn',
message: '请填写业务类型',
isMainValue: false
},{
key: 'isIn',
value: 'out',
message: '',
isMainValue: false
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
tableForm:{
disabled:true
},
// form: {
// componentProps:{
// disabled:true
// }
// tableForm: {
// enterSearch: true,
// // labelMessage: '信息提示说明!!!',
// isInpuFocusShow: true, // 开启查询弹窗
// searchListPlaceholder: '请选择从库位代码',
// searchField: 'code',
// searchTitle: '库位代码信息',
// searchAllSchemas: Location.allSchemas,
// searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
// searchCondition: [{
// key: 'businessType',
// value: 'PurchaseReturn',
// message: '请填写业务类型',
// isMainValue: false
// },{
// key: 'isIn',
// value: 'out',
// message: '',
// isMainValue: false
// }],
// verificationParams: [{
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true,
// }], // 失去焦点校验参数
// },
form:{
// labelMessage: '信息提示说明!!!',
componentProps: {
enterSearch: true,
isSearchList: true,
searchListPlaceholder: '请选择从库位代码',
searchField: 'code',
searchTitle: '库位代码信息',
searchAllSchemas: Location.allSchemas,
searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
searchCondition: [{
key: 'businessType',
value: 'PurchaseReturn',
message: '请填写业务类型',
isMainValue: false
},{
key: 'isIn',
value: 'out',
message: '',
isMainValue: false
}],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
form: {
componentProps:{
disabled:true
}
},
// form:{
// // labelMessage: '信息提示说明!!!',
// componentProps: {
// enterSearch: true,
// isSearchList: true,
// searchListPlaceholder: '请选择从库位代码',
// searchField: 'code',
// searchTitle: '库位代码信息',
// searchAllSchemas: Location.allSchemas,
// searchPage: LocationApi.getLocationListByAreaAndBusinesstype,
// searchCondition: [{
// key: 'businessType',
// value: 'PurchaseReturn',
// message: '请填写业务类型',
// isMainValue: false
// },{
// key: 'isIn',
// value: 'out',
// message: '',
// isMainValue: false
// }],
// verificationParams: [{
// key: 'code',
// action: '==',
// value: '',
// isMainValue: false,
// isSearch: true,
// isFormModel: true,
// }], // 失去焦点校验参数
// }
// },
hiddenInMain: true,
isTable: false,
},
@ -1113,7 +1116,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
searchField: 'packingNumber',
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage,
searchPage: BalanceApi.getBalancePageReturn,
searchCondition: [{
key: 'itemCode',
value: 'itemCode',
@ -1121,21 +1124,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:true
},{
key: 'batch',
value: 'batch',
message: '请填写批次',
isTableRowValue: true, //查询当前searchTable表中行数据的值
// required:true,
isMainValue:true
},{
key: 'locationCode',
value: 'fromLocationCode',
message: '请选择从库位代码',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:true
}],
},
// {
// key: 'batch',
// value: 'batch',
// message: '请填写批次',
// isTableRowValue: true, //查询当前searchTable表中行数据的值
// // required:true,
// isMainValue:true
// }
],
verificationParams: [{
key: 'packingNumber',
action: '==',
@ -1155,7 +1153,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
searchField: 'packingNumber',
searchTitle: '库存余额信息', // 查询弹窗标题
searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
searchPage: BalanceApi.getBalancePage,
searchPage: BalanceApi.getBalancePageReturn,
searchCondition: [{
key: 'itemCode',
value: 'itemCode',
@ -1163,21 +1161,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
},{
key: 'batch',
value: 'batch',
message: '请填写批次',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
},{
key: 'locationCode',
value: 'fromLocationCode',
message: '请选择从库位代码',
isTableRowValue: true, //查询当前searchTable表中行数据的值
required:true,
isMainValue:false
}],
},
// {
// key: 'batch',
// value: 'batch',
// message: '请填写批次',
// isTableRowValue: true, //查询当前searchTable表中行数据的值
// required:true,
// isMainValue:false
// }
],
verificationParams: [{
key: 'packingNumber',
action: '==',

Loading…
Cancel
Save