diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts deleted file mode 100644 index 6329afa0b..000000000 --- a/src/api/wms/business/business.ts +++ /dev/null @@ -1,524 +0,0 @@ -// 获取供应商列表 -import { getSupplierListByCodes, importTemplate } from '@/api/wms/supplier' -// 获取物料列表 -import { getItemListByCodes } from '@/api/wms/itembasic' -// 获取供应商物料列表 -import { getSupplierItemListByCodes } from '@/api/wms/supplieritem' -// 获取生产线物料 -import { getProductionLineCodelistByCodes } from '@/api/wms/productionlineitem' -// 获取包装规格 -import { getPackageunitListByCodes } from '@/api/wms/packageunit' -// 获取物料包装规格 -import { getItemPackageunitListByCodes } from '@/api/wms/itempackage' -// 获取客户物料 -import { getCustomerItemListByCodes } from '@/api/wms/customeritem' -// 获取库存余额 -import { getBalanceItemListByCodes } from '@/api/wms/balance' -import { isString } from 'min-dash' -const message = useMessage() // 消息弹窗 -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() - - 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(searchField,list.value) - } else { - message.alert('代码' + row[headerItem.field] + '没有找到对应数据') - row[headerItem.field] = '' - return - } - }) - } - } -} -export const FormBlur = async (formField, val,routeName,formRef,detailData,formSchema,callback) => { - let pageApi = ref() - let params = ref() - let setV = {} - setV[formField] = '' - if (val && isString(val)) { - if ( - formField == 'supplierCode' || - formField == 'itemCode' || - formField == 'productItemCode' || - formField == 'componentItemCode' || - formField == 'packUnit' || - formField == 'inPackUnit' || - formField == 'fromPackingNumber' - ) { - let searchField = 'code' - if (formField == 'supplierCode') { - params.value = val?.trim() - pageApi.value = getSupplierListByCodes - } else if ( - formField == 'itemCode' || - formField == 'productItemCode' || - formField == 'componentItemCode' - ) { - // 销售价格单 - if (routeName == 'Saleprice') { - params.value = { - customerCode: formRef.formModel.customerCode, - itemCodes: val?.trim() - } - pageApi.value = getCustomerItemListByCodes - searchField = 'itemCode' - }else if (routeName == 'ProductscrapRequestMain') { - // 制品报废申请 - params.value = { - productionLineCode: - detailData.productionLine || detailData.productionLineCode, - itemCodes: val?.trim() - } - pageApi.value = getProductionLineCodelistByCodes - searchField = 'itemCode' - }else { - // params.value = val.trim() - searchField = 'code' - - params.value={ - codes:val?.trim() - } - pageApi.value = getItemListByCodes - } - } else if (formField == 'packUnit') { - if(routeName == 'Itemwarehouse'||routeName == 'Callmaterials'){//物料仓库默认配置,叫料标签 - searchField = 'packUnit' - params.value = { - itemCode: formRef.formModel.itemCode, - packUnit: val?.trim() - } - pageApi.value = getItemPackageunitListByCodes - }else{ - params.value = val?.trim() - pageApi.value = getPackageunitListByCodes - } - } else if (formField == 'inPackUnit') { - params.value = { - itemCode: formRef.formModel.itemCode, - packUnit: val.trim() - } - pageApi.value = getItemPackageunitListByCodes - } - // else if (formField == 'fromPackingNumber') { - // params.value = { - // packingNumber: val?.trim() - // } - // pageApi.value = getBalanceItemListByCodes - // } - let obj = {} - let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps - .searchCondition //获取data.ts参数信息 - // 循环参数设置参数为key：value格式 - if (searchCondition1 && searchCondition1.length > 0) { - for (let i = 0; i < searchCondition1.length; i++) { - if (searchCondition1[i].isMainValue) { - obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value] - ? formRef.formModel[searchCondition1[i].value] - : detailData - ? detailData[searchCondition1[i].value] - : '' - // 是否含有空参数情况 - let isNull = false - if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) { - isNull = true - } - if (isNull) { - message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' - ) - 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 : '前置条件未选择！' - ) - return - } - } - } - } else { - obj[searchCondition1[i].key] = searchCondition1[i].value - } - } - } - } - - let obj1 = formSchema.find((item) => item.field == formField) - if (!obj1.componentProps.multiple && val.indexOf(',') > -1) { - message.alert('该输入框只能输入一条数据') - formRef.setValues(setV) - return - } - await pageApi.value(params.value).then((res) => { - let arr1 = val.split(',') - let list = ref([]) - list.value = res - if (list.value?.length == 0) { - message.alert('暂无数据') - formRef.setValues(setV) - return - } - if (arr1.length != list.value.length) { - let arr2 = list.value.map((item) => item.code) - let str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') - message.alert('代码' + str + '没有找到对应数据') - formRef.setValues(setV) - return - } - // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form') - callback(searchField,list.value) - }) - } - } -} - -// 根据下方输入框失去焦点校验信息 -export const getListByBottonInput = async (headerItem, val,row,routeName,formRef,detailData,tableData,callback) => { - let pageApi = ref() - let params = ref({}) - let list = ref([]) - let field = 'itemCode' - // scp采购订单 - if(!val)return; - if (routeName == 'PurchaseMain') { - pageApi.value = getSupplierItemListByCodes - params.value = { - supplierCode: formRef.formModel.supplierCode, - itemCodes: val?.trim(), - available: true - } - } else if (routeName == 'ProductionMain') { - pageApi.value = getProductionLineCodelistByCodes - params.value = { - productionLineCode: formRef.formModel.productionLine, - itemCodes: val?.trim() - } - } else if ( - routeName == 'ZZBJDeliverPlanMain' || - routeName == 'DeliverPlanMain' || - routeName == 'DeliverRequestMain' || - routeName == 'ZZBJDeliverRequestMain' - ) { - // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请 - pageApi.value = getCustomerItemListByCodes - params.value = { - customerCode: formRef.formModel.customerCode, - itemCodes: val?.trim() - } - } - // else if (routeName == 'UnplannedissueRequestMain') { - // // 计划外出库 - // pageApi.value = getBalanceItemListByCodes - // params.value = { - // packingNumber: val?.trim() - // } - // field = 'packingNumber' - // } - else { - params.value.codes = val?.trim() - pageApi.value = getItemListByCodes - } - 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] - : '' - // 是否含有空参数情况 - 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 : '前置条件未选择！' - ) - return - } - } else if (searchCondition1[i].isTableRowValue) { - if (searchCondition1[i].required) { - if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) { - message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' - ) - return - } - } - row[searchCondition1[i].value] - //查询当前table表数据的值 - params.value[searchCondition1[i].key] = row[searchCondition1[i].value] - } 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 : '前置条件未选择！' - ) - return - } - } - }else { - params.value[searchCondition1[i].key] = searchCondition1[i].value - } - } else { - params.value[searchCondition1[i].key] = searchCondition1[i].value - } - } - } - } - await pageApi.value(params.value).then(async (res) => { - list.value = res ? res : [] - let arr1 = val.split(',').map(item=>item.trim()) - if (arr1.length != res.length) { - let arr2 = res.map((item) => item[field]) - let str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') - message.alert('代码' + str + '没有找到对应数据') - return - } else { - let repeatCode = [] - if(tableData.length > 0){ - tableData.forEach((item) => { - const findIndex = arr1.findIndex(valItem=>valItem==item[field]) - if(findIndex > -1){ - arr1.splice(findIndex,1) - repeatCode.push(item.itemCode) - } - }) - } - if(repeatCode.length>0){ - message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); - return; - } - callback(list.value) - } - }) -} diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts new file mode 100644 index 000000000..50ffd9583 --- /dev/null +++ b/src/api/wms/business/inputBlur.ts @@ -0,0 +1,747 @@ +// 获取供应商列表 +import { getSupplierListByCodes, importTemplate } from '@/api/wms/supplier' +// 获取物料列表 +import { getItemListByCodes } from '@/api/wms/itembasic' +// 获取供应商物料列表 +import { getSupplierItemListByCodes } from '@/api/wms/supplieritem' +// 获取生产线物料 +import { getProductionLineCodelistByCodes } from '@/api/wms/productionlineitem' +// 获取包装规格 +import { getPackageunitListByCodes } from '@/api/wms/packageunit' +// 获取物料包装规格 +import { getItemPackageunitListByCodes } from '@/api/wms/itempackage' +// 获取客户物料 +import { getCustomerItemListByCodes } from '@/api/wms/customeritem' +// 获取库存余额 +import { getBalanceItemListByCodes } from '@/api/wms/balance' +import { isString } from 'min-dash' +const message = useMessage() // 消息弹窗 +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() + + 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(searchField,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 || [] + //获取失去焦点参数信息 + let verificationParams = formSchema?.verificationParams || + [] + console.log('走新方法啦') + // searchCondition = [...searchCondition, ...verificationParams] + + if (val && isString(val)) { + let setV = {} + setV[field] = '' + let params = {} + const _searchCondition = {} + let filters: any[] = [] + if (searchCondition && searchCondition.length > 0) { + // 转换筛选条件所需 + for (let i = 0; i < searchCondition.length; i++) { + // searchCondition.forEach((item) => { + // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取 + if (searchCondition[i].isMainValue) { + _searchCondition[searchCondition[i].key] = formRef.formModel[ + searchCondition[i].value + ] + ? formRef.formModel[searchCondition[i].value] + : detailData + ? detailData[searchCondition[i].value] + : // : row + // ? row[searchCondition[i].value] + '' + // 是否含有空参数情况 + let isNull = false + if ( + _searchCondition[searchCondition[i].key] == '' || + _searchCondition[searchCondition[i].key] == undefined + ) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' + ) + formRef.setValues(setV) + 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 : '前置条件未选择！' + // ) + // return + // } + // } + // row[searchCondition[i].value] + // //查询当前table表数据的值 + // _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] + // } + else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition[i].isSearch) { + if (searchCondition[i].isFormModel) { + //用formModel中的值 + if (searchCondition[i].required) { + if ( + formRef.formModel[searchCondition[i].value] == '' || + formRef.formModel[searchCondition[i].value] == undefined + ) { + message.warning( + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' + ) + formRef.setValues(setV) + 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 { + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) + } + } + } + } + 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: verificationParams[i].action, + column: verificationParams[i].key, + value: verificationParams[i].value + }) + } + } else { + _searchCondition[verificationParams[i].key] = verificationParams[i].value + } + } + } + if (filters.length > 0) { + _searchCondition.isSearch = true + _searchCondition.filters = filters + } + console.log(4545, _searchCondition) + let obj = { + by: 'ASC', + pageNo: 1, + pageSize: 20 + } + console.log(888, _searchCondition) + params = { + isSearch: _searchCondition.isSearch, + filters: _searchCondition.filters, + ...obj + } + // console.log(333,params) + if (!formSchema?.multiple && val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + formRef.setValues(setV) + return + } + await formSchema.searchPage(params).then((res) => { + let arr1 = val.split(',') + let list = ref([]) + list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : [] + if (list.value?.length == 0) { + message.alert('暂无数据') + formRef.setValues(setV) + return + } + if (arr1.length != list.value.length) { + let arr2 = list.value.map((item) => item.code) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + formRef.setValues(setV) + return + } + callback(list.value) + }) + } + } + else { + let pageApi = ref() + let params = ref() + let setV = {} + setV[field] = '' + if (val && isString(val)) { + if ( + field == 'supplierCode' || + field == 'itemCode' || + field == 'productItemCode' || + field == 'componentItemCode' || + field == 'packUnit' || + field == 'inPackUnit' || + field == 'fromPackingNumber' + ) { + let searchField = 'code' + if (field == 'supplierCode') { + params.value = val?.trim() + pageApi.value = getSupplierListByCodes + } else if ( + field == 'itemCode' || + field == 'productItemCode' || + field == 'componentItemCode' + ) { + // 销售价格单 + if (routeName == 'Saleprice') { + params.value = { + customerCode: formRef.formModel.customerCode, + itemCodes: val?.trim() + } + pageApi.value = getCustomerItemListByCodes + searchField = 'itemCode' + } else if (routeName == 'ProductscrapRequestMain') { + // 制品报废申请 + params.value = { + productionLineCode: + detailData.productionLine || detailData.productionLineCode, + itemCodes: val?.trim() + } + pageApi.value = getProductionLineCodelistByCodes + searchField = 'itemCode' + } else { + // params.value = val.trim() + searchField = 'code' + + params.value = { + codes: val?.trim() + } + pageApi.value = getItemListByCodes + } + } else if (field == 'packUnit') { + if (routeName == 'Itemwarehouse' || routeName == 'Callmaterials') {//物料仓库默认配置,叫料标签 + searchField = 'packUnit' + params.value = { + itemCode: formRef.formModel.itemCode, + packUnit: val?.trim() + } + pageApi.value = getItemPackageunitListByCodes + } else { + params.value = val?.trim() + pageApi.value = getPackageunitListByCodes + } + } else if (field == 'inPackUnit') { + params.value = { + itemCode: formRef.formModel.itemCode, + packUnit: val.trim() + } + pageApi.value = getItemPackageunitListByCodes + } + // else if (formField == 'fromPackingNumber') { + // params.value = { + // packingNumber: val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + // } + let obj = {} + let searchCondition1 = formSchema.searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key：value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + obj[searchCondition1[i].key] = formRef.formModel[searchCondition1[i].value] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if (obj[searchCondition1[i].key] == '' || obj[searchCondition1[i].key] == undefined) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + 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 : '前置条件未选择！' + ) + return + } + } + } + } else { + obj[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + + if (!formSchema.multiple && val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + formRef.setValues(setV) + return + } + await pageApi.value(params.value).then((res) => { + let arr1 = val.split(',') + let list = ref([]) + list.value = res + if (list.value?.length == 0) { + message.alert('暂无数据') + formRef.setValues(setV) + return + } + if (arr1.length != list.value.length) { + let arr2 = list.value.map((item) => item.code) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + formRef.setValues(setV) + return + } + // emit('searchTableSuccess', formField, searchField, list.value, formRef.value, 'form') + callback(list.value) + }) + } + } + } +} + +// 根据下方输入框失去焦点校验信息 +export const getListByBottonInput = async (headerItem, val, row, routeName, formRef, detailData, tableData, callback) => { + let tableFormSchemaObj = headerItem?.tableForm + console.log(333,tableFormSchemaObj) + if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) { + let params = ref({}) + let list = ref([]) + console.log(3344) + let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + let 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 + ] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[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 : '前置条件未选择！' + ) + return + } + } else if (searchCondition1[i].isTableRowValue) { + if (searchCondition1[i].required) { + if (row[searchCondition1[i].value] == '' || row[searchCondition1[i].value] == undefined) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择！' + ) + return + } + } + row[searchCondition1[i].value] + //查询当前table表数据的值 + params.value[searchCondition1[i].key] = row[searchCondition1[i].value] + } 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 : '前置条件未选择！' + ) + return + } + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + console.log(999, verificationParams) + if (verificationParams && verificationParams.length > 0) { + for (let i = 0; i < verificationParams.length; i++) { + params.value[verificationParams[i].key] = val + } + } + await tableFormSchemaObj.verificationPage(params.value).then(async (res) => { + list.value = res ? res : [] + let arr1 = val.split(',').map(item => item.trim()) + if (arr1.length != res.length) { + let arr2 = res.map((item) => item[field]) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + return + } else { + let repeatCode = [] + if (tableData.length > 0) { + tableData.forEach((item) => { + const findIndex = arr1.findIndex(valItem => valItem == item[field]) + if (findIndex > -1) { + arr1.splice(findIndex, 1) + repeatCode.push(item.itemCode) + } + }) + } + if (repeatCode.length > 0) { + message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); + return; + } + callback(list.value) + } + }) + return + } else { + let pageApi = ref() + let params = ref({}) + let list = ref([]) + let field = 'itemCode' + // scp采购订单 + if (!val) return; + + if (routeName == 'PurchaseMain') { + pageApi.value = getSupplierItemListByCodes + params.value = { + supplierCode: formRef.formModel.supplierCode, + itemCodes: val?.trim(), + available: true + } + } else if (routeName == 'ProductionMain') { + pageApi.value = getProductionLineCodelistByCodes + params.value = { + productionLineCode: formRef.formModel.productionLine, + itemCodes: val?.trim() + } + } else if ( + routeName == 'ZZBJDeliverPlanMain' || + routeName == 'DeliverPlanMain' || + routeName == 'DeliverRequestMain' || + routeName == 'ZZBJDeliverRequestMain' + ) { + // 自制备件发货计划，发货计划，成品发货申请，自制备件发货申请 + pageApi.value = getCustomerItemListByCodes + params.value = { + customerCode: formRef.formModel.customerCode, + itemCodes: val?.trim() + } + } + // else if (routeName == 'UnplannedissueRequestMain') { + // // 计划外出库 + // pageApi.value = getBalanceItemListByCodes + // params.value = { + // packingNumber: val?.trim() + // } + // field = 'packingNumber' + // } + else { + params.value.codes = val?.trim() + pageApi.value = getItemListByCodes + } + + await pageApi.value(params.value).then(async (res) => { + list.value = res ? res : [] + let arr1 = val.split(',').map(item => item.trim()) + if (arr1.length != res.length) { + let arr2 = res.map((item) => item[field]) + let str = [ + ...arr1.filter((item) => !arr2.includes(item)), + ...arr2.filter((item) => !arr1.includes(item)) + ].join(',') + message.alert('代码' + str + '没有找到对应数据') + return + } else { + let repeatCode = [] + if (tableData.length > 0) { + tableData.forEach((item) => { + const findIndex = arr1.findIndex(valItem => valItem == item[field]) + if (findIndex > -1) { + arr1.splice(findIndex, 1) + repeatCode.push(item.itemCode) + } + }) + } + if (repeatCode.length > 0) { + message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); + return; + } + callback(list.value) + } + }) + + } + +} diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 3870b46d7..36cf3f575 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -136,3 +136,7 @@ export const selectConfigToLocation = async (params) => { return request.get({ url: `/wms/location/pageConfigToLocation`, params }) } } +// 根据code获取数据列表 +export const getLocationByCodes = async (params) => { + return await request.get({ url: `/wms/location/listByCodes`, params }) +} \ No newline at end of file diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts index 9ffde26ba..dfdb880ec 100644 --- a/src/api/wms/supplierinvoiceRecordMain/index.ts +++ b/src/api/wms/supplierinvoiceRecordMain/index.ts @@ -60,4 +60,8 @@ export const exportSupplierinvoiceRecordMain = async (data) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/supplierinvoice-record-main/get-import-template' }) -} \ No newline at end of file +} + +export const exportSupplierinvoiceRecordDetail = async (params) => { + return await request.download({ url: `/wms/supplierinvoice-record-deatil/export-excel`, params }) +} diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts index c62a7e13f..3b63ee625 100644 --- a/src/api/wms/unplannedreceiptRequestDetail/index.ts +++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts @@ -38,6 +38,11 @@ export const getUnplannedreceiptRequestDetailPage = async (params) => { } } +// 查询计划外入库申请子打印标签 +export const getUnplannedreceiptRequestDetailPageCreateLabel = async (params) => { + return await request.get({ url: `/wms/unplannedreceipt-request-detail/pageCreateLabel`, params }) +} + // 查询计划外入库申请子详情 export const getUnplannedreceiptRequestDetail = async (id: number) => { return await request.get({ url: `/wms/unplannedreceipt-request-detail/get?id=` + id }) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index e8a2d681f..c36b73763 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -135,11 +135,8 @@ @searchTableSuccess="searchTableSuccess" > - - @@ -150,7 +147,7 @@ import ButtonBase from '@/components/XButton/src/ButtonBase.vue' import TableForm from '@/components/TableForm/src/TableForm.vue' import TableFormCountPlan from '@/components/TableFormCountPlan/src/TableFormCountPlan.vue' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' -import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/business' +import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur' import { isString } from 'min-dash' const props = defineProps({ @@ -846,203 +843,11 @@ const onChange = (field, cur) => { const onBlur = async (field, e) => { isExecute.value = false let formSchemaObj = formSchema.value.find((item) => item.field == field)?.componentProps + if (formSchemaObj?.enterSearch) { - if (formSchemaObj.searchPage && formSchemaObj.verificationParams) { - //获取data.ts参数信息 - let searchCondition = - formSchema.value.find((item) => item.field == field)?.componentProps?.searchCondition || [] - //获取失去焦点参数信息 - let verificationParams = - formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams || - [] - console.log('走新方法啦') - // searchCondition = [...searchCondition, ...verificationParams] - - if (e && isString(e)) { - let setV = {} - setV[field] = '' - let params = {} - const _searchCondition = {} - let filters: any[] = [] - if (searchCondition && searchCondition.length > 0) { - // 转换筛选条件所需 - for (var i = 0; i < searchCondition.length; i++) { - // searchCondition.forEach((item) => { - // 查询条件为主表某字段，需要赋值主表数据，数据来源是详情的，赋值需要从row中获取 - if (searchCondition[i].isMainValue) { - _searchCondition[searchCondition[i].key] = formRef.value.formModel[ - searchCondition[i].value - ] - ? formRef.value.formModel[searchCondition[i].value] - : props.detailData - ? props.detailData[searchCondition[i].value] - : // : row - // ? row[searchCondition[i].value] - '' - // 是否含有空参数情况 - let isNull = false - if ( - _searchCondition[searchCondition[i].key] == '' || - _searchCondition[searchCondition[i].key] == undefined - ) { - isNull = true - } - if (isNull) { - message.warning( - searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' - ) - return - } - filters.push({ - action: searchCondition[i].action || '==', - column: searchCondition[i].key, - value: formRef.value.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 : '前置条件未选择！' - // ) - // return - // } - // } - // row[searchCondition[i].value] - // //查询当前table表数据的值 - // _searchCondition[searchCondition[i].key] = row[searchCondition[i].value] - // } - else { - // 扩展 转换为筛选条件进行查询 - if (searchCondition[i].isSearch) { - if (searchCondition[i].isFormModel) { - //用formModel中的值 - if (searchCondition[i].required) { - if ( - formRef.value.formModel[searchCondition[i].value] == '' || - formRef.value.formModel[searchCondition[i].value] == undefined - ) { - message.warning( - searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' - ) - return - } - } - filters.push({ - action: searchCondition[i].action || '==', - column: searchCondition[i].key, - value: formRef.value.formModel[searchCondition[i].value] - }) - } else { - filters.push({ - action: searchCondition[i].action || '==', - column: searchCondition[i].key, - value: searchCondition[i].value - }) - } - } else { - filters.push({ - action: searchCondition[i].action || '==', - column: searchCondition[i].key, - value: searchCondition[i].value - }) - } - } - } - } - if (verificationParams && verificationParams.length > 0) { - // 转换筛选条件所需 - for (var 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.value.formModel[verificationParams[i].value] - ? formRef.value.formModel[verificationParams[i].value] - : e.trim() - }) - } else { - filters.push({ - action: verificationParams[i].action, - column: verificationParams[i].key, - value: verificationParams[i].value - }) - } - } else { - _searchCondition[verificationParams[i].key] = verificationParams[i].value - } - } - } - if (filters.length > 0) { - _searchCondition.isSearch = true - _searchCondition.filters = filters - } - console.log(4545, _searchCondition) - let obj = { - by: 'ASC', - pageNo: 1, - pageSize: 20 - } - console.log(888,_searchCondition) - params = { - isSearch:_searchCondition.isSearch, - filters:_searchCondition.filters, - ...obj - } - // console.log(333,params) - if (!formSchemaObj?.multiple && e.indexOf(',') > -1) { - message.alert('该输入框只能输入一条数据') - formRef.value.setValues(setV) - return - } - await formSchemaObj.searchPage(params).then((res) => { - let arr1 = e.split(',') - let list = ref([]) - list.value = res.list - if (list.value?.length == 0) { - message.alert('暂无数据') - formRef.value.setValues(setV) - return - } - if (arr1.length != list.value.length) { - let arr2 = list.value.map((item) => item.code) - let str = [ - ...arr1.filter((item) => !arr2.includes(item)), - ...arr2.filter((item) => !arr1.includes(item)) - ].join(',') - message.alert('代码' + str + '没有找到对应数据') - formRef.value.setValues(setV) - return - } - }) - } - } else { - if ( - field == 'supplierCode' || - field == 'itemCode' || - field == 'productItemCode' || - field == 'componentItemCode' || - field == 'packUnit' || - field == 'inPackUnit' || - field == 'fromPackingNumber' - ) { - await FormBlur( - field, - e, - routeName.value, - formRef.value, - props.detailData, - formSchema.value, - (searchField, list) => { - emit('searchTableSuccess', field, searchField, list, formRef.value, 'form') - } - ) - return - } - } + await FormBlur(field, e, routeName.value, formRef.value, props.detailData, formSchemaObj, (list) => { + emit('searchTableSuccess', field, formSchemaObj.searchField, list, formRef.value, 'form') + }) } else { emit('onBlur', field, e) } diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 539271296..64e3f6b7e 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -37,7 +37,7 @@ diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index a92e56d5f..399553c0a 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -36,7 +36,15 @@ export const Purchaseprice = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -67,7 +75,15 @@ export const Purchaseprice = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index 82f7bf3e8..5ddace825 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -44,7 +44,15 @@ export const Supplieritem = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -70,7 +78,15 @@ export const Supplieritem = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 40d883e9a..06e18de14 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -592,7 +592,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ }, tableForm:{ multiple:true, - isInpuFocusShow: true, // 开启查询弹窗 + // isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', searchTitle: '客户物料基础信息', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index dab4cf2b7..7f99c50dc 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -236,7 +236,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:packageover-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回 diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts index 7ea57ca7b..3eb010c76 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts @@ -80,50 +80,50 @@ export const PackagesplitMain = useCrudSchemas(reactive([ }, isForm: false }, - { - label: '申请时间', - field: 'requestTime', - sort: 'custom', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false - }, - { - label: '截止时间', - field: 'dueTime', - sort: 'custom', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false - }, + // { + // label: '申请时间', + // field: 'requestTime', + // sort: 'custom', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isForm: false + // }, + // { + // label: '截止时间', + // field: 'dueTime', + // sort: 'custom', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isForm: false + // }, { label: '部门', field: 'departmentCode', @@ -297,6 +297,9 @@ export const PackagesplitDetail = useCrudSchemas(reactive([ { label: '从库存状态', field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -305,43 +308,46 @@ export const PackagesplitDetail = useCrudSchemas(reactive([ { label: '到库存状态', field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, - { - label: '从器具号', - field: 'fromContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到器具号', - field: 'toContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物料代码', field: 'itemCode', @@ -385,6 +391,8 @@ export const PackagesplitDetail = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 9a5679c56..56e040304 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -244,7 +244,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:scrap-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:scrap-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:scrap-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-request-main:refused'}), // 驳回 diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 79a4547e5..d4ad79678 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -233,7 +233,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:unplannedissue-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedissue-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedissue-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedissue-request-main:refused'}), // 驳回 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 11ecd8cc3..29a8c0330 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -230,7 +230,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:transferissue-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:transferissue-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // 驳回 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index 0c52a5d4f..909159740 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -206,7 +206,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:transferreceipt-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), // 驳回 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 99dc8fae0..eb3cde1ea 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -150,7 +150,7 @@ const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPage + getListApi: UnplannedreceiptRequestDetailApi.getUnplannedreceiptRequestDetailPageCreateLabel }) const { getList:getDetailList } = detatableMethods @@ -373,7 +373,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index df1f3f87a..f8406acad 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -283,7 +283,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:issue-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:issue-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:issue-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 022e7787d..74fe76479 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -766,8 +766,9 @@ export const IssueRequestDetail = useCrudSchemas( sortTableDefault: 3, tableForm: { multiple: true, - enterSearch: true, - isInpuFocusShow: true, + // enterSearch: true, + disabled:true, + // isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index af65818e2..8375eb726 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -327,7 +327,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 46f95443d..d11ab5ea3 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -583,7 +583,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productionreturn-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productionreturn-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productionreturn-request-main:refused'}), // 驳回 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index 0f32a1278..eed4bc467 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -106,7 +106,8 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive // row['itemCode'] = val[0]['code'] // row['uom'] = val[0]['uom'] val.forEach(item=>{ - if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return + if(tableData.value.find(item1=>item1['itemCode'] == item['code'])){ + message.warning(`物料${item['code']}已经存在`) + return + } const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['itemCode'] = item['code'] newRow['uom'] = item['uom'] @@ -212,7 +215,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:repleinsh-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:repleinsh-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:repleinsh-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:repleinsh-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:repleinsh-request-main:refused'}), // 驳回 @@ -379,10 +382,13 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 - if( data.subList.length>1){ - message.warning('明细只能选择一条数据') - return; - } + data.subList.forEach(item=>{ + item.toLocationCode = data.toLocationCode + }) + // if( data.subList.length>1){ // 喜婷说可以添加多条 + // message.warning('明细只能选择一条数据') + // return; + // } if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') formRef.value.formLoading = false diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index f7a7c224c..308e02f7a 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -543,7 +543,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ } }, tableForm:{ - isInpuFocusShow: true, + multiple:true, + disabled:true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '物料基础信息', // 查询弹窗标题 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 63fc24a71..0aa1d217f 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -274,7 +274,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorychange-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorychange-request-main:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorychange-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorychange-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index 16efcd877..c6d753817 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -207,7 +207,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:processproduction-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:processproduction-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:processproduction-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:processproduction-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts index 2a63f139b..07cd13ca5 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -339,7 +339,8 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productdismantle-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productdismantle-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productdismantle-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productdismantle-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index cdd5e6572..bb1e0b840 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -475,7 +475,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive([ }, tableForm:{ multiple:true, - isInpuFocusShow: true, + disabled:true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 76f307cbd..e700e948f 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -649,7 +649,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, enterSearch:true, - isInpuFocusShow: true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 542dbb02b..7db5dfe79 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -649,7 +649,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, enterSearch:true, - isInpuFocusShow: true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 997469e15..c82d51f25 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -214,7 +214,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index fe9c56858..a6a53ba52 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -126,15 +126,15 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '创建时间', field: 'createTime', @@ -189,28 +189,28 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable: false, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, { label: '部门', field: 'departmentCode', @@ -456,7 +456,8 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive }, tableForm:{ multiple:true, - isInpuFocusShow: true, + // isInpuFocusShow: true, + disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index 956de7a21..84d9e6d53 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -89,7 +89,7 @@ import * as ProductputawayRequestMainApi from '@/api/wms/productputawayRequestMa import * as ProductputawayRequestDetailApi from '@/api/wms/productputawayRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -// 制品上架申请 装配上架申请 +// 制品上架申请 装配上架申请 装配制品上架申请 defineOptions({ name: 'ProductputawayRequestMain' }) const message = useMessage() // 消息弹窗 @@ -216,7 +216,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productputaway-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productputaway-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productputaway-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productputaway-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index 9dcc911d5..c90e6eaf3 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -118,15 +118,15 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '创建时间', field: 'createTime', @@ -181,28 +181,28 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable: false, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, { label: '部门', field: 'departmentCode', @@ -448,7 +448,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive }, tableForm:{ multiple: true, - isInpuFocusShow: true, + // isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index ac11bd065..1e9dde54f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -320,7 +320,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 560808251..02f793ed1 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -280,15 +280,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '创建时间', field: 'createTime', @@ -345,28 +345,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTable: false, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isTable: false, + // }, { label: '部门', field: 'departmentCode', @@ -616,7 +616,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, tableForm:{ multiple: true, - isInpuFocusShow: true, + disabled:true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', searchTitle: '工位信息', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index be07c0b41..491dc8daf 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -319,7 +319,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 63fd5b156..e786a028d 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -280,15 +280,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '创建时间', field: 'createTime', @@ -345,28 +345,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTable: false, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isTable: false, + // }, { label: '部门', field: 'departmentCode', @@ -617,7 +617,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive }, tableForm:{ multiple: true, - isInpuFocusShow: true, + disabled:true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', searchTitle: '工位信息', diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 811f90d25..a95bf54c1 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -311,7 +311,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 95d6f73fa..7e3cc8a51 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -238,15 +238,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false + // }, { label: '创建时间', field: 'createTime', @@ -303,28 +303,28 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTable: false, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isTable: false, + // }, { label: '部门', field: 'departmentCode', diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 659d48369..086524541 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -229,7 +229,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productredress-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productredress-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productredress-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productredress-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productredress-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 023a77ee9..339927a39 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -180,12 +180,12 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ isForm:false, isTable:false, }, - { - label: '原因', - field: 'remark', - sort: 'custom', - isTable:false, - }, + // { + // label: '原因', + // field: 'remark', + // sort: 'custom', + // isTable:true, + // }, { label: '到库区类型范围', field: 'toAreaTypes', @@ -511,6 +511,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm: { + type:'Select', disabled: true }, form: { @@ -558,16 +559,16 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive hiddenInMain:true, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - hiddenInMain:true - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain:true + // }, { label: '创建者', field: 'creator', diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 8c2482afd..89c622b32 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -380,7 +380,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']), hasPermi:'wms:productrepair-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productrepair-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productrepair-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productrepair-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productrepair-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 37114f603..58887b849 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -254,15 +254,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '创建时间', field: 'createTime', @@ -319,28 +319,28 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable: false, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: { width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, { label: '部门', field: 'departmentCode', @@ -554,7 +554,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive sortTableDefault:5, tableForm:{ multiple: true, - isInpuFocusShow: true, + disabled:true, + // isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '工位信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 8f48623fe..2bef4ef89 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -468,7 +468,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:productscrap-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:productscrap-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:productscrap-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:productscrap-request-main:refused'}), // 驳回 diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index c7ad921ec..4c22a63cc 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -307,37 +307,37 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable:false, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, + // { + // label: '截止时间', + // field: 'dueTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable:false, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // }, { label: '部门', field: 'departmentCode', @@ -552,7 +552,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ }, tableForm:{ multiple: true, - isInpuFocusShow: true, + // isInpuFocusShow: true, + disabled:true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '工位信息', // 查询弹窗标题 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 0145d5de3..7875f9402 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -418,7 +418,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['singlePrice'] = val[0]['singlePrice'] setV['amount'] = val[0]['amount'] setV['projectCode'] = val[0]['projectCode'] - setV['packingNumber'] = val[0]['packingNumber'] + // setV['packingNumber'] = val[0]['packingNumber'] + // setV['inventoryBalance'] = val[0]['qty'] if (formField == 'itemCode') { setV['batch'] = val[0]['toBatch'] @@ -428,7 +429,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { // setV['fromLocationCode'] = val[0]['fromLocationCode'] // setV['toLocationCode'] = val[0]['toLocationCode'] } - } else { + } else if (formField == 'packingNumber'){ + setV[formField] = val[0][searchField] + setV['inventoryBalance'] = val[0]['qty'] + } + else { setV[formField] = val[0][searchField] } formRef.setValues(setV) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index bc10f2178..eef4f4f85 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -780,6 +780,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm:false, isTable:false, hiddenInMain: true, + isForm: false, tableForm:{ disabled:true }, @@ -799,6 +800,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm:false, isTable:false, hiddenInMain: true, + isForm: false, tableForm:{ disabled:true }, @@ -834,6 +836,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, tableForm:{ disabled:true }, @@ -856,6 +859,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -939,11 +943,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - form: { - componentProps:{ - disabled:true - } - }, tableForm:{ // labelMessage: '信息提示说明！！！', isInpuFocusShow: true, // 开启查询弹窗 @@ -964,6 +963,33 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isMainValue: false }] }, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + form:{ + // labelMessage: '信息提示说明！！！', + componentProps: { + 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 + }] + } + }, hiddenInMain: true, isTable: false, }, @@ -976,9 +1002,41 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, hiddenInMain: true, isTable: false, + // form: { + // componentProps:{ + // disabled: true, + // } + // }, form: { componentProps:{ - disabled:true + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + 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 + }] } }, tableForm:{ @@ -1014,28 +1072,31 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }] }, }, - // { - // label: '库存余额', - // field: 'inventoryBalance', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'InputNumber', - // componentProps: { - // min: 0, - // precision: 6 - // } - // }, - // isForm:false, - // tableForm:{ - // hidden:false,//控制列是否展示 - // type:'InputNumber', - // min:0, - // precision: 6 - // } - // }, + { + label: '库存余额', + field: 'inventoryBalance', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm:{ + hidden:false,//控制列是否展示 + type:'InputNumber', + min:0, + precision: 6 + }, + hiddenInMain: true, + isTable: false, + isDetail: false, + }, { label: '退货数量', field: 'qty', @@ -1074,6 +1135,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1093,6 +1155,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1112,6 +1175,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1131,6 +1195,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1256,6 +1321,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive tableForm:{ disabled:true }, + isForm: false, isTableForm: false, isTable: false, hiddenInMain: true, @@ -1277,6 +1343,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive tableForm:{ disabled:true }, + isForm: false, isTableForm:false, isForm:false }, @@ -1316,6 +1383,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm: false, isTable: false, hiddenInMain: true, + isForm: false, form: { componentProps:{ disabled:true diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index 2b5581a23..e3f884bb2 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -692,29 +692,29 @@ export const PurchasereceiptJobMainRules = reactive({ * @returns {Array} 采购收货任务子表 */ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch:true, - hiddenInMain:true, - sortTableDefault:1002, - sortSearchDefault:1002 - }, - { - label: '包装规格', - field: 'packUnit', - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:1002 - }, + // { + // label: '包装号', + // field: 'packingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch:true, + // hiddenInMain:true, + // sortTableDefault:1002, + // sortSearchDefault:1002 + // }, + // { + // label: '包装规格', + // field: 'packUnit', + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:1002 + // }, { label: '包装数量', field: 'qty', @@ -841,15 +841,15 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ hiddenInMain:true, sortTableDefault:1006, }, - { - label: '来源库位', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:1007, - }, + // { + // label: '来源库位', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:1007, + // }, { label: '目标库位', field: 'toLocationCode', @@ -933,26 +933,26 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ sortTableDefault:1009, hiddenInMain:true, }, - { - label: '从货主', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - sortTableDefault:1008, - }, - { - label: '到货主', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - sortTableDefault:1008, - }, + // { + // label: '从货主', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // sortTableDefault:1008, + // }, + // { + // label: '到货主', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // sortTableDefault:1008, + // }, { label: '物料代码', field: 'itemCode', @@ -992,16 +992,16 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ hiddenInMain:true, sortTableDefault:7, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - sortTableDefault:1010, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // sortTableDefault:1010, + // }, { label: '计量单位', field: 'uom', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index 5aea05b6e..6ea0c3605 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -603,16 +603,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:14, hiddenInMain:true }, - { - label: '到批次', - field: 'toBatch', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:14, - hiddenInMain:true - }, + // { + // label: '到批次', + // field: 'toBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:14, + // hiddenInMain:true + // }, { label: '替代批次', field: 'altBatch', @@ -623,26 +623,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive isTable:false, hiddenInMain:true }, - { - label: '从包装号', - field: 'fromPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:15, - hiddenInMain:true - }, - { - label: '到包装号', - field: 'toPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:15, - hiddenInMain:true - }, + // { + // label: '从包装号', + // field: 'fromPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:15, + // hiddenInMain:true + // }, + // { + // label: '到包装号', + // field: 'toPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:15, + // hiddenInMain:true + // }, { label: '从器具号', field: 'fromContainerNumber', @@ -709,33 +709,33 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:13, }, - { - label: '包装规格', - field: 'packUnit', - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:16, - }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - tableForm: { - disabled: true, - }, - isForm:false, - sortTableDefault:16, - }, + // { + // label: '包装规格', + // field: 'packUnit', + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:16, + // }, + // { + // label: '包装数量', + // field: 'packQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // }, + // tableForm: { + // disabled: true, + // }, + // isForm:false, + // sortTableDefault:16, + // }, { label: '供应商计量数量', field: 'supplierQty', @@ -776,16 +776,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:18, hiddenInMain:true }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:18, + // { + // label: '从库位代码', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:18, - }, + // }, { label: '到库位代码', field: 'toLocationCode', @@ -795,16 +795,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:18, }, - { - label: '从库位组', - field: 'fromLocationGroupCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:19, - hiddenInMain:true - }, + // { + // label: '从库位组', + // field: 'fromLocationGroupCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:19, + // hiddenInMain:true + // }, { label: '到库位组', field: 'toLocationGroupCode', @@ -815,16 +815,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:19, hiddenInMain:true }, - { - label: '从库区', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:22, - hiddenInMain:true, - }, + // { + // label: '从库区', + // field: 'fromAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:22, + // hiddenInMain:true, + // }, { label: '到库区', field: 'toAreaCodes', @@ -835,16 +835,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:22, hiddenInMain:true }, - { - label: '从货主', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:23, - hiddenInMain:true - }, + // { + // label: '从货主', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:23, + // hiddenInMain:true + // }, { label: '到货主', field: 'toOwnerCode', @@ -1004,16 +1004,16 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive // }, // }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:1998, - hiddenInMain:true - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:1998, + // hiddenInMain:true + // }, // { // label: '代码', // field: 'code', diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 1df29662c..767c6f791 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -870,92 +870,92 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, - { - label: t('ts.已计划数量'), - field: 'plannedQty', - table: { - width: 150 - }, - hiddenInMain:true, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - }, - value: 1 - }, - isTableForm: false, - isForm: false, - }, + // { + // label: t('ts.已计划数量'), + // field: 'plannedQty', + // table: { + // width: 150 + // }, + // hiddenInMain:true, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 1, + // precision: 6 + // }, + // value: 1 + // }, + // isTableForm: false, + // isForm: false, + // }, { label: t('ts.已发货数量'), field: 'shippedQty', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index bb9d87c5d..bb2c0a188 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -78,7 +78,6 @@ fieldTableColumn="poLine" /> - 采购订单信息 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index cbe18f856..20aa155c2 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -402,7 +402,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: 'wms:supplierdeliver-request-main:create' }), // 新增 - defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入 + // defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入 7.15喜婷说先拿掉 defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 7ff4af19c..8f6ab2391 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -12,7 +12,12 @@