Browse Source

库存移动到库位高级筛选功能api添加

master
chenfang 10 months ago
parent
commit
8dbb6e0a15
  1. 8
      src/api/wms/location/index.ts
  2. 24
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
  3. 31
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  4. 14
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
  5. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
  6. 4
      src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

8
src/api/wms/location/index.ts

@ -76,5 +76,11 @@ export const importTemplate = () => {
} }
export const selectBusinessTypeToLocation = async (params) => { export const selectBusinessTypeToLocation = async (params) => {
return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/wms/location/pageBusinessTypeToLocationSenior', data })
} else {
return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params })
}
} }

24
src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts

@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS, dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
@ -710,17 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{ // {
label: '到库存状态', // label: '到库存状态',
field: 'toInventoryStatus', // field: 'toInventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS, // dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', // dictClass: 'string',
isTable: true, // isTable: true,
sort: 'custom', // sort: 'custom',
table: { // table: {
width: 150 // width: 150
}, // },
}, // },
{ {
label: '订单号', label: '订单号',
field: 'poNumber', field: 'poNumber',

31
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -151,6 +151,11 @@ const { tableObject, tableMethods } = useTable({
fromInventoryStatus.value = null fromInventoryStatus.value = null
businessType.value = 'InventorymoveRequest' businessType.value = 'InventorymoveRequest'
console.log(146 , businessType.value) console.log(146 , businessType.value)
}else {
tableObject.params = {
fromInventoryStatus: 'OK',
toInventoryStatus:'SCRAP'
}
} }
// tableform // tableform
@ -186,13 +191,6 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
delete item.tableForm.searchCondition delete item.tableForm.searchCondition
} }
} }
if(item.field == "toInventoryStatus"){
if (fromInventoryStatus.value) {
item.tableForm.disabled = true
} else {
item.tableForm.disabled = false
}
}
if(item.field == "toLocationCode"){ if(item.field == "toLocationCode"){
if (toInventoryStatus.value) { if (toInventoryStatus.value) {
item.tableForm.searchCondition = [ item.tableForm.searchCondition = [
@ -252,7 +250,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}else if ( routeName.value == 'ScraptoholdRequestMain') { }else if ( routeName.value == 'ScraptoholdRequestMain') {
row['toInventoryStatus'] = "HOLD" row['toInventoryStatus'] = "HOLD"
}else{ }else{
row['toInventoryStatus'] = null row['toInventoryStatus'] = val[0]['inventoryStatus']
} }
} else { } else {
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
@ -287,7 +285,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
}else if ( routeName.value == 'ScraptoholdRequestMain') { }else if ( routeName.value == 'ScraptoholdRequestMain') {
setV['toInventoryStatus'] = "HOLD" setV['toInventoryStatus'] = "HOLD"
}else{ }else{
setV['toInventoryStatus'] = null setV['toInventoryStatus'] = val[0]['inventoryStatus']
} }
} else { } else {
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
@ -454,7 +452,20 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(setSearchParams) const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(setSearchParams)
download.excel(data, '库存转移申请主.xlsx') if(routeName.value == 'OktoholdRequestMain'){
download.excel(data, '合格转隔离申请主.xlsx')
}else if ( routeName.value == 'HoldtookRequestMain') {
download.excel(data, '隔离转合格申请主.xlsx')
}else if ( routeName.value == 'HoldtoscrapRequestMain') {
download.excel(data, '隔离转报废申请主.xlsx')
}else if ( routeName.value == 'OktoscrapRequestMain') {
download.excel(data, '合格转报废申请主.xlsx')
}else if ( routeName.value == 'ScraptoholdRequestMain') {
download.excel(data, '报废转隔离申请主.xlsx')
}else{
download.excel(data, '库存转移申请主.xlsx')
}
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

14
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@ -152,8 +152,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '从库位类型范围', label: '从库位类型范围',
field: 'fromLocationTypes', field: 'fromLocationTypes',
dictType: DICT_TYPE.LOCATION_TYPE, // dictType: DICT_TYPE.LOCATION_TYPE,
dictClass: 'string', // dictClass: 'string',
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
@ -182,8 +182,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{ {
label: '到库位类型范围', label: '到库位类型范围',
field: 'toLocationTypes', field: 'toLocationTypes',
dictType: DICT_TYPE.LOCATION_TYPE, // dictType: DICT_TYPE.LOCATION_TYPE,
dictClass: 'string', // dictClass: 'string',
isTable: true, isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
@ -726,8 +726,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
width: 150 width: 150
}, },
tableForm: { tableForm: {
disabled: true,
type: 'Select' type: 'Select'
}, },
form: {
componentProps: {
disabled: true
}
}
}, },
{ {
label: '从货主代码', label: '从货主代码',

2
src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@ -115,7 +115,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false, isForm: false,
}, },
{ {
label: '单据号11', label: '单据号',
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
table: { table: {

4
src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@ -396,6 +396,10 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}] }]
}, },
form: { form: {

Loading…
Cancel
Save