diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 50ffd9583..905a255d5 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -22,95 +22,143 @@ const { t } = useI18n() // 国际化 * tableFormBlur 表格表单失去焦点时候获取焦点 * FormBlur 表格失去焦点时候获取焦点 */ -export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => { - if ( - headerItem.field == 'fromPackingNumber' || - headerItem.field == 'packingNumber' || - headerItem.field == 'itemCode' || - headerItem.field == 'packUnit' || - headerItem.field == 'secondPackUnit' || - headerItem.field == 'fromPackUnit' || - headerItem.field == 'toPackUnit'|| - headerItem.field == 'toPackUnit'|| - headerItem.field == 'supplierItemCode' - - ) { - let searchField = headerItem.field - let pageApi = ref() - let params = ref() - +export const tableFormBlurVer = async (headerItem, val, row, index, routeName, formRef, detailData, tableData, callback) => { + if (headerItem.tableForm.searchPage && headerItem.tableForm.verificationParams) { if (val && isString(val)) { - // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field) if (val.indexOf(',') > -1) { message.alert('该输入框只能输入一条数据') row[headerItem.field] = '' return } // 校验 - let params = ref({}) - let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + const params = ref({}) + const filters: any[] = [] + const searchCondition = headerItem.tableForm.searchCondition //获取data.ts参数信息 + const verificationParams = headerItem.tableForm.verificationParams //获取data.ts参数信息 // 循环参数设置参数为key:value格式 - if (searchCondition1 && searchCondition1.length > 0) { - for (let i = 0; i < searchCondition1.length; i++) { - if (searchCondition1[i].isMainValue) { - params.value[searchCondition1[i].key] = formRef.formModel[ - searchCondition1[i].value + if (searchCondition && searchCondition.length > 0) { + for (let i = 0; i < searchCondition.length; i++) { + if (searchCondition[i].isMainValue) { + params.value[searchCondition[i].key] = formRef.formModel[ + searchCondition[i].value ] - ? formRef.formModel[searchCondition1[i].value] + ? formRef.formModel[searchCondition[i].value] : detailData - ? detailData[searchCondition1[i].value] - : row - ? row[searchCondition1[i].value] - : '' + ? detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' // 是否含有空参数情况 let isNull = false if ( - params.value[searchCondition1[i].key] == '' || - params.value[searchCondition1[i].key] == undefined + params.value[searchCondition[i].key] == '' || + params.value[searchCondition[i].key] == undefined ) { isNull = true } if (isNull) { message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' ) row[headerItem.field] = '' return } + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: formRef.formModel[searchCondition[i].value] + }) + } else if (searchCondition[i].isTableRowValue) { + if (searchCondition[i].required) { + if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { + message.warning( + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } + //查询当前table表数据的值 + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: row[searchCondition[i].value] + }) } else { // 扩展 转换为筛选条件进行查询 - if (searchCondition1[i].isSearch) { - if (searchCondition1[i].isFormModel) { + if (searchCondition[i].isSearch) { + if (searchCondition[i].isFormModel) { //用formModel中的值 - if (searchCondition1[i].required) { + if (searchCondition[i].required) { if ( - formRef.formModel[searchCondition1[i].value] == '' || - formRef.formModel[searchCondition1[i].value] == undefined + formRef.formModel[searchCondition[i].value] == '' || + formRef.formModel[searchCondition[i].value] == undefined ) { message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' ) row[headerItem.field] = '' return } } + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: formRef.formModel[searchCondition[i].value] + }) + } else { + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) } } else { - params.value[searchCondition1[i].key] = searchCondition1[i].value + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) } } } } - params.value[headerItem.field] = val?.trim() + if (verificationParams && verificationParams.length > 0) { + // 转换筛选条件所需 + for (let i = 0; i < verificationParams.length; i++) { + // 扩展 转换为筛选条件进行查询 + if (verificationParams[i].isSearch) { + if (verificationParams[i].isFormModel) { + filters.push({ + action: verificationParams[i].action, + column: verificationParams[i].key, + value: formRef.formModel[verificationParams[i].value] + ? formRef.formModel[verificationParams[i].value] + : val.trim() + }) + } else { + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) + } + } else { + params[verificationParams[i].key] = verificationParams[i].value + } + } + } // 判断改包装号是否已经添加 const seen = new Set() const repeatCode = new Set() - let arr = tableData.map((item) => item[headerItem.field]?.trim()) + const arr = tableData.map((item) => item[headerItem.field]?.trim()) arr.forEach((item) => { - if (seen.has(item)) { - repeatCode.add(item) - } else { - seen.add(item) + if (item) { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } } }) const arr1 = Array.from(repeatCode) @@ -119,132 +167,258 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for row[headerItem.field] = '' return } - if ( - headerItem.field == 'fromPackingNumber' || - headerItem.field == 'packingNumber' || - headerItem.field == 'itemCode' - ) { - // 业务 - // 采购退货申请,制品拆解,调拨出库,报废出库申请,合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请,库存修改申请 - if ( - routeName == 'PurchasereturnRequestMain' || - routeName == 'ProductdismantleRequestMain' || - routeName == 'TransferissueRequestMain' || - routeName == 'ScrapRequestMain' || - routeName == 'OktoholdRequestMain' || - routeName == 'HoldtookRequestMain' || - routeName == 'HoldtoscrapRequestMain' || - routeName == 'OktoscrapRequestMain' || - routeName == 'ScraptoholdRequestMain' || - routeName == 'InventorymoveRequestMain' || - routeName == 'InventorychangeRequestMain' - ) { - // //合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同 - // if ( - // routeName == 'OktoholdRequestMain' || - // routeName == 'HoldtookRequestMain' || - // routeName == 'HoldtoscrapRequestMain' || - // routeName == 'OktoscrapRequestMain' || - // routeName == 'ScraptoholdRequestMain' || - // routeName == 'InventorymoveRequestMain' || - // routeName == 'InventorychangeRequestMain' - // ) { - // searchField = 'packingNumber' - // params.value.packingNumber = val?.trim() - // } - // pageApi.value = getBalanceItemListByCodes - } else if ( - routeName == 'RepleinshRequestMain' || - routeName == 'IssueRequestMain' || - routeName == 'InventoryinitRequestMain' - ) { - // 补料申请业务 - pageApi.value = getItemListByCodes - searchField = 'code' - params.value.codes = val?.trim() - } else if ( - routeName == 'ProductionMainAssemble' || - routeName == 'ProductionMainASparePart' || - routeName == 'ProductionMainPredictSparePart' || - routeName == 'ProductreceiptRequestMain' || - routeName == 'ProductreceiptRequestMainA' || - routeName == 'ProductreceiptscrapRequestMain' || - routeName == 'ProductscrapRequestMain' - ) { - // 装配计划,裝配备件计划,预备产件计划,预生产收货申请,装配收货申请,报修收货申请,制品报废申请 - pageApi.value = getProductionLineCodelistByCodes - params.value.productionLineCode= - formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, - params.value.itemCodes=val?.trim() - } - } else if ( - headerItem.field == 'packUnit' || - headerItem.field == 'secondPackUnit' || - headerItem.field == 'fromPackUnit' || - headerItem.field == 'toPackUnit' - ) { - searchField = 'packUnit' - //包装规格 - // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请,计划外入库,计划外出库,翻包申请 - if ( - routeName == 'ProductreceiptRequestMain' || - routeName == 'ProductreceiptRequestMainA' || - routeName == 'ProductreceiptscrapRequestMain' || - routeName == 'CustomerreturnRequestMain' || - routeName == 'UnplannedreceiptRequestMain' || - routeName == 'UnplannedissueJobMain' || - routeName == 'PackageoverRequestMain' - ) { - params.value.itemCode= row.itemCode - params.value.packUnit= val?.trim() - pageApi.value = getItemPackageunitListByCodes - } - } else if ( - headerItem.field == 'supplierItemCode' - ) { - // 生产退料申请,隔离退料申请 - if ( - routeName == 'ProductionreturnRequestMain' || - routeName == 'ProductionreturnRequestMainNo' - ) { - searchField = 'supplierCode' - params.value.itemCodes= row.itemCode - params.value.supplierCode= val?.trim() - pageApi.value = getSupplierItemListByCodes - } + if (filters.length > 0) { + params.value.isSearch = true + params.value.filters = filters + } + const obj = { + by: 'ASC', + pageNo: 1, + pageSize: 20 + } + params.value = { + isSearch: params.value.isSearch, + filters: params.value.filters, + ...obj } const list = ref() // 调取包装接口 - await pageApi.value(params.value).then(async (res) => { - list.value = res ? res : [] + await headerItem.tableForm.searchPage(params.value).then(async (res) => { + + list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : [] // 只查一条数据,多条数据查询默认显示不存在 - if (res.length == 1) { - callback(searchField,list.value) - } else { + if (list.value?.length == 0) { message.alert('代码' + row[headerItem.field] + '没有找到对应数据') row[headerItem.field] = '' return } + callback(list.value) }) } + } else { + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' || + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit'|| + headerItem.field == 'toPackUnit'|| + headerItem.field == 'supplierItemCode' + + ) { + let searchField = headerItem.field + let pageApi = ref() + let params = ref() + + if (val && isString(val)) { + // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field) + if (val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + row[headerItem.field] = '' + return + } + // 校验 + let params = ref({}) + let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key:value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + params.value[searchCondition1[i].key] = formRef.formModel[ + searchCondition1[i].value + ] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : row + ? row[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if ( + params.value[searchCondition1[i].key] == '' || + params.value[searchCondition1[i].key] == undefined + ) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition1[i].isSearch) { + if (searchCondition1[i].isFormModel) { + //用formModel中的值 + if (searchCondition1[i].required) { + if ( + formRef.formModel[searchCondition1[i].value] == '' || + formRef.formModel[searchCondition1[i].value] == undefined + ) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + params.value[headerItem.field] = val?.trim() + // 判断改包装号是否已经添加 + const seen = new Set() + const repeatCode = new Set() + let arr = tableData.map((item) => item[headerItem.field]?.trim()) + arr.forEach((item) => { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } + }) + const arr1 = Array.from(repeatCode) + if (arr1.length > 0) { + message.warning(`${arr1.join(',')}${t('ts.已经存在')}`) + row[headerItem.field] = '' + return + } + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' + ) { + // 业务 + // 采购退货申请,制品拆解,调拨出库,报废出库申请,合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请,库存修改申请 + if ( + routeName == 'PurchasereturnRequestMain' || + routeName == 'ProductdismantleRequestMain' || + routeName == 'TransferissueRequestMain' || + routeName == 'ScrapRequestMain' || + routeName == 'OktoholdRequestMain' || + routeName == 'HoldtookRequestMain' || + routeName == 'HoldtoscrapRequestMain' || + routeName == 'OktoscrapRequestMain' || + routeName == 'ScraptoholdRequestMain' || + routeName == 'InventorymoveRequestMain' || + routeName == 'InventorychangeRequestMain' + ) { + // //合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同 + // if ( + // routeName == 'OktoholdRequestMain' || + // routeName == 'HoldtookRequestMain' || + // routeName == 'HoldtoscrapRequestMain' || + // routeName == 'OktoscrapRequestMain' || + // routeName == 'ScraptoholdRequestMain' || + // routeName == 'InventorymoveRequestMain' || + // routeName == 'InventorychangeRequestMain' + // ) { + // searchField = 'packingNumber' + // params.value.packingNumber = val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + } else if ( + routeName == 'RepleinshRequestMain' || + routeName == 'IssueRequestMain' || + routeName == 'InventoryinitRequestMain' + ) { + // 补料申请业务 + pageApi.value = getItemListByCodes + searchField = 'code' + params.value.codes = val?.trim() + } else if ( + routeName == 'ProductionMainAssemble' || + routeName == 'ProductionMainASparePart' || + routeName == 'ProductionMainPredictSparePart' || + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'ProductscrapRequestMain' + ) { + // 装配计划,裝配备件计划,预备产件计划,预生产收货申请,装配收货申请,报修收货申请,制品报废申请 + pageApi.value = getProductionLineCodelistByCodes + params.value.productionLineCode= + formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, + params.value.itemCodes=val?.trim() + } + } else if ( + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit' + ) { + searchField = 'packUnit' + //包装规格 + // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请,计划外入库,计划外出库,翻包申请 + if ( + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'CustomerreturnRequestMain' || + routeName == 'UnplannedreceiptRequestMain' || + routeName == 'UnplannedissueJobMain' || + routeName == 'PackageoverRequestMain' + ) { + params.value.itemCode= row.itemCode + params.value.packUnit= val?.trim() + pageApi.value = getItemPackageunitListByCodes + } + } else if ( + headerItem.field == 'supplierItemCode' + ) { + // 生产退料申请,隔离退料申请 + if ( + routeName == 'ProductionreturnRequestMain' || + routeName == 'ProductionreturnRequestMainNo' + ) { + searchField = 'supplierCode' + params.value.itemCodes= row.itemCode + params.value.supplierCode= val?.trim() + pageApi.value = getSupplierItemListByCodes + } + } + const list = ref() + // 调取包装接口 + await pageApi.value(params.value).then(async (res) => { + list.value = res ? res : [] + // 只查一条数据,多条数据查询默认显示不存在 + if (res.length == 1) { + callback(list.value) + } else { + message.alert('代码' + row[headerItem.field] + '没有找到对应数据') + row[headerItem.field] = '' + return + } + }) + } + } } } export const FormBlur = async (field, val, routeName, formRef, detailData, formSchema, callback) => { if (formSchema.searchPage && formSchema.verificationParams) { //获取data.ts参数信息 - let searchCondition = formSchema?.searchCondition || [] + const searchCondition = formSchema?.searchCondition || [] //获取失去焦点参数信息 - let verificationParams = formSchema?.verificationParams || + const verificationParams = formSchema?.verificationParams || [] console.log('走新方法啦') // searchCondition = [...searchCondition, ...verificationParams] if (val && isString(val)) { - let setV = {} + const setV = {} setV[field] = '' let params = {} const _searchCondition = {} - let filters: any[] = [] + const filters: any[] = [] if (searchCondition && searchCondition.length > 0) { // 转换筛选条件所需 for (let i = 0; i < searchCondition.length; i++) { @@ -359,12 +533,13 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS } } } + console.log(filters) if (filters.length > 0) { _searchCondition.isSearch = true _searchCondition.filters = filters } console.log(4545, _searchCondition) - let obj = { + const obj = { by: 'ASC', pageNo: 1, pageSize: 20 @@ -382,8 +557,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS return } await formSchema.searchPage(params).then((res) => { - let arr1 = val.split(',') - let list = ref([]) + const arr1 = val.split(',') + const list = ref([]) list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : [] if (list.value?.length == 0) { message.alert('暂无数据') @@ -391,8 +566,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS return } if (arr1.length != list.value.length) { - let arr2 = list.value.map((item) => item.code) - let str = [ + const arr2 = list.value.map((item) => item.code) + const str = [ ...arr1.filter((item) => !arr2.includes(item)), ...arr2.filter((item) => !arr1.includes(item)) ].join(',') diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts index 724b20757..177d2cf08 100644 --- a/src/api/wms/inventorymoveJobMain/index.ts +++ b/src/api/wms/inventorymoveJobMain/index.ts @@ -96,6 +96,17 @@ export const exportOkToHoldJobMain = async (params) => { } } +// 导出不合格转隔离任务主 Excel +export const exportNokToHoldJobMain = async (params) => { + params.businessType = 'NokToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} // 导出隔离转合格任务主 Excel export const exportHoldToOkJobMain = async (params) => { params.businessType = 'HoldToOk' diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 885baae74..9d9c4f083 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -81,7 +81,17 @@ export const exportOkToHoldRecordMain = async (params) => { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } } - +// 导出合格转隔离记录主 Excel +export const exportNokToHoldRecordMain = async (params) => { + params.businessType = 'NokToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} // 导出隔离转合格记录主 Excel export const exportHoldToOkRecordMain = async (params) => { params.businessType = 'HoldToOk' diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 74928cee4..99a390f19 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -904,11 +904,11 @@ const inputStringBlur = async (headerItem, val, row, index) => { formRef.value, props.detailData, props.tableData, - (searchField, list) => { + ( list) => { emit( 'searchTableSuccess', headerItem.field, - searchField, + headerItem.tableForm.searchField, list, formRef.value, 'tableForm', diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index af771ca97..081511ac3 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -457,7 +457,7 @@ export const InspectionMain = useCrudSchemas(       isForm: false,       isDetail: false,       table: { -        width: 150, +        width: 300,         fixed: 'right'       }     } diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index c663d5db3..b26aca289 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -351,6 +351,14 @@ export const Callmaterials = useCrudSchemas(reactive([ }] }, }, + { + label: '项目', + field: 'project', + sort: 'custom', + table: { + width: 100 + } , + }, { label: '库位', field: 'location', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 308e02f7a..0e728c496 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -642,7 +642,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, sortSearchDefault:1000, - isSearch: true, + // isSearch: true, sortTableDefault:1100, isTableForm: false, }, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index f3cd6989c..1c749d79f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -83,7 +83,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...InventorymoveJobMain.allSchemas.tableColumns,...InventorymoveJobDetail.allSchemas.tableMainColumns]) - +const businessType = ref() const fromInventoryStatus = ref() const toInventoryStatus = ref() @@ -142,46 +142,67 @@ const importFileName = ref() if ( routeName.value == 'OktoholdJobMain') { tableObject.params = { fromInventoryStatus: 'OK', - toInventoryStatus:'HOLD' + toInventoryStatus:'HOLD', + businessType :'OkToHold' } fromInventoryStatus.value = 'OK' toInventoryStatus.value = "HOLD" + businessType.value = 'OkToHold' importFileName.value = '合格转隔离任务' +} else if ( routeName.value == 'NoktoholdJobMain') { + tableObject.params = { + fromInventoryStatus: 'NOK', + toInventoryStatus:'HOLD', + businessType :'NokToHold' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + businessType.value = 'NokToHold' + importFileName.value = '不合格转隔离任务' } else if ( routeName.value == 'HoldtookJobMain') { tableObject.params = { fromInventoryStatus: 'HOLD', - toInventoryStatus:'OK' + toInventoryStatus:'OK', + businessType :'HoldToOk' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "OK" + businessType.value = 'HoldToOk' importFileName.value = '隔离转合格任务' } else if ( routeName.value == 'HoldtoscrapJobMain') { tableObject.params = { fromInventoryStatus: 'HOLD', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType:'HoldToScrap' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "SCRAP" + businessType.value = 'HoldToScrap' importFileName.value = '隔离转报废任务' } else if ( routeName.value == 'OktoscrapJobMain') { tableObject.params = { fromInventoryStatus: 'OK', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType :'OkToScrap' } fromInventoryStatus.value = 'OK' toInventoryStatus.value = "SCRAP" + businessType.value = 'OkToScrap' importFileName.value = '合格转报废任务' } else if ( routeName.value == 'ScraptoholdJobMain') { tableObject.params = { fromInventoryStatus: 'SCRAP', - toInventoryStatus:'HOLD' + toInventoryStatus:'HOLD', + businessType :'ScrapToHold' } fromInventoryStatus.value = 'SCRAP' toInventoryStatus.value = "HOLD" + businessType.value = 'ScrapToHold' importFileName.value = '报废转隔离任务' } else { console.log(146 , fromInventoryStatus.value) fromInventoryStatus.value = null + businessType.value = 'Move' importFileName.value = '库存移动任务' } @@ -281,6 +302,9 @@ const handleExport = async () => { if(routeName.value == 'OktoholdJobMain'){ const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params) download.excel(data, '合格转隔离任务主.xlsx') + }else if ( routeName.value == 'HoldtookJobMain') { + const data = await InventorymoveJobMainApi.exportNokToHoldJobMain(tableObject.params) + download.excel(data, '不合格转隔离任务主.xlsx') }else if ( routeName.value == 'HoldtookJobMain') { const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params) download.excel(data, '隔离转合格任务主.xlsx') diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 99361d936..b788e1f57 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -108,7 +108,15 @@ const { tableObject, tableMethods } = useTable({ fromInventoryStatus.value = 'OK' toInventoryStatus.value = "HOLD" importFileName.value = '合格转隔离记录' -} else if ( routeName.value == 'HoldtookRecordMain') { +} else if ( routeName.value == 'NoktoholdRecordMain') { + tableObject.params = { + fromInventoryStatus: 'NOK', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + importFileName.value = '不合格转隔离记录' +}else if ( routeName.value == 'HoldtookRecordMain') { tableObject.params = { fromInventoryStatus: 'HOLD', toInventoryStatus:'OK' @@ -219,6 +227,9 @@ const handleExport = async () => { if(routeName.value == 'OktoholdRecordMain'){ const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) download.excel(data, '合格转隔离记录主.xlsx') + }else if ( routeName.value == 'HoldtookRecordMain') { + const data = await InventorymoveRecordMainApi.exportNokToHoldRecordMain(tableObject.params) + download.excel(data, '不合格转隔离记录主.xlsx') }else if ( routeName.value == 'HoldtookRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params) download.excel(data, '隔离转合格记录主.xlsx') diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index c1564e2df..c70346383 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -431,14 +431,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '在途库库位', - field: 'onTheWayLocationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '在途库库位', + // field: 'onTheWayLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '从批次', field: 'fromBatch', @@ -614,14 +614,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, // { // label: '任务明细ID', // field: 'jobDetailId', diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index a6a53ba52..48ff2d557 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -612,7 +612,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 180 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, form: { componentProps: { @@ -627,7 +627,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, }, { label: '创建时间', @@ -640,7 +640,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 180 }, - hiddeInMain: true, + hiddenInMain: true, form: { component: 'DatePicker', componentProps: { @@ -659,7 +659,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, @@ -671,7 +671,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, @@ -682,7 +682,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, @@ -693,7 +693,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, @@ -704,7 +704,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, form: { component: 'InputNumber', componentProps: { @@ -726,7 +726,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, @@ -737,7 +737,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddeInMain: true, + hiddenInMain: true, isTableForm: false, isForm: false }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 7253d12da..81838b9a2 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -724,7 +724,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isDetail: false, isForm: false , table: { - width: 150, + width: 220, fixed: 'right' }, isTableForm:true, diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 4c22a63cc..3fac21ff8 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -1068,11 +1068,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ isDetail: false, isForm: false , hiddenInMain:true, + isTableForm:false, table: { width: 150, fixed: 'right' }, - hiddeInMain:true, tableForm: { type: 'action', buttonText: 'Bom', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index abb308c19..d2e2d5928 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -975,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive( action: '==', // 查询拼接条件 isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isForm: true, @@ -966,6 +974,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '供应商信息', // 查询弹窗标题 searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 + searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -209,6 +217,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 @@ -221,7 +230,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ key: 'supplierCode', value: 'supplierCode', isMainValue: true - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -871,7 +888,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, + // isSearch: true, isTable: true, sort: 'custom', table: { @@ -943,7 +960,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, // labelMessage: '信息提示说明!!!', isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择从库位代码', @@ -961,7 +979,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'out', message: '', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, // form: { // componentProps:{ @@ -971,6 +997,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form:{ // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择从库位代码', searchField: 'code', @@ -987,7 +1014,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'out', message: '', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, hiddenInMain: true, @@ -1008,7 +1043,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive // } // }, form: { - componentProps:{ + componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', @@ -1036,10 +1072,19 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:true - }] + }], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, - tableForm:{ + tableForm: { + enterSearch: true, multiple: true, // labelMessage: '信息提示说明!!!', isInpuFocusShow: true, // 开启查询弹窗 @@ -1069,7 +1114,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:false - }] + }], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 767c6f791..c3e136109 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -84,7 +84,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( action: '==', // 查询拼接条件 isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isForm: true, @@ -967,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive