diff --git a/src/api/mes/orderDayConfig/index.ts b/src/api/mes/orderDayConfig/index.ts index b5134d9c5..f1f5749d3 100644 --- a/src/api/mes/orderDayConfig/index.ts +++ b/src/api/mes/orderDayConfig/index.ts @@ -35,3 +35,23 @@ export const getConfigProcessWorker = async (params) => { export const getConfigProcessEquipment = async (params) => { return await request.get({ url: `/mes/orderDayequipment/getByOrder`, params }) } + +/*批量保存工序人员配置*/ +export const saveWorker = async (data: any) => { + return await request.post({ url: `/mes/orderDayWorker/batchCreate`, data }) +} + +// 查询设备基本信息列表 +export const getDeviceInfoPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/mes/device-info/senior', data }) + } else { + return await request.get({ url: `/mes/device-info/page`, params }) + } +} +/*批量保存工序模具配置*/ +export const saveEquipment = async (data: any) => { + return await request.post({ url: `/mes/orderDayequipment/batchCreate`, data }) +} diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts index ace3d69c0..ea1ee0a98 100644 --- a/src/api/wms/team/index.ts +++ b/src/api/wms/team/index.ts @@ -12,6 +12,8 @@ export interface TeamVO { teamGroup: string workshopCode: string productionLineCode: string + teamMonitorCode: string + teamMonitorName: string } // 查询班组列表 @@ -25,6 +27,17 @@ export const getTeamPage = async (params) => { } } +export const geTeamUserByCode = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/team/queryTeamUserByCode', data }) + } + // else { + // return await request.get({ url: `/wms/team/queryTeamUserByCode`, params }) + // } +} + // 查询班组详情 export const getTeam = async (id: number) => { return await request.get({ url: `/wms/team/get?id=` + id }) diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 469eefaea..7ca6b31d2 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -33,12 +33,15 @@ - + - + + @@ -46,69 +49,144 @@ -
+
- + - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - - - + 添加人员 + 保存 + + + + + + + + + + + 添加设备 + 保存 - - - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + 查询 + + + + + + + + + + + + + + + + + + + - + - diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index e7d0f5653..a67084f4d 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -63,7 +63,7 @@ export const OrderDay = useCrudSchemas(reactive([ disabled: true } }, - + }, { label: '', @@ -142,7 +142,7 @@ export const OrderDay = useCrudSchemas(reactive([ value: 'CCP,BCP',//,SEMI] isMainValue: false }, - + ] } } @@ -169,7 +169,7 @@ export const OrderDay = useCrudSchemas(reactive([ }] } }, - + }, { label: '产线编码', @@ -360,3 +360,52 @@ export const OrderDay = useCrudSchemas(reactive([ } } ])) + + +export const DeviceInfo = useCrudSchemas(reactive([ + { + label: '设备编码', + field: 'deviceCode', + sort: 'custom', + isSearch: true, + }, + { + label: '设备名称', + field: 'deviceName', + sort: 'custom', + isSearch: true, + }, + // { + // label: '设备类型', + // field: 'deviceType', + // sort: 'custom', + // isSearch: true, + // form: { + // component: 'SelectV2' + // }, + // }, + { + label: '所属车间', + field: 'workroomCode', + sort: 'custom', + isSearch: true, + }, + { + label: '所属产线', + field: 'lineCode', + sort: 'custom', + isSearch: true, + }, + // { + // label: '设备分组', + // field: 'deviceGroup', + // sort: 'custom', + // isSearch: true, + // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, +])) diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index 81a9335f7..f2e67fdcc 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -41,6 +41,15 @@ export const Team = useCrudSchemas(reactive([ width: 120 } }, + { + label: '班组负责人', + field: 'teamMonitorName', + sort: 'custom', + isSearch: true, + table: { + width: 120 + } + }, { label: '班组类型', field: 'teamGroup', diff --git a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue index 5abcc0c42..91f555963 100644 --- a/src/views/wms/basicDataManage/orderManage/team/teamForm.vue +++ b/src/views/wms/basicDataManage/orderManage/team/teamForm.vue @@ -33,8 +33,11 @@ - - + +
+ + +
@@ -105,9 +108,14 @@ - + + + + + + - + @@ -166,7 +174,9 @@ const formData = ref({ workshopCode:'', workshopName:'', productionLineCode:'', - productionLineName:'' + productionLineName:'', + teamMonitorCode:'', + teamMonitorName:'' }) const formRules = reactive({ code: [ @@ -184,6 +194,7 @@ const formRules = reactive({ teamGroup: [{ required: true, message: '班组类别不能为空', trigger: 'change' }], workshopCode: [{ required: true, message: '请选择车间代码', trigger: 'blur' },], productionLineCode: [{ required: true, message: '请选择产线代码', trigger: 'blur' },], + teamMonitorName: [{ required: true, message: '请选择负责人', trigger: 'blur' },], }) const basicFormRef = ref() // 表单 Ref const handleClose = (username: string) => { @@ -203,10 +214,19 @@ const _searchField = ref(); const _multiple = ref(); const _type = ref(); const _row = ref(); +const _searchCondition = ref({}) -/** 选择班组成员弹窗 */ -const addUser = () => { - const _searchCondition = {} +const addMonitor = () =>{ + addUserCommon(false,'monitor') +} + +const addUser = () =>{ + addUserCommon(true,'username') +} + +/** 选择人员弹窗 */ +const addUserCommon = (multiple,field) => { + _searchCondition.value = {} const filters: any[] = [] filters.push({ action: "==", @@ -214,31 +234,20 @@ const addUser = () => { value: 'WORKER' }) // 参数整理 - _searchCondition.isSearch = true - _searchCondition.filters = filters - _searchTableTitle.value = '选择组员' - _multiple.value = true - _formField.value = 'username' - _searchField.value = 'username' + _searchCondition.value.isSearch = true + _searchCondition.value.filters = filters + _searchTableTitle.value = '选择人员' + _multiple.value = multiple + _formField.value = field + _searchField.value = field _searchTablePage.value = UserApi.getUserPage _searchTableAllSchemas.value = searchUser.allSchemas - - searchTableRef.value.open( - _searchTableTitle.value, - _searchTableAllSchemas.value, - _searchTablePage.value, - _formField.value, - _searchField.value, - _multiple.value, - _type, - _row, - _searchCondition - ) + openCommon() } /** 选择车间弹窗 */ const addWorkShop = () => { - const _searchCondition = {} + _searchCondition.value = {} const filters: any[] = [] filters.push({ action: "==", @@ -246,26 +255,15 @@ const addWorkShop = () => { value: 'TRUE' }) // 参数整理 - _searchCondition.isSearch = true - _searchCondition.filters = filters + _searchCondition.value.isSearch = true + _searchCondition.value.filters = filters _searchTableTitle.value = '选择车间' _multiple.value = false _formField.value = 'workshop' _searchField.value = 'workshop' _searchTablePage.value = WorkshopApi.getWorkshopPage _searchTableAllSchemas.value = Workshop.allSchemas - - searchTableRef.value.open( - _searchTableTitle.value, - _searchTableAllSchemas.value, - _searchTablePage.value, - _formField.value, - _searchField.value, - _multiple.value, - _type, - _row, - _searchCondition - ) + openCommon() } /** 选择产线弹窗 */ @@ -274,7 +272,7 @@ const addProductionLine = () => { message.warning('请先选择车间代码'); return } - const _searchCondition = {} + _searchCondition.value = {} const filters: any[] = [] filters.push({ action: "==", @@ -286,26 +284,15 @@ const addProductionLine = () => { value: formData.value.workshopCode }) // 参数整理 - _searchCondition.isSearch = true - _searchCondition.filters = filters + _searchCondition.value.isSearch = true + _searchCondition.value.filters = filters _searchTableTitle.value = '选择产线' _multiple.value = false _formField.value = 'productionLine' _searchField.value = 'productionLine' _searchTablePage.value = ProductionlineApi.getProductionlinePage _searchTableAllSchemas.value = Productionline.allSchemas - - searchTableRef.value.open( - _searchTableTitle.value, - _searchTableAllSchemas.value, - _searchTablePage.value, - _formField.value, - _searchField.value, - _multiple.value, - _type, - _row, - _searchCondition - ) + openCommon() } /** 弹窗选择之后 回调函数 */ @@ -323,6 +310,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => formData.value.productionLineCode = val[0].code formData.value.productionLineName = val[0].name } + else if (formField === 'monitor'){ + formData.value.teamMonitorCode = val[0].username + formData.value.teamMonitorName = val[0].nickname + } else { val.forEach(item => { const isExist = tags.value.some(tag => tag.username === item.username); @@ -338,7 +329,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } }) } - +/*打开弹窗*/ +const openCommon = () => { + searchTableRef.value.open( + _searchTableTitle.value, + _searchTableAllSchemas.value, + _searchTablePage.value, + _formField.value, + _searchField.value, + _multiple.value, + _type.value, + _row.value, + _searchCondition.value + ) +} /** 初始化弹窗 */ const open = async (type: string, row?: object) => { dialogVisible.value = true @@ -409,7 +413,9 @@ const resetForm = () => { workshopCode:'', workshopName:'', productionLineCode:'', - productionLineName:'' + productionLineName:'', + teamMonitorCode:'', + teamMonitorName:'' } basicFormRef.value?.resetFields() }