sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

YT-588物料隔离变更

intex_online20241111
zhaoyiran 3 months ago
parent
268ae100e9
commit
2086385de9
2 changed files with 31 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
  2. 64
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

24
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
View File

@ -43,7 +43,7 @@
<BasicForm
ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="fromPackingNumber"
fieldTableColumn="fromBatch"
:includeCollectionTable="true"
@success="getList"
:rules="InventorymoveRequestMainRules"
@ -203,7 +203,7 @@ InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{
})
// 修改 tableform 属性
InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'fromPackingNumber') {
if(item.field == 'fromBatch') {
if (fromInventoryStatus.value) {
item.tableForm.searchCondition = [
{
@ -316,8 +316,8 @@ const toManagementPrecision = ref('')
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(async() => {
if (type == 'tableForm') {
if(formField == 'fromPackingNumber'){
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
if(formField == 'fromBatch'){
val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus']))
if(val.length==0) return
const toLocationCode =formRef.formModel.toLocationCode//主数据选择的到库位代码
@ -387,14 +387,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} else {
const setV = {}
if (formField == 'fromWarehouseCode') {
if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.push({
if(InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.push({
key: 'warehouseCode',
value: val[0]["code"],
isMainValue: false
})
} else {
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromPackingNumber')).tableForm.searchCondition.find(item => {
InventorymoveRequestDetail.allSchemas.tableFormColumns.find(item => (item.field == 'fromBatch')).tableForm.searchCondition.find(item => {
if (item.key == 'warehouseCode') {
item.value = val[0]["code"]
}
@ -410,8 +410,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
if(formField == 'fromPackingNumber') {
setV['fromPackingNumber'] = val[0]['packingNumber']
if(formField == 'fromBatch') {
// setV['fromPackingNumber'] = val[0]['packingNumber']
setV['fromContainerNumber'] = val[0]['containerNumber']
setV['itemCode'] = val[0]['itemCode']
setV['fromBatch'] = val[0]['batch']
@ -605,14 +605,14 @@ const openForm =async (type: string, row?: number) => {
* 详情 新增/编辑事件
*/
const detailOpenForm = (type, row) => {
if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.push({
if(InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.find(item => (item.key == 'warehouseCode')) == undefined){
InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.push({
key: 'warehouseCode',
value: fromWarehouseCodeMain.value,
isMainValue: false
})
} else {
InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromPackingNumber'))?.componentProps?.searchCondition.find(item => {
InventorymoveRequestDetail.allSchemas.formSchema.find(item => (item.field == 'fromBatch'))?.componentProps?.searchCondition.find(item => {
if (item.key == 'warehouseCode') {
item.value = fromWarehouseCodeMain.value
}

64
src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
View File

@ -1108,16 +1108,33 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
label: '从批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
tableForm:{
multiple:true,
disabled:true,
placeholder: '请选择从批次',
valueFormat: 'YYYYMMDD',
format: 'YYYYMMDD',
isInpuFocusShow: false, // 开启查询弹窗
searchListPlaceholder: '请选择从批次',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: BalanceShow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
disabled: true,
valueFormat: 'YYYYMMDD',
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择从批次',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: BalanceShow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
}
}
},
@ -1177,53 +1194,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
disabled: true
}
},
// {
// label: '供应商批次',
// field: 'altBatch',
// sort: 'custom',
// isForm:false,
// isSearch: false,
// table: {
// width: 150
// },
// form: {
// componentProps: {
// disabled: true
// }
// },
// tableForm: {
// disabled: false
// }
// },
{
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
tableForm:{
multiple:true,
disabled:true,
isInpuFocusShow: false, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: BalanceShow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择从包装号',
searchField: 'packingNumber',
searchTitle: '库存余额信息',
searchAllSchemas: BalanceShow.allSchemas,
searchPage: BalanceApi.selectLocationTypeToBalance,
}
}
},
{
label: '到包装号',
field: 'toPackingNumber',

Write Preview
Loading…
Cancel
Save