diff --git a/README.md b/README.md index b50a3f14d..bd3e22726 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ form: { value:'prodLine', // 指主表某字段 message: '请选择生产线信息!', // 当前置条件为空时 弹出信息提示 isMainValue: true // 表示查询条件是主表的字段的值 + isFilterValue:true // 字段拼到filters里,和isMainValue配合使用 + action: '==', // 查询拼接条件 }, { key: 'customerCode', // 查询列表中字段 diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 50ffd9583..c72f0dec7 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -22,95 +22,151 @@ const { t } = useI18n() // 国际化 * tableFormBlur 表格表单失去焦点时候获取焦点 * FormBlur 表格失去焦点时候获取焦点 */ -export const tableFormBlurVer = async (headerItem, val, row, index,routeName,formRef,detailData,tableData,callback) => { - if ( - headerItem.field == 'fromPackingNumber' || - headerItem.field == 'packingNumber' || - headerItem.field == 'itemCode' || - headerItem.field == 'packUnit' || - headerItem.field == 'secondPackUnit' || - headerItem.field == 'fromPackUnit' || - headerItem.field == 'toPackUnit'|| - headerItem.field == 'toPackUnit'|| - headerItem.field == 'supplierItemCode' - - ) { - let searchField = headerItem.field - let pageApi = ref() - let params = ref() - +export const tableFormBlurVer = async (headerItem, val, row, index, routeName, formRef, detailData, tableData, callback) => { + if (headerItem.tableForm.searchPage && headerItem.tableForm.verificationParams) { if (val && isString(val)) { - // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field) if (val.indexOf(',') > -1) { message.alert('该输入框只能输入一条数据') row[headerItem.field] = '' return } // 校验 - let params = ref({}) - let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + const params = ref({}) + const filters: any[] = [] + const searchCondition = headerItem.tableForm.searchCondition //获取data.ts参数信息 + const verificationParams = headerItem.tableForm.verificationParams //获取data.ts参数信息 // 循环参数设置参数为key:value格式 - if (searchCondition1 && searchCondition1.length > 0) { - for (let i = 0; i < searchCondition1.length; i++) { - if (searchCondition1[i].isMainValue) { - params.value[searchCondition1[i].key] = formRef.formModel[ - searchCondition1[i].value + if (searchCondition && searchCondition.length > 0) { + for (let i = 0; i < searchCondition.length; i++) { + if (searchCondition[i].isMainValue) { + params.value[searchCondition[i].key] = formRef.formModel[ + searchCondition[i].value ] - ? formRef.formModel[searchCondition1[i].value] + ? formRef.formModel[searchCondition[i].value] : detailData - ? detailData[searchCondition1[i].value] - : row - ? row[searchCondition1[i].value] - : '' + ? detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' // 是否含有空参数情况 let isNull = false if ( - params.value[searchCondition1[i].key] == '' || - params.value[searchCondition1[i].key] == undefined + params.value[searchCondition[i].key] == '' || + params.value[searchCondition[i].key] == undefined ) { isNull = true } if (isNull) { message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' ) row[headerItem.field] = '' return } + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: formRef.formModel[ + searchCondition[i].value + ] + ? formRef.formModel[searchCondition[i].value] + : detailData + ? detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' + }) + } else if (searchCondition[i].isTableRowValue) { + if (searchCondition[i].required) { + if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { + message.warning( + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } + //查询当前table表数据的值 + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: row[searchCondition[i].value] + }) } else { // 扩展 转换为筛选条件进行查询 - if (searchCondition1[i].isSearch) { - if (searchCondition1[i].isFormModel) { + if (searchCondition[i].isSearch) { + if (searchCondition[i].isFormModel) { //用formModel中的值 - if (searchCondition1[i].required) { + if (searchCondition[i].required) { if ( - formRef.formModel[searchCondition1[i].value] == '' || - formRef.formModel[searchCondition1[i].value] == undefined + formRef.formModel[searchCondition[i].value] == '' || + formRef.formModel[searchCondition[i].value] == undefined ) { message.warning( - searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择!' ) row[headerItem.field] = '' return } } + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: formRef.formModel[searchCondition[i].value] + }) + } else { + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) } } else { - params.value[searchCondition1[i].key] = searchCondition1[i].value + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) } } } } - params.value[headerItem.field] = val?.trim() + if (verificationParams && verificationParams.length > 0) { + // 转换筛选条件所需 + for (let i = 0; i < verificationParams.length; i++) { + // 扩展 转换为筛选条件进行查询 + if (verificationParams[i].isSearch) { + if (verificationParams[i].isFormModel) { + filters.push({ + action: verificationParams[i].action, + column: verificationParams[i].key, + value: formRef.formModel[verificationParams[i].value] + ? formRef.formModel[verificationParams[i].value] + : val.trim() + }) + } else { + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) + } + } else { + params[verificationParams[i].key] = verificationParams[i].value + } + } + } // 判断改包装号是否已经添加 const seen = new Set() const repeatCode = new Set() - let arr = tableData.map((item) => item[headerItem.field]?.trim()) + const arr = tableData.map((item) => item[headerItem.field]?.trim()) arr.forEach((item) => { - if (seen.has(item)) { - repeatCode.add(item) - } else { - seen.add(item) + if (item) { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } } }) const arr1 = Array.from(repeatCode) @@ -119,132 +175,258 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for row[headerItem.field] = '' return } - if ( - headerItem.field == 'fromPackingNumber' || - headerItem.field == 'packingNumber' || - headerItem.field == 'itemCode' - ) { - // 业务 - // 采购退货申请,制品拆解,调拨出库,报废出库申请,合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请,库存修改申请 - if ( - routeName == 'PurchasereturnRequestMain' || - routeName == 'ProductdismantleRequestMain' || - routeName == 'TransferissueRequestMain' || - routeName == 'ScrapRequestMain' || - routeName == 'OktoholdRequestMain' || - routeName == 'HoldtookRequestMain' || - routeName == 'HoldtoscrapRequestMain' || - routeName == 'OktoscrapRequestMain' || - routeName == 'ScraptoholdRequestMain' || - routeName == 'InventorymoveRequestMain' || - routeName == 'InventorychangeRequestMain' - ) { - // //合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同 - // if ( - // routeName == 'OktoholdRequestMain' || - // routeName == 'HoldtookRequestMain' || - // routeName == 'HoldtoscrapRequestMain' || - // routeName == 'OktoscrapRequestMain' || - // routeName == 'ScraptoholdRequestMain' || - // routeName == 'InventorymoveRequestMain' || - // routeName == 'InventorychangeRequestMain' - // ) { - // searchField = 'packingNumber' - // params.value.packingNumber = val?.trim() - // } - // pageApi.value = getBalanceItemListByCodes - } else if ( - routeName == 'RepleinshRequestMain' || - routeName == 'IssueRequestMain' || - routeName == 'InventoryinitRequestMain' - ) { - // 补料申请业务 - pageApi.value = getItemListByCodes - searchField = 'code' - params.value.codes = val?.trim() - } else if ( - routeName == 'ProductionMainAssemble' || - routeName == 'ProductionMainASparePart' || - routeName == 'ProductionMainPredictSparePart' || - routeName == 'ProductreceiptRequestMain' || - routeName == 'ProductreceiptRequestMainA' || - routeName == 'ProductreceiptscrapRequestMain' || - routeName == 'ProductscrapRequestMain' - ) { - // 装配计划,裝配备件计划,预备产件计划,预生产收货申请,装配收货申请,报修收货申请,制品报废申请 - pageApi.value = getProductionLineCodelistByCodes - params.value.productionLineCode= - formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, - params.value.itemCodes=val?.trim() - } - } else if ( - headerItem.field == 'packUnit' || - headerItem.field == 'secondPackUnit' || - headerItem.field == 'fromPackUnit' || - headerItem.field == 'toPackUnit' - ) { - searchField = 'packUnit' - //包装规格 - // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请,计划外入库,计划外出库,翻包申请 - if ( - routeName == 'ProductreceiptRequestMain' || - routeName == 'ProductreceiptRequestMainA' || - routeName == 'ProductreceiptscrapRequestMain' || - routeName == 'CustomerreturnRequestMain' || - routeName == 'UnplannedreceiptRequestMain' || - routeName == 'UnplannedissueJobMain' || - routeName == 'PackageoverRequestMain' - ) { - params.value.itemCode= row.itemCode - params.value.packUnit= val?.trim() - pageApi.value = getItemPackageunitListByCodes - } - } else if ( - headerItem.field == 'supplierItemCode' - ) { - // 生产退料申请,隔离退料申请 - if ( - routeName == 'ProductionreturnRequestMain' || - routeName == 'ProductionreturnRequestMainNo' - ) { - searchField = 'supplierCode' - params.value.itemCodes= row.itemCode - params.value.supplierCode= val?.trim() - pageApi.value = getSupplierItemListByCodes - } + if (filters.length > 0) { + params.value.isSearch = true + params.value.filters = filters + } + const obj = { + by: 'ASC', + pageNo: 1, + pageSize: 20 + } + params.value = { + isSearch: params.value.isSearch, + filters: params.value.filters, + ...obj } const list = ref() // 调取包装接口 - await pageApi.value(params.value).then(async (res) => { - list.value = res ? res : [] + await headerItem.tableForm.searchPage(params.value).then(async (res) => { + + list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : [] // 只查一条数据,多条数据查询默认显示不存在 - if (res.length == 1) { - callback(searchField,list.value) - } else { + if (list.value?.length == 0) { message.alert('代码' + row[headerItem.field] + '没有找到对应数据') row[headerItem.field] = '' return } + callback(list.value) }) } + } else { + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' || + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit' || + headerItem.field == 'toPackUnit' || + headerItem.field == 'supplierItemCode' + + ) { + let searchField = headerItem.field + let pageApi = ref() + let params = ref() + + if (val && isString(val)) { + // const obj = props.tableAllSchemas.tableFormColumns.find((item) => item.field == headerItem.field) + if (val.indexOf(',') > -1) { + message.alert('该输入框只能输入一条数据') + row[headerItem.field] = '' + return + } + // 校验 + let params = ref({}) + let searchCondition1 = headerItem.tableForm.searchCondition //获取data.ts参数信息 + // 循环参数设置参数为key:value格式 + if (searchCondition1 && searchCondition1.length > 0) { + for (let i = 0; i < searchCondition1.length; i++) { + if (searchCondition1[i].isMainValue) { + params.value[searchCondition1[i].key] = formRef.formModel[ + searchCondition1[i].value + ] + ? formRef.formModel[searchCondition1[i].value] + : detailData + ? detailData[searchCondition1[i].value] + : row + ? row[searchCondition1[i].value] + : '' + // 是否含有空参数情况 + let isNull = false + if ( + params.value[searchCondition1[i].key] == '' || + params.value[searchCondition1[i].key] == undefined + ) { + isNull = true + } + if (isNull) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } else { + // 扩展 转换为筛选条件进行查询 + if (searchCondition1[i].isSearch) { + if (searchCondition1[i].isFormModel) { + //用formModel中的值 + if (searchCondition1[i].required) { + if ( + formRef.formModel[searchCondition1[i].value] == '' || + formRef.formModel[searchCondition1[i].value] == undefined + ) { + message.warning( + searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' + ) + row[headerItem.field] = '' + return + } + } + } + } else { + params.value[searchCondition1[i].key] = searchCondition1[i].value + } + } + } + } + params.value[headerItem.field] = val?.trim() + // 判断改包装号是否已经添加 + const seen = new Set() + const repeatCode = new Set() + let arr = tableData.map((item) => item[headerItem.field]?.trim()) + arr.forEach((item) => { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } + }) + const arr1 = Array.from(repeatCode) + if (arr1.length > 0) { + message.warning(`${arr1.join(',')}${t('ts.已经存在')}`) + row[headerItem.field] = '' + return + } + if ( + headerItem.field == 'fromPackingNumber' || + headerItem.field == 'packingNumber' || + headerItem.field == 'itemCode' + ) { + // 业务 + // 采购退货申请,制品拆解,调拨出库,报废出库申请,合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请,库存修改申请 + if ( + routeName == 'PurchasereturnRequestMain' || + routeName == 'ProductdismantleRequestMain' || + routeName == 'TransferissueRequestMain' || + routeName == 'ScrapRequestMain' || + routeName == 'OktoholdRequestMain' || + routeName == 'HoldtookRequestMain' || + routeName == 'HoldtoscrapRequestMain' || + routeName == 'OktoscrapRequestMain' || + routeName == 'ScraptoholdRequestMain' || + routeName == 'InventorymoveRequestMain' || + routeName == 'InventorychangeRequestMain' + ) { + // //合格转隔离,隔离转合格,隔离转报废,合格转报废,报废转隔离,库存移动申请参数稍有不同 + // if ( + // routeName == 'OktoholdRequestMain' || + // routeName == 'HoldtookRequestMain' || + // routeName == 'HoldtoscrapRequestMain' || + // routeName == 'OktoscrapRequestMain' || + // routeName == 'ScraptoholdRequestMain' || + // routeName == 'InventorymoveRequestMain' || + // routeName == 'InventorychangeRequestMain' + // ) { + // searchField = 'packingNumber' + // params.value.packingNumber = val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + } else if ( + routeName == 'RepleinshRequestMain' || + routeName == 'IssueRequestMain' || + routeName == 'InventoryinitRequestMain' + ) { + // 补料申请业务 + pageApi.value = getItemListByCodes + searchField = 'code' + params.value.codes = val?.trim() + } else if ( + routeName == 'ProductionMainAssemble' || + routeName == 'ProductionMainASparePart' || + routeName == 'ProductionMainPredictSparePart' || + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'ProductscrapRequestMain' + ) { + // 装配计划,裝配备件计划,预备产件计划,预生产收货申请,装配收货申请,报修收货申请,制品报废申请 + pageApi.value = getProductionLineCodelistByCodes + params.value.productionLineCode = + formRef.formModel.productionLine || formRef.formModel.productionLineCode || row.productionLine || row.productionLineCode, + params.value.itemCodes = val?.trim() + } + } else if ( + headerItem.field == 'packUnit' || + headerItem.field == 'secondPackUnit' || + headerItem.field == 'fromPackUnit' || + headerItem.field == 'toPackUnit' + ) { + searchField = 'packUnit' + //包装规格 + // 预生产收货申请,装配收货申请,报修收货申请,客户退货申请,计划外入库,计划外出库,翻包申请 + if ( + routeName == 'ProductreceiptRequestMain' || + routeName == 'ProductreceiptRequestMainA' || + routeName == 'ProductreceiptscrapRequestMain' || + routeName == 'CustomerreturnRequestMain' || + routeName == 'UnplannedreceiptRequestMain' || + routeName == 'UnplannedissueJobMain' || + routeName == 'PackageoverRequestMain' + ) { + params.value.itemCode = row.itemCode + params.value.packUnit = val?.trim() + pageApi.value = getItemPackageunitListByCodes + } + } else if ( + headerItem.field == 'supplierItemCode' + ) { + // 生产退料申请,隔离退料申请 + if ( + routeName == 'ProductionreturnRequestMain' || + routeName == 'ProductionreturnRequestMainNo' + ) { + searchField = 'supplierCode' + params.value.itemCodes = row.itemCode + params.value.supplierCode = val?.trim() + pageApi.value = getSupplierItemListByCodes + } + } + const list = ref() + // 调取包装接口 + await pageApi.value(params.value).then(async (res) => { + list.value = res ? res : [] + // 只查一条数据,多条数据查询默认显示不存在 + if (res.length == 1) { + callback(list.value) + } else { + message.alert('代码' + row[headerItem.field] + '没有找到对应数据') + row[headerItem.field] = '' + return + } + }) + } + } } } export const FormBlur = async (field, val, routeName, formRef, detailData, formSchema, callback) => { if (formSchema.searchPage && formSchema.verificationParams) { //获取data.ts参数信息 - let searchCondition = formSchema?.searchCondition || [] + const searchCondition = formSchema?.searchCondition || [] //获取失去焦点参数信息 - let verificationParams = formSchema?.verificationParams || + const verificationParams = formSchema?.verificationParams || [] console.log('走新方法啦') // searchCondition = [...searchCondition, ...verificationParams] if (val && isString(val)) { - let setV = {} + const setV = {} setV[field] = '' let params = {} const _searchCondition = {} - let filters: any[] = [] + const filters: any[] = [] if (searchCondition && searchCondition.length > 0) { // 转换筛选条件所需 for (let i = 0; i < searchCondition.length; i++) { @@ -359,12 +541,13 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS } } } + console.log(filters) if (filters.length > 0) { _searchCondition.isSearch = true _searchCondition.filters = filters } console.log(4545, _searchCondition) - let obj = { + const obj = { by: 'ASC', pageNo: 1, pageSize: 20 @@ -382,8 +565,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS return } await formSchema.searchPage(params).then((res) => { - let arr1 = val.split(',') - let list = ref([]) + const arr1 = val.split(',') + const list = ref([]) list.value = res?.list?.length > 0 ? res.list.slice(0, 1) : [] if (list.value?.length == 0) { message.alert('暂无数据') @@ -391,8 +574,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS return } if (arr1.length != list.value.length) { - let arr2 = list.value.map((item) => item.code) - let str = [ + const arr2 = list.value.map((item) => item.code) + const str = [ ...arr1.filter((item) => !arr2.includes(item)), ...arr2.filter((item) => !arr1.includes(item)) ].join(',') @@ -403,7 +586,7 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS callback(list.value) }) } - } + } else { let pageApi = ref() let params = ref() @@ -554,14 +737,15 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS }) } } - } + } } // 根据下方输入框失去焦点校验信息 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) { + console.log(333, tableFormSchemaObj) + if (tableFormSchemaObj.searchPage && tableFormSchemaObj.verificationParams) { + if (!val) return; let params = ref({}) let list = ref([]) console.log(3344) @@ -632,37 +816,43 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form console.log(999, verificationParams) if (verificationParams && verificationParams.length > 0) { for (let i = 0; i < verificationParams.length; i++) { - params.value[verificationParams[i].key] = val + console.log(54565, verificationParams[i].key) + verificationParams[i].key1 = verificationParams[i].key + 's' + params.value[verificationParams[i].key1] = 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 arr2 = res.map((item) => item[headerItem.tableForm.searchField]) 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; + console.log(arr1.filter((item) => arr2.includes(item))) + console.log(22, str) + if (str) { + message.alert('代码' + str + '没有找到对应数据') + return } - callback(list.value) } + let repeatCode = [] + if (tableData.length > 0) { + tableData.forEach((item) => { + const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field]) + if (findIndex > -1) { + arr1.splice(findIndex, 1) + repeatCode.push(item[headerItem.field]) + } + }) + } + if (repeatCode.length > 0) { + message.warning(`${t('ts.代码')}${repeatCode.join(',')}${t('ts.已经存在')}`); + return; + } + console.log(list.value) + callback(list.value) }) return } else { @@ -743,5 +933,5 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form }) } - + } diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts index 724b20757..177d2cf08 100644 --- a/src/api/wms/inventorymoveJobMain/index.ts +++ b/src/api/wms/inventorymoveJobMain/index.ts @@ -96,6 +96,17 @@ export const exportOkToHoldJobMain = async (params) => { } } +// 导出不合格转隔离任务主 Excel +export const exportNokToHoldJobMain = async (params) => { + params.businessType = 'NokToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} // 导出隔离转合格任务主 Excel export const exportHoldToOkJobMain = async (params) => { params.businessType = 'HoldToOk' diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 885baae74..9d9c4f083 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -81,7 +81,17 @@ export const exportOkToHoldRecordMain = async (params) => { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } } - +// 导出合格转隔离记录主 Excel +export const exportNokToHoldRecordMain = async (params) => { + params.businessType = 'NokToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} // 导出隔离转合格记录主 Excel export const exportHoldToOkRecordMain = async (params) => { params.businessType = 'HoldToOk' diff --git a/src/api/wms/productionline/index.ts b/src/api/wms/productionline/index.ts index 85e5fce07..3a0176b79 100644 --- a/src/api/wms/productionline/index.ts +++ b/src/api/wms/productionline/index.ts @@ -64,4 +64,9 @@ export const importTemplate = () => { // 查询生产线列表 export const getProductionlineNoPage = async (params) => { return await request.get({ url: `/wms/productionline/noPage`, params }) +} + +// 根据code获取数据列表 +export const getProductionlineByCodes = async (params) => { + return await request.get({ url: `/wms/productionline/listByCodes`, params }) } \ No newline at end of file diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index 0b3b03e20..430a0e9e5 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -69,6 +69,6 @@ export const importTemplate = () => { } -export const getProductionLineCodelistByCodes = (data) => { - return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes}) +export const getProductionLineCodelistByCodes = async (params) => { + return await request.get({ url: `/wms/productionlineitem/listByCodes`, params }) } diff --git a/src/api/wms/supplierApbalanceDetail/index.ts b/src/api/wms/supplierApbalanceDetail/index.ts new file mode 100644 index 000000000..66f6d7399 --- /dev/null +++ b/src/api/wms/supplierApbalanceDetail/index.ts @@ -0,0 +1,70 @@ +import request from '@/config/axios' + +export interface SupplierApbalanceDetailVO { + id: number + ttSupplier: string + ttSupplierName: string + ttGlcode: string + ttYear: string + ttVoucher: string + ttReference: string + ttInvoiceno: string + ttTcAmt: number + ttBcAmt: number + ttTcbal: number + ttBcbal: number + ttCurr: string + ttDueDate: Date + ttInvDate: Date + ttEffDate: Date + ttCreditTerm: string + ttGltype: string + masterId: number + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询供应商余额明细子列表 +export const getSupplierApbalanceDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-apbalance-detail/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-apbalance-detail/page`, params }) + } +} + +// 查询供应商余额明细子详情 +export const getSupplierApbalanceDetail = async (id: number) => { + return await request.get({ url: `/wms/supplier-apbalance-detail/get?id=` + id }) +} + +// 新增供应商余额明细子 +export const createSupplierApbalanceDetail = async (data: SupplierApbalanceDetailVO) => { + return await request.post({ url: `/wms/supplier-apbalance-detail/create`, data }) +} + +// 修改供应商余额明细子 +export const updateSupplierApbalanceDetail = async (data: SupplierApbalanceDetailVO) => { + return await request.put({ url: `/wms/supplier-apbalance-detail/update`, data }) +} + +// 删除供应商余额明细子 +export const deleteSupplierApbalanceDetail = async (id: number) => { + return await request.delete({ url: `/wms/supplier-apbalance-detail/delete?id=` + id }) +} + +// 导出供应商余额明细子 Excel +export const exportSupplierApbalanceDetail = async (params) => { + return await request.download({ url: `/wms/supplier-apbalance-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier-apbalance-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/supplierApbalanceMain/index.ts b/src/api/wms/supplierApbalanceMain/index.ts new file mode 100644 index 000000000..eb43a9d37 --- /dev/null +++ b/src/api/wms/supplierApbalanceMain/index.ts @@ -0,0 +1,67 @@ +import request from '@/config/axios' + +export interface SupplierApbalanceMainVO { + id: number + ttCompany: string + ttSupplier: string + ttGltype: string + ttCustorsupp: string + ttSupplierType: string + ttName1: string + ttName2: string + ttName3: string + ttSupplierName: string + ttGenerateTime: Date + ttAccountAp: number + ttAccountOthap: number + ttAccountPrepay: number + ttCreditTerm: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询供应商余额明细主列表 +export const getSupplierApbalanceMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplier-apbalance-main/senior', data }) + } else { + return await request.get({ url: `/wms/supplier-apbalance-main/page`, params }) + } +} + +// 查询供应商余额明细主详情 +export const getSupplierApbalanceMain = async (id: number) => { + return await request.get({ url: `/wms/supplier-apbalance-main/get?id=` + id }) +} + +// 新增供应商余额明细主 +export const createSupplierApbalanceMain = async (data: SupplierApbalanceMainVO) => { + return await request.post({ url: `/wms/supplier-apbalance-main/create`, data }) +} + +// 修改供应商余额明细主 +export const updateSupplierApbalanceMain = async (data: SupplierApbalanceMainVO) => { + return await request.put({ url: `/wms/supplier-apbalance-main/update`, data }) +} + +// 删除供应商余额明细主 +export const deleteSupplierApbalanceMain = async (id: number) => { + return await request.delete({ url: `/wms/supplier-apbalance-main/delete?id=` + id }) +} + +// 导出供应商余额明细主 Excel +export const exportSupplierApbalanceMain = async (params) => { + return await request.download({ url: `/wms/supplier-apbalance-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/supplier-apbalance-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/workstation/index.ts b/src/api/wms/workstation/index.ts index 780baf167..499cf6987 100644 --- a/src/api/wms/workstation/index.ts +++ b/src/api/wms/workstation/index.ts @@ -76,4 +76,9 @@ export const selectAreaTypeToLocation = async (params) => { // 查询工位列表 export const getWorkstationNoPage = async (params) => { return await request.get({ url: `/wms/workstation/noPage`, params }) +} + +// 根据code获取数据列表 +export const getWorkstationByCodes = async (params) => { + return await request.get({ url: `/wms/workstation/listByCodes`, params }) } \ No newline at end of file diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 74928cee4..dec0c25a5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -410,6 +410,21 @@ const opensearchTable = ( // searchCondition.forEach((item) => { // 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 if (searchCondition[i].isMainValue) { + if(searchCondition[i].isFilterValue){ + //后端接口需要拼入到filters中 + filters.push({ + action: searchCondition[i].action, + column: searchCondition[i].key, + value: formRef.value.formModel[searchCondition[i].value] + ? formRef.value.formModel[searchCondition[i].value] + : props.detailData + ? props.detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' + }) + }else{ + _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value] ? formRef.value.formModel[searchCondition[i].value] : props.detailData @@ -431,6 +446,8 @@ const opensearchTable = ( ) return } + } + } else if (searchCondition[i].isTableRowValue) { if (searchCondition[i].required) { if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { @@ -883,7 +900,7 @@ const batchAdd = async (val) => { emit( 'searchTableSuccess', headerItem.field, - 'itemCode', + headerItem.tableForm.searchField, list, formRef.value, 'tableForm', @@ -904,11 +921,11 @@ const inputStringBlur = async (headerItem, val, row, index) => { formRef.value, props.detailData, props.tableData, - (searchField, list) => { + ( list) => { emit( 'searchTableSuccess', headerItem.field, - searchField, + headerItem.tableForm.searchField, list, formRef.value, 'tableForm', diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index e977306f3..14671e7bb 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -402,7 +402,7 @@
- + {{ t('批量添加') }} @@ -503,9 +503,9 @@ const props = defineProps({ default: '' } }) -const isShowTableFormSearch = ref(false) +let isShowTableFormSearch = ref({}) console.log(33333,props.tableFields) -isShowTableFormSearch.value =props.tableFields.some(item=>item.isShowTableFormSearch) +isShowTableFormSearch.value =props.tableFields.find(item=>item.isShowTableFormSearch) // 传递给父类 const emit = defineEmits([ diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue index 40b628fb8..24ca1a1ad 100644 --- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -66,16 +66,18 @@ row.type == 'LOCATION_CODE' " > - + +
+ diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts index f74c14467..541ca87b6 100644 --- a/src/hooks/web/useCrudSchemas.ts +++ b/src/hooks/web/useCrudSchemas.ts @@ -271,6 +271,10 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For comonentProps = { options: options } + // 可编辑字典-下拉框默认选中第一条数据 --喜婷 + if(options.length>0&&!schemaItem.form?.componentProps?.disabled){ + defaultValue = options[0].value + } if (!(schemaItem.form && schemaItem.form.component)) component = 'Select' } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 88a966312..c75d0af75 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -288,6 +288,7 @@ export enum DICT_TYPE { CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型 INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差 PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型 + TT_GLTYPE = 'tt_gltype', //账户类型 // ========== 业务 - mes ========== MESDO_STATUS = 'mes_do_status', // 工单执行状态 diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 9b36e0f6f..76258c2fd 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1005,6 +1005,30 @@ export function mainListPackageBtn(option: any) { hasPermi: '' }) } +// 主列表-供应商对账打印 +export function mainListPrintBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.打印`).replace('ts.', ''), + name: 'print', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} +// 主列表-供应商对账回函录入 +export function mainListReplyInputBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.回函录入`).replace('ts.', ''), + name: 'replyInput', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-打印 export function mainListPointBtn(option: any) { return __defaultBtnOption(option, { diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 88f9fd035..def7f46a5 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -256,9 +256,9 @@ export const InspectionJobMain = useCrudSchemas( label: '检验类型', field: 'inspectionType', sort: 'custom', - isSearch: false, dictType: DICT_TYPE.INSPECTION_TYPE, dictClass: 'string', + isSearch: true, form: { component: 'Select', componentProps: { diff --git a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts index af771ca97..081511ac3 100644 --- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts +++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts @@ -457,7 +457,7 @@ export const InspectionMain = useCrudSchemas(       isForm: false,       isDetail: false,       table: { -        width: 150, +        width: 300,         fixed: 'right'       }     } diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts index ceca52b8e..041851697 100644 --- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts +++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts @@ -84,6 +84,7 @@ export const InspectionSchemeMain = useCrudSchemas( dictType: DICT_TYPE.INSPECTION_TYPE, dictClass: 'string', sort: 'custom', + isSearch: true, table: { width: 175 } diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index fee2ec949..396528e7b 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -191,7 +191,7 @@ export const Customeritem = useCrudSchemas(reactive([ componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE', - disabled: true + // disabled: true } }, isSearch: true diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index b59f27657..50d706355 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -27,6 +27,26 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + table: { + width: 120 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, { label: '描述1', field: 'desc1', @@ -50,9 +70,9 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, dictClass: 'string', - isForm: true, - isSearch: true, - isTable: true, + isForm: false, + isSearch: false, + isTable: false, table: { width: 100 } , @@ -346,25 +366,6 @@ export const Itembasic = useCrudSchemas(reactive([ } }, }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 120 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '生效时间', field: 'activeTime', diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 64ce34152..6df677b5e 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -70,7 +70,15 @@ export const RelegateRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, table: { @@ -350,6 +358,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ sort: 'custom', form: { componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择降级物料代码', searchField: 'code', @@ -364,7 +373,15 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ key: 'type', value: confgiData.itemType, isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index c663d5db3..b26aca289 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -351,6 +351,14 @@ export const Callmaterials = useCrudSchemas(reactive([ }] }, }, + { + label: '项目', + field: 'project', + sort: 'custom', + table: { + width: 100 + } , + }, { label: '库位', field: 'location', diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 2d39e52da..c13150278 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -199,7 +199,7 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - + basicFormRef.value.open(type, row) if (type == 'create') { // nextTick(() => { @@ -272,8 +272,17 @@ const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken()) const srcPoint = ref(BASE_URL + '/jmreport/view/940818992169918464?token=' + getAccessToken()) // 标签打印 +// const handlePoint = async (row) => { +// window.open(src.value+'&relateNumber='+row.id) +// } const handlePoint = async (row) => { - window.open(src.value+'&relateNumber='+row.id) + let rows = [row.id]; // 将单个 row.id 转换成数组 + await PackageApi.batchPrintingLable(rows.join(',')).then(res => { + window.open(srcPoint.value + '&relateNumber=' + res); + message.success('创建标签成功'); + }).catch(err => { + message.error('创建标签失败'); + }); } // 批量打印 const handleSelectionPoint = async ()=>{ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index b9c9fbe01..fad28bdc9 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -92,7 +92,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -107,6 +115,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -123,7 +132,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ value: 'customerCode', message: '请填写客户代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -201,7 +218,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'status', value: '6', isMainValue: false - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -226,6 +251,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择承运商', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -236,7 +262,15 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -731,11 +765,21 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, isInpuFocusShow: true, // 开启查询弹窗 + isShowTableFormSearch: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { componentProps: { diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 06e18de14..c1b0b4b1b 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -87,7 +87,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -119,6 +127,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ // }, form: { componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择客户月台代码', searchField: 'code', @@ -133,7 +142,15 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ key: 'customerCode', value: 'customerCode', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, }, @@ -594,10 +611,21 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ multiple:true, // isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', + disabled:true, searchField: 'itemCode', searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, + verificationPage: CustomerItemApi.getCustomerItemListByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { componentProps: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 4865fc301..09f24d259 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -491,10 +491,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ searchAllSchemas: Balance.allSchemas, searchPage: BalanceApi.getBalanceItemPage, searchCondition: [{ + message: '请填写从仓库代码!', key: 'warehouseCode', value: 'fromWarehouseCode', - message: '请填写从仓库代码!', - isMainValue: true + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有,和isFormModel结合使用 + action: '==', + isSearch: true, + isMainValue: false },{ key: 'businessType', value: 'Scrap', @@ -507,12 +511,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - },{ - key: 'inventoryStatus', - value: 'SCRAP', - action: '==', - isSearch: true, - isMainValue: false }] }, form: { @@ -528,7 +526,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ key: 'warehouseCode', value: 'fromWarehouseCode', message: '请填写从仓库代码!', - isMainValue: true + isMainValue: true, + action: '==', + isFilterValue:true },{ key: 'businessType', value: 'Scrap', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 29a8c0330..7648b471c 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -80,7 +80,7 @@ /> - @@ -116,7 +116,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (formField == 'packingNumber') { let itemCodes = [] val.forEach(item=>{ - const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) + const findIndex = tableData.value.findIndex(valItem=>valItem['itemCode']==item.itemCode&&valItem['batch']==item.batch&&valItem['packingNumber']==item.packingNumber) if(findIndex == -1){ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['packingNumber'] = item['packingNumber'] @@ -156,6 +156,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['inventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] setV['itemCode'] = val[0]['itemCode'] + setV['uom'] = val[0]['uom'] }else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index c61f696fb..1013017a6 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -220,26 +220,26 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '过期时间', - field: 'expiredTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, + // { + // label: '过期时间', + // field: 'expiredTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // }, { label: '到仓库代码', field: 'toWarehouseCode', @@ -298,14 +298,14 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ isForm: false, isTable:false, }, - { - label: '领用描述', - field: 'usageDescription', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '领用描述', + // field: 'usageDescription', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '优先级', field: 'priority', @@ -334,30 +334,30 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive([ component: 'InputNumber', } }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '业务类型', + // field: 'businessType', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '部门', + // field: 'departmentCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '自动完成', field: 'autoComplete', @@ -879,14 +879,14 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '替代批次', - field: 'altBatch', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '成本中心代码', field: 'costcentreCode', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 35573b9bb..07d00586d 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -276,14 +276,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '到库区代码范围', + // field: 'toAreaCodes', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '领用代码', field: 'usageCode', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index eb3cde1ea..121b44106 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -130,7 +130,6 @@ import * as ItembasicApi from "@/api/wms/itembasic"; import * as PackageApi from "@/api/wms/package"; import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' -import * as StdcostpriceApi from '@/api/wms/stdcostprice' import { getJmreportBaseUrl } from '@/utils/systemParam' // 计划外入库申请 @@ -384,14 +383,14 @@ const butttondata = (row,$index) => { { label: '创建标签', name: 'cjbq', - hide: isShowMainButton(row,['3']), + hide: isShowMainButton(row,['1']), type: 'primary', icon: '', color: '', hasPermi: '', link: true, // 文本展现按钮 }, - defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6','8']) }), // 标签打印 + defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['1','6','8']) }), // 标签打印 ] } @@ -503,50 +502,70 @@ const buttonTableClick = async (val, row) => { const handleClose = async (id: number) => { await message.confirm(t('common.confirmColse')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id) - message.success(t('common.closeSuccess')) - tableObject.loading = false - await getList() + try{ + await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id) + message.success(t('common.closeSuccess')) + tableObject.loading = false + await getList() + }catch{ + tableObject.loading = false + } } /** 重新添加按钮操作 */ const handleReAdd = async (id: number) => { await message.confirm(t('common.confirmReAdd')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id) - message.success(t('common.reAddSuccess')) - tableObject.loading = false - await getList() + try{ + await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id) + message.success(t('common.reAddSuccess')) + tableObject.loading = false + await getList() + }catch{ + tableObject.loading = false + } } /** 提交按钮操作 */ const handleSubmit = async (id: number) => { await message.confirm(t('common.confirmSubmit')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id) - message.success(t('common.submitSuccess')) - tableObject.loading = false - await getList() + try{ + await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id) + message.success(t('common.submitSuccess')) + tableObject.loading = false + await getList() + }catch{ + tableObject.loading = false + } } /** 审批驳回按钮操作 */ const handleRefused = async (id: number) => { await message.confirm(t('common.confirmRefused')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id) - message.success(t('common.refusedSuccess')) - tableObject.loading = false - await getList() + try{ + await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id) + message.success(t('common.refusedSuccess')) + tableObject.loading = false + await getList() + }catch{ + tableObject.loading = false + } } /** 审批通过按钮操作 */ const handleAgree = async (id: number) => { await message.confirm(t('common.confirmAgree')) tableObject.loading = true - await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id) - message.success(t('common.agreeSuccess')) - tableObject.loading = false - await getList() + try{ + await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id) + message.success(t('common.agreeSuccess')) + tableObject.loading = false + await getList() + }catch{ + tableObject.loading = false + } } /** 处理按钮操作 */ @@ -557,7 +576,6 @@ const handleHandle = async (id: number) => { await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id) message.success(t('common.handleSuccess')) await getList() - } finally { tableObject.loading = false } @@ -566,7 +584,6 @@ const handleHandle = async (id: number) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { - UnplannedreceiptRequestMain.allSchemas.formSchema.forEach((item) => { if(type == "update"){ if (item.field == 'costCenterCode') { diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index bf1e6a7e4..f4bdae616 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -546,7 +546,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive isDetail: false, isForm: false, table: { - width: 300, + width: 350, fixed: 'right' }, } @@ -618,6 +618,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive newRow['toLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) + console.log(77,formField) + console.log(66,searchField) + console.log(88,tableData.value) + console.log(99,val) } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index d16192121..45148f84e 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -84,12 +84,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择车间代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '车间信息', // 查询弹窗标题 searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 - searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -103,12 +112,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ form: { labelMessage: '该生产线会影响明细中的物料代码,工位', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '生产线信息', // 查询弹窗标题 searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法 + searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -122,12 +140,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选班组', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '班组信息', // 查询弹窗标题 searchAllSchemas: Team.allSchemas, // 查询弹窗所需类 - searchPage: TeamApi.getTeamPage // 查询弹窗所需分页方法 + searchPage: TeamApi.getTeamPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -141,12 +168,21 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选班次', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 searchTitle: '班次信息', // 查询弹窗标题 searchAllSchemas: Shift.allSchemas, // 查询弹窗所需类 - searchPage: ShiftApi.getShiftPage // 查询弹窗所需分页方法 + searchPage: ShiftApi.getShiftPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -224,6 +260,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ form: { labelMessage: '同时影响车间 生产线 班组 班次', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产计划', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -244,7 +281,15 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ key: 'planType', value: 'predict', isMainValue: false - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -479,6 +524,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择工位', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -499,10 +545,20 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm: { + enterSearch: true, + isShowTableFormSearch:true, multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位', // 输入框占位文本 @@ -510,6 +566,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ searchTitle: '工位信息', // 查询弹窗标题 searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法 + verificationPage: WorkStationApi.getWorkstationByCodes,// 失去焦点校验输入框的数据内容存在 searchCondition: [{ key: 'productionLineCode', value: 'prodLine', @@ -524,7 +581,15 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { @@ -537,6 +602,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 @@ -548,10 +614,19 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ value: 'prodLine', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 @@ -563,7 +638,15 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ value: 'prodLine', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'componentItemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index d11ab5ea3..17a4a832a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -90,6 +90,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择车间代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -100,7 +101,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, }, @@ -114,6 +123,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -129,7 +139,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive value: 'workshopCode', message: '请选择车间信息!', // 当前置条件为空时 弹出信息提示 isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -579,7 +597,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择到库位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -232,7 +233,15 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -545,6 +554,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, disabled:true, + isShowTableFormSearch: true, // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -642,7 +652,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, sortSearchDefault:1000, - isSearch: true, + // isSearch: true, sortTableDefault:1100, isTableForm: false, }, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index f3cd6989c..1c749d79f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -83,7 +83,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...InventorymoveJobMain.allSchemas.tableColumns,...InventorymoveJobDetail.allSchemas.tableMainColumns]) - +const businessType = ref() const fromInventoryStatus = ref() const toInventoryStatus = ref() @@ -142,46 +142,67 @@ const importFileName = ref() if ( routeName.value == 'OktoholdJobMain') { tableObject.params = { fromInventoryStatus: 'OK', - toInventoryStatus:'HOLD' + toInventoryStatus:'HOLD', + businessType :'OkToHold' } fromInventoryStatus.value = 'OK' toInventoryStatus.value = "HOLD" + businessType.value = 'OkToHold' importFileName.value = '合格转隔离任务' +} else if ( routeName.value == 'NoktoholdJobMain') { + tableObject.params = { + fromInventoryStatus: 'NOK', + toInventoryStatus:'HOLD', + businessType :'NokToHold' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + businessType.value = 'NokToHold' + importFileName.value = '不合格转隔离任务' } else if ( routeName.value == 'HoldtookJobMain') { tableObject.params = { fromInventoryStatus: 'HOLD', - toInventoryStatus:'OK' + toInventoryStatus:'OK', + businessType :'HoldToOk' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "OK" + businessType.value = 'HoldToOk' importFileName.value = '隔离转合格任务' } else if ( routeName.value == 'HoldtoscrapJobMain') { tableObject.params = { fromInventoryStatus: 'HOLD', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType:'HoldToScrap' } fromInventoryStatus.value = 'HOLD' toInventoryStatus.value = "SCRAP" + businessType.value = 'HoldToScrap' importFileName.value = '隔离转报废任务' } else if ( routeName.value == 'OktoscrapJobMain') { tableObject.params = { fromInventoryStatus: 'OK', - toInventoryStatus:'SCRAP' + toInventoryStatus:'SCRAP', + businessType :'OkToScrap' } fromInventoryStatus.value = 'OK' toInventoryStatus.value = "SCRAP" + businessType.value = 'OkToScrap' importFileName.value = '合格转报废任务' } else if ( routeName.value == 'ScraptoholdJobMain') { tableObject.params = { fromInventoryStatus: 'SCRAP', - toInventoryStatus:'HOLD' + toInventoryStatus:'HOLD', + businessType :'ScrapToHold' } fromInventoryStatus.value = 'SCRAP' toInventoryStatus.value = "HOLD" + businessType.value = 'ScrapToHold' importFileName.value = '报废转隔离任务' } else { console.log(146 , fromInventoryStatus.value) fromInventoryStatus.value = null + businessType.value = 'Move' importFileName.value = '库存移动任务' } @@ -281,6 +302,9 @@ const handleExport = async () => { if(routeName.value == 'OktoholdJobMain'){ const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params) download.excel(data, '合格转隔离任务主.xlsx') + }else if ( routeName.value == 'HoldtookJobMain') { + const data = await InventorymoveJobMainApi.exportNokToHoldJobMain(tableObject.params) + download.excel(data, '不合格转隔离任务主.xlsx') }else if ( routeName.value == 'HoldtookJobMain') { const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params) download.excel(data, '隔离转合格任务主.xlsx') diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 99361d936..b788e1f57 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -108,7 +108,15 @@ const { tableObject, tableMethods } = useTable({ fromInventoryStatus.value = 'OK' toInventoryStatus.value = "HOLD" importFileName.value = '合格转隔离记录' -} else if ( routeName.value == 'HoldtookRecordMain') { +} else if ( routeName.value == 'NoktoholdRecordMain') { + tableObject.params = { + fromInventoryStatus: 'NOK', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'NOK' + toInventoryStatus.value = "HOLD" + importFileName.value = '不合格转隔离记录' +}else if ( routeName.value == 'HoldtookRecordMain') { tableObject.params = { fromInventoryStatus: 'HOLD', toInventoryStatus:'OK' @@ -219,6 +227,9 @@ const handleExport = async () => { if(routeName.value == 'OktoholdRecordMain'){ const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) download.excel(data, '合格转隔离记录主.xlsx') + }else if ( routeName.value == 'HoldtookRecordMain') { + const data = await InventorymoveRecordMainApi.exportNokToHoldRecordMain(tableObject.params) + download.excel(data, '不合格转隔离记录主.xlsx') }else if ( routeName.value == 'HoldtookRecordMain') { const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params) download.excel(data, '隔离转合格记录主.xlsx') diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index c1564e2df..c70346383 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -431,14 +431,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '在途库库位', - field: 'onTheWayLocationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '在途库库位', + // field: 'onTheWayLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '从批次', field: 'fromBatch', @@ -614,14 +614,14 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, // { // label: '任务明细ID', // field: 'jobDetailId', diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts index 07cd13ca5..b7fc626e8 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -64,7 +64,15 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -82,7 +83,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -96,6 +105,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -106,7 +116,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -120,6 +138,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -130,7 +149,15 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -491,11 +518,22 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -348,7 +348,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -406,7 +406,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -419,7 +419,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 2faf81f81..7a6ee49d1 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -129,6 +138,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -144,7 +154,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -158,6 +176,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -168,7 +187,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -182,6 +209,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -192,7 +220,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -651,7 +687,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + } }, tableForm:{ @@ -672,7 +709,18 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 1f63f5282..7e2c041af 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -347,7 +347,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -405,7 +405,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -418,7 +418,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index cce78d9d4..5b6cb43d4 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -671,7 +707,18 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index dad69ddeb..4ab269ab6 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -331,7 +331,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -404,7 +404,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -419,7 +419,7 @@ const buttonTableClick = async (val, row) => { // 生成收货申请 // tableObject.loading = true ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index e700e948f..ece420527 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -643,18 +679,18 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }] } }, tableForm:{ multiple:true, - enterSearch:true, // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + disabled:true, searchCondition: [{ key:'productionLineCode', value:'productionLine', @@ -664,7 +700,17 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 6a4e7cdac..3b44d5f4c 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -331,7 +331,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -344,7 +344,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -402,7 +402,7 @@ const buttonTableClick = async (val, row) => { ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { @@ -415,7 +415,7 @@ const buttonTableClick = async (val, row) => { console.log(err) // 生成收货申请 ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + message.success(t('common.updateSuccess')) tableObject.loading = false getList() }).catch(err => { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 7db5dfe79..fd3f997e5 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -104,6 +104,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -128,6 +137,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -143,7 +153,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -157,6 +175,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -167,7 +186,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +208,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -191,7 +219,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -650,6 +686,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ multiple:true, enterSearch:true, // isInpuFocusShow: true, + disabled:true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 @@ -664,7 +701,17 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index c90e6eaf3..a96a8c2cf 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -450,6 +450,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive multiple: true, // isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 + disabled:true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 02f793ed1..ea2e30994 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -108,6 +108,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -118,7 +119,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -130,7 +139,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ width: 150 }, isTable: false, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -151,6 +161,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -166,7 +177,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +200,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -191,7 +211,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -206,6 +234,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -216,7 +245,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -632,11 +669,22 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', @@ -652,7 +700,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -663,7 +719,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -674,11 +731,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -689,7 +755,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -841,11 +915,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -861,7 +944,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index e786a028d..9762467ba 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -108,6 +108,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -118,7 +119,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -130,7 +139,8 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ width: 150 }, isTable:false, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -146,11 +156,20 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择生产线代码', searchField: 'code', @@ -166,7 +185,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -181,6 +208,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -191,7 +219,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -206,6 +242,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -216,7 +253,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -633,7 +678,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', @@ -653,7 +708,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -664,7 +727,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -675,9 +739,18 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { + enterSearch: true, // labelMessage: '信息提示说明!!!', componentProps: { isSearchList: true, @@ -690,7 +763,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -842,11 +923,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -862,7 +952,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 7e3cc8a51..2b914c87e 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -108,6 +108,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -118,7 +119,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -133,6 +142,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -143,7 +153,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -158,6 +176,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -168,7 +187,15 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -540,7 +567,17 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationPage: ProductionlineApi.getProductionlineByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', @@ -560,7 +597,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -571,7 +616,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', @@ -587,11 +633,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择工位代码', searchField: 'code', @@ -607,7 +662,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -618,7 +681,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -629,11 +693,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -644,7 +717,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -796,11 +877,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择物料代码', searchField: 'itemCode', @@ -816,7 +906,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 58887b849..2345b6ce9 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -94,6 +94,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -104,7 +105,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -116,7 +125,8 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ width: 150 }, sortTableDefault:4, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -132,11 +142,20 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择返修生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -152,7 +171,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -167,6 +194,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -177,7 +205,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -192,6 +228,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -202,7 +239,15 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -570,7 +615,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive value: 'productionLineCode', message: '请选择返修生产线代码!', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', @@ -618,7 +673,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive width: 150 }, sortTableDefault:7, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -629,11 +685,20 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -644,7 +709,15 @@ export const ProductrepairRequestDetaila = 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/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 3fac21ff8..23aa105f3 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -91,6 +91,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -101,7 +102,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -112,7 +121,8 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -128,11 +138,20 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -148,7 +167,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -162,6 +189,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -172,7 +200,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -186,6 +222,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -196,7 +233,15 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -568,7 +613,17 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', @@ -588,7 +643,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'productionLineCode', message: '请填写生产线代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -599,7 +662,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -610,11 +674,20 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择工序代码', searchField: 'code', @@ -625,7 +698,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -655,7 +736,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -675,7 +764,15 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { @@ -1068,7 +1165,6 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ isDetail: false, isForm: false , hiddenInMain:true, - isTableForm:false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 877f821dd..761fe31c3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -367,7 +367,7 @@ const butttondata = (row,$index) => { hasPermi: '', link: true // 文本展现按钮 }, - defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','8']) }), // 标签打印 + defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index abb308c19..d2e2d5928 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -975,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive( action: '==', // 查询拼接条件 isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isForm: true, @@ -966,6 +974,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '供应商信息', // 查询弹窗标题 searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage // 查询弹窗所需分页方法 + searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -209,6 +217,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, disabled:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 @@ -221,7 +230,15 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ key: 'supplierCode', value: 'supplierCode', isMainValue: true - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -871,7 +888,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive field: 'uom', dictType: DICT_TYPE.UOM, dictClass: 'string', - isSearch: true, + // isSearch: true, isTable: true, sort: 'custom', table: { @@ -943,7 +960,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ + tableForm: { + enterSearch: true, // labelMessage: '信息提示说明!!!', isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择从库位代码', @@ -961,7 +979,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'out', message: '', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, // form: { // componentProps:{ @@ -971,6 +997,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form:{ // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择从库位代码', searchField: 'code', @@ -987,7 +1014,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive value: 'out', message: '', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, hiddenInMain: true, @@ -1008,7 +1043,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive // } // }, form: { - componentProps:{ + componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', @@ -1036,10 +1072,19 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:true - }] + }], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, - tableForm:{ + tableForm: { + enterSearch: true, multiple: true, // labelMessage: '信息提示说明!!!', isInpuFocusShow: true, // 开启查询弹窗 @@ -1069,7 +1114,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:false - }] + }], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index 767c6f791..c3e136109 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -84,7 +84,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( action: '==', // 查询拼接条件 isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 - }] + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, isForm: true, @@ -967,6 +975,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts new file mode 100644 index 000000000..6db5af625 --- /dev/null +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts @@ -0,0 +1,299 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const SupplierApbalanceDetailRules = reactive({ + ttSupplier: [required], + ttGltype: [required], + concurrencyStamp: [required], +}) + +export const SupplierApbalanceDetail = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '供应商代码', + field: 'ttSupplier', + sort: 'custom', + isSearch: true, + }, + { + label: '供应商名称', + field: 'ttSupplierName', + sort: 'custom', + isSearch: true, + }, + { + label: '科目代码', + field: 'ttGlcode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '年度', + field: 'ttYear', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '凭证号', + field: 'ttVoucher', + sort: 'custom', + isSearch: true, + }, + { + label: '发票号', + field: 'ttReference', + sort: 'custom', + isSearch: true, + }, + { + label: '完整凭证号', + field: 'ttInvoiceno', + sort: 'custom', + isSearch: true, + }, + { + label: '发票TC原始金额', + field: 'ttTcAmt', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '发票BC原始金额', + field: 'ttBcAmt', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '发票TC余额', + field: 'ttTcbal', + sort: 'custom', + }, + { + label: '发票BC余额', + field: 'ttBcbal', + sort: 'custom', + }, + { + label: '货币', + field: 'ttCurr', + sort: 'custom', + }, + { + label: '到期日期', + field: 'ttDueDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '发票日期', + field: 'ttInvDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '凭证日期', + field: 'ttEffDate', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '付款周期', + field: 'ttCreditTerm', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '账户类型', + field: 'ttGltype', + sort: 'custom', + dictType: DICT_TYPE.TT_GLTYPE, + dictClass: 'string', + }, + { + label: '父ID', + field: 'masterId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue new file mode 100644 index 000000000..42b27103a --- /dev/null +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -0,0 +1,287 @@ + + + diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts new file mode 100644 index 000000000..663fc9fc8 --- /dev/null +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -0,0 +1,253 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const SupplierApbalanceMainRules = reactive({ + ttCompany: [required], + ttSupplier: [required], + ttGltype: [required], + ttCustorsupp: [required], + ttSupplierType: [required], + ttGenerateTime: [required], + concurrencyStamp: [required], +}) + +export const SupplierApbalanceMain = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '公司代码', + field: 'ttCompany', + sort: 'custom', + isSearch: true, + }, + { + label: '供应商代码', + field: 'ttSupplier', + sort: 'custom', + isSearch: true, + }, + { + label: '账户类型', + field: 'ttGltype', + sort: 'custom', + isSearch: true, + dictType: DICT_TYPE.TT_GLTYPE, + dictClass: 'string', + }, + { + label: '类型固定值', + field: 'ttCustorsupp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '供应商类型', + field: 'ttSupplierType', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + form: { + component: 'SelectV2' + }, + }, + { + label: '名称1', + field: 'ttName1', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '名称2', + field: 'ttName2', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '名称3', + field: 'ttName3', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '供应商名称', + field: 'ttSupplierName', + sort: 'custom', + isSearch: false, + }, + { + label: '生成时间', + field: 'ttGenerateTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '应付挂账金额', + field: 'ttAccountAp', + sort: 'custom', + isSearch: false, + }, + { + label: '其他应付金额', + field: 'ttAccountOthap', + sort: 'custom', + isSearch: false, + }, + { + label: '预付金额', + field: 'ttAccountPrepay', + sort: 'custom', + isSearch: false, + }, + { + label: '付款周期', + field: 'ttCreditTerm', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm:false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 68db0280c..ce7df9147 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -980,6 +980,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '合同价格', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index dab603fea..d6b173054 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1957,10 +1957,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive @@ -358,6 +358,7 @@ const importTemplateData = reactive({ // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { + ...tableObject.params, isSearch: true, filters: [...searchData.filters,{ action: "==", @@ -460,16 +461,17 @@ const importTemplateData = reactive({ color:var(--el-color-danger); font-weight:700; } -.search-box .el-input-number__decrease { - display: none !important; -} + ::v-deep(.el-input-number__decrease) { display: none !important; } ::v-deep(.el-input-number__increase) { display: none !important; } - +::v-deep(.el-input-number .el-input__wrapper) { + padding-left: 0; + padding-right: 0; + +} -./supplierinvoiceRequestMainDifference.data \ No newline at end of file diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 652c04092..4317d424b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1960,6 +1960,9 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive([ label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '创建时间',