diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index ea487419a..eff3ca35c 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -119,6 +119,8 @@ import * as ScrapRequestMainApi from '@/api/wms/scrapRequestMain' import * as ScrapRequestDetailApi from '@/api/wms/scrapRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as StdcostpriceApi from '@/api/wms/stdcostprice' +import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' +import * as WarehouseApi from '@/api/wms/warehouse' import { getSwitchByCode } from '@/api/wms/switch' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' @@ -141,18 +143,36 @@ const ScrapRequestMainAllSchema = ref(cloneDeep(ScrapRequestMain)) // 是否启用QMS开启显示q1q2q3 const EnableQms = ref(true) const updateKey = ref(0) -const getSwitchByCode1 =async () => { - await getSwitchByCode("EnableQms").then((res) => { +const getSwitchByCode1 = async () => { + await getSwitchByCode('EnableQms').then((res) => { EnableQms.value = res == 'TRUE' ? true : false - if (EnableQms.value) { - ScrapRequestMain.allSchemas = ScrapRequestMainAllSchema.value.allSchemas - } else { - ScrapRequestMain.allSchemas.formSchema = ScrapRequestMainAllSchema.value.allSchemas.formSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') - ScrapRequestMain.allSchemas.tableColumns = ScrapRequestMainAllSchema.value.allSchemas.tableColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') - ScrapRequestMain.allSchemas.tableFormColumns = ScrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') - ScrapRequestMain.allSchemas.tableMainColumns = ScrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') - ScrapRequestMain.allSchemas.detailSchema = ScrapRequestMainAllSchema.value.allSchemas.detailSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') - ScrapRequestMain.allSchemas.searchSchema = ScrapRequestMainAllSchema.value.allSchemas.searchSchema.filter(item => item.field != 'q1Number'&&item.field != 'q2Number'&&item.field != 'q3Number') + if (EnableQms.value) { + ScrapRequestMain.allSchemas = ScrapRequestMainAllSchema.value.allSchemas + } else { + ScrapRequestMain.allSchemas.formSchema = + ScrapRequestMainAllSchema.value.allSchemas.formSchema.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) + ScrapRequestMain.allSchemas.tableColumns = + ScrapRequestMainAllSchema.value.allSchemas.tableColumns.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) + ScrapRequestMain.allSchemas.tableFormColumns = + ScrapRequestMainAllSchema.value.allSchemas.tableFormColumns.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) + ScrapRequestMain.allSchemas.tableMainColumns = + ScrapRequestMainAllSchema.value.allSchemas.tableMainColumns.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) + ScrapRequestMain.allSchemas.detailSchema = + ScrapRequestMainAllSchema.value.allSchemas.detailSchema.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) + ScrapRequestMain.allSchemas.searchSchema = + ScrapRequestMainAllSchema.value.allSchemas.searchSchema.filter( + (item) => item.field != 'q1Number' && item.field != 'q2Number' && item.field != 'q3Number' + ) } updateKey.value++ }) @@ -210,7 +230,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row[formField] = val[0][searchField] } } else { - console.log("报废出库主表") + console.log('报废出库主表') const setV = {} if (formField == 'q1Number') { setV['noticeRemark'] = val[0]['desc'] @@ -242,24 +262,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } }) } - if(formField === 'usageDescription'){ + if (formField === 'usageDescription') { setV['usageDescription'] = val[0]['usageDescription'] setV['usageCode'] = val[0]['code'] } - if(formField === 'costCenterCode'){ + if (formField === 'costCenterCode') { setV['costcentreCode'] = val[0]['costcentreCode'] setV['costCenterType'] = val[0]['costcentreType'] } - if(formField === 'reasonCodeRequisition'){ + if (formField === 'reasonCodeRequisition') { setV['reasonCodeRequisition'] = val[0]['code'] } - if(formField === 'projectCode'){ + if (formField === 'projectCode') { setV['projectCode'] = val[0]['projectCode'] } setV[formField] = val[0][searchField] formRef.setValues(setV) } - }) } const clearSearchInput = (field) => { @@ -272,7 +291,7 @@ const clearSearchInput = (field) => { } }) formRef.value.formRef.setValues({ - noticeRemark:'' + noticeRemark: '' }) } if (field == 'q2Number') { @@ -284,7 +303,7 @@ const clearSearchInput = (field) => { } }) formRef.value.formRef.setValues({ - noticeRemark:'' + noticeRemark: '' }) } if (field == 'q3Number') { @@ -296,7 +315,7 @@ const clearSearchInput = (field) => { } }) formRef.value.formRef.setValues({ - noticeRemark:'' + noticeRemark: '' }) } } @@ -538,6 +557,27 @@ const handleHandle = async (id: number) => { const formRef = ref() const openForm = async (type: string, row?: any) => { if (type == 'create') { + const params = { + by: 'ASC', + filters: [ + { column: 'available', action: '==', value: 'TRUE' }, + { column: 'type', action: '==', value: 'SCRAP' } + ], + pageNo: 1, + pageSize: 500, + sort: '' + } + params.isSearch = true + WarehouseApi.getWarehousePage(params).then((res) => { + if (res.list?.length > 0) { + nextTick(() => { + formRef.value.formRef.setValues({ + fromWarehouseCode: res.list[0].code + }) + }) + } + }) + ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') { item.componentProps.enterSearch = true @@ -589,7 +629,7 @@ const openForm = async (type: string, row?: any) => { }) } if (!row.q3Number && !row.q2Number && !row.q1Number) { - ScrapRequestMain.allSchemas.formSchema.forEach((item) => { + ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q2Number' || item.field == 'q3Number') { item.componentProps.enterSearch = true item.componentProps.isSearchList = true @@ -676,7 +716,7 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 - data.subList.forEach(item=>{ + data.subList.forEach((item) => { item.qty = Number(item.qty).toFixed(2) item.singlePrice = Number(item.singlePrice).toFixed(2) item.amount = Number(item.amount).toFixed(2) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 4a6c3b273..98145516e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -47,6 +47,101 @@ const userDept = userStore.userSelfInfo.dept userDept.id = userDept.id.toString() const userDeptArray: any = [userDept] +export const QadProjectCode = useCrudSchemas( +   reactive([ +     +     { +       label: 'id', +       field: 'id', +       sort: 'custom', +       isForm: false, +       isTable:false, +     }, +     { +       label: '项目ID', +       field: 'projectId', +       sort: 'custom', +       isSearch: false, +     }, +     { +       label: '项目代码', +       field: 'projectCode', +       sort: 'custom', +       isSearch: true, +     }, +     { +       label: '项目描述', +       field: 'projectDescription', +       sort: 'custom', +       isSearch: false, +       form: { +         component: 'Editor', +         componentProps: { +           valueHtml: '', +           height: 200 +         } +       }, +     }, +     { +       label: '项目开始时间', +       field: 'projectStartDate', +       sort: 'custom', +       formatter: dateFormatter, +       isSearch: 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: 'projectEndDate', +       sort: 'custom', +       formatter: dateFormatter, +       isSearch: 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: 'statusCode', +       sort: 'custom', +       isSearch: false, +     }, +     { +       label: '备注', +       field: 'remark', +       sort: 'custom', +       isSearch: false, +     } +   ]) + ) + + /** * @returns {Array} 报废出库申请主表 */ @@ -243,7 +338,7 @@ export const ScrapRequestMain = useCrudSchemas( searchListPlaceholder: '请选择QAD项目信息', searchField: 'projectCode', searchTitle: '领用原因代码', - searchAllSchemas: QadProject.allSchemas, + searchAllSchemas: QadProjectCode.allSchemas, searchPage: QadProjectApi.getQadProjectPage, verificationParams: [{ key: 'projectCode', @@ -262,7 +357,7 @@ export const ScrapRequestMain = useCrudSchemas( searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 searchField: 'projectCode', // 查询弹窗赋值字段 searchTitle: '领用原因代码', // 查询弹窗标题 - searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 + searchAllSchemas: QadProjectCode.allSchemas, // 查询弹窗所需类 searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', @@ -539,6 +634,11 @@ export const ScrapRequestMain = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'type', + value: 'SCRAP', + isMainValue: false } ], verificationParams: [ @@ -567,6 +667,11 @@ export const ScrapRequestMain = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'type', + value: 'SCRAP', + isMainValue: false } ], verificationParams: [ @@ -965,6 +1070,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ }, tableForm:{ multiple:true, + disabled: true, isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择批次', searchField: 'batch', @@ -997,7 +1103,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 + isSearchList: true,// 开启查询弹窗 + disabled: true, searchListPlaceholder: '请选择批次', searchField: 'batch', searchTitle: '库存余额信息',