diff --git a/src/api/mes/orderDay/index.ts b/src/api/mes/orderDay/index.ts index 24de2d1..0770e63 100644 --- a/src/api/mes/orderDay/index.ts +++ b/src/api/mes/orderDay/index.ts @@ -20,6 +20,14 @@ export interface OrderDayVO { taskMode: string } +export function getCompleteInspectionMark(paramCode) { + return http.get('/mes/complete-inspect/get?paramCode=' + paramCode) +} + +export function getQualityformInfo(fromNo) { + return http.get('/mes/qualityform/getQualityform?fromNo=' + fromNo) +} + export function getOrderDayPage(params) { return http.get('/mes/orderday/page', {params}) } @@ -29,88 +37,14 @@ export function getOrderDayPlanDetail(number) { return http.get('/mes/orderday/get?id=' + number) } -// 查询生产日计划列表 -// export const getOrderDayPage = async (params) => { -// if (params.isSearch) { -// delete params.isSearch -// const data = {...params} -// return await request.post({ url: '/mes/orderday/senior', data }) -// } else { -// return await request.get({ url: `/mes/orderday/page`, params }) -// } -// } - -// // 查询生产日计划详情 -// export const getOrderDay = async (id: number) => { -// return await request.get({ url: `/mes/orderday/get?id=` + id }) -// } - -// // 新增生产日计划 -// export const createOrderDay = async (data: OrderDayVO) => { -// return await request.post({ url: `/mes/orderday/create`, data }) -// } - -// // 修改生产日计划 -// export const updateOrderDay = async (data: OrderDayVO) => { -// return await request.put({ url: `/mes/orderday/update`, data }) -// } - -// // 删除生产日计划 -// export const deleteOrderDay = async (id: number) => { -// return await request.delete({ url: `/mes/orderday/delete?id=` + id }) -// } - -// // 导出生产日计划 Excel -// export const exportOrderDay = async (params) => { -// return await request.download({ url: `/mes/orderday/export-excel`, params }) -// } -// // 下载用户导入模板 -// export const importTemplate = () => { -// return request.download({ url: '/mes/orderday/get-import-template' }) -// } -// // 根据产品编码获取Bom -// export const getBoms = async (code: String) => { -// return request.get({ url: '/mes/common/geBomByProductCode?code='+code }) -// } -// // 根据产品编码获取工艺路线 -// export const getProcessroutes = async (code: String) => { -// return request.get({ url: '/mes/common/getProcessRouteByProductCode?code='+code }) -// } -// // 根据车间编码获取产线列表 -// export const getProductlines = async (code: String) => { -// return request.get({ url: '/mes/common/getLinesByWorkRoomCode?code='+code }) -// } -// // 获取产线信息 -// export const getProductlineInfo = async (code: String) => { -// return request.get({ url: '/mes/common/getLinesByWorkRoomCode?code='+code }) -// } -// // 根据工艺路线的工序信息 -// export const getProcessroutesDetail = async (code) => { -// return await request.get({ url: `/mes/orderday/getProcessInfo?code=`+ code }) -// } -// // 根据获取计划BOM信息 -// export const getPlanBom = async (params) => { -// return await request.get({ url: `/mes/orderday/getBomInfo`,params }) -// } +export function getBomInfo(params) { + return http.post('/mes/complete-inspect/get-orderDay-bom', params) +} -// // 根据获取计划BOM信息 -// export const getBomInfoTree = async (params) => { -// return await request.get({ url: `/mes/orderday/getBomInfoTree`,params }) -// } -// // 根据计划的车间、产线、计划时间 查询已经配置的人员 -// export const getPlanWorks = async (params) => { -// return await request.get({ url: `/mes/orderday/getWorkGroup`,params }) -// } -// // 根据车间、产线 查询已配置的设备 -// export const getPlanDevices = async (params) => { -// return await request.get({ url: `/mes/orderday/getDeviceInfo`,params }) -// } +export function getBomInfoList(params) { + return http.post('/mes/complete-inspect/get-orderDay-bom-page', params) +} -// ///发布计划 -// export const publishPlan = async (data: OrderDayVO) => { -// return await request.post({ url: `/mes/orderday/publishPlan`,data }) -// } -// //终止计划 -// export const stopPlan = async (params) => { -// return await request.post({ url: `/mes/orderday/stopPlan`,params }) -// } \ No newline at end of file +export function updateBomInfo(params) { + return http.post('/mes/complete-inspect/update', params) +} diff --git a/src/api/mes/workScheduling/index.ts b/src/api/mes/workScheduling/index.ts new file mode 100644 index 0000000..f39ee19 --- /dev/null +++ b/src/api/mes/workScheduling/index.ts @@ -0,0 +1,58 @@ +import http from '../../http' + +export interface OrderDayVO { + status: string + remark: string + planNoMonth: string + planNoDay: string + productCode: string + workroomCode: string + lineCode: string + planCount: number + processrouteCode: string + tempProcessroute: string + standardBom: string + tempBom: string + workMode: string + planDate: Date + startTime: Date + endTime: Date + taskMode: string +} + +export function getCompleteInspectionMark(paramCode) { + return http.get('/mes/complete-inspect/get?paramCode=' + paramCode) +} + +export function getQualityformInfo(fromNo) { + return http.get('/mes/qualityform/getQualityform?fromNo=' + fromNo) +} + +export function getWorkSchedulingPage(params) { + return http.get('/mes/work-scheduling/page', {params}) +} + +export function getWorkSchedulingDetail(number) { + //return http.get('/eam/item-apply-request-main/appGetByNumber?number=' + number) + return http.get('/mes/work-scheduling/get?id=' + number) +} + +export function getBomInfo(params) { + return http.post('/mes/complete-inspect/get-orderDay-bom', params) +} + +export function getBomInfoList(params) { + return http.post('/mes/complete-inspect/get-orderDay-bom-page', params) +} + +export function getWorkerInfoList(params) { + return http.post('/mes/complete-inspect/get-orderDay-worker-page', params) +} + +export function getEquipmentInfoList(params) { + return http.post('/mes/complete-inspect/get-orderDay-equipment-page', params) +} + +export function updateWorkSchedulingInfo(params) { + return http.post('/mes/complete-inspect/update', params) +} diff --git a/src/pages.json b/src/pages.json index c76597f..ad903a3 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1907,6 +1907,36 @@ "navigationBarTitleText": "日计划查询明细", "enablePullDownRefresh": true } + },{ + "path": "pages/mes/workScheduling/workScheduling", + "style": { + "navigationBarTitleText": "生产任务查询明细", + "enablePullDownRefresh": true + } + },{ + "path": "pages/mes/workScheduling/bomInspect", + "style": { + "navigationBarTitleText": "齐套检查——Bom", + "enablePullDownRefresh": true + } + },{ + "path": "pages/mes/workScheduling/equipmentInspect", + "style": { + "navigationBarTitleText": "齐套检查——设备", + "enablePullDownRefresh": true + } + },{ + "path": "pages/mes/workScheduling/workerInspect", + "style": { + "navigationBarTitleText": "齐套检查——人员", + "enablePullDownRefresh": true + } + },{ + "path": "pages/mes/workScheduling/inspectionItems", + "style": { + "navigationBarTitleText": "齐套检查——检查项", + "enablePullDownRefresh": true + } },{ "path": "pages/mes/workOrder/processReport", "style": { diff --git a/src/pages/mes/orderDayPlan/detail.vue b/src/pages/mes/orderDayPlan/detail.vue index 22c2c42..df9163e 100644 --- a/src/pages/mes/orderDayPlan/detail.vue +++ b/src/pages/mes/orderDayPlan/detail.vue @@ -66,23 +66,10 @@ 结束时间： {{ `${$time.formatDate(data.endTime)}` }} - - - 备件名称：{{ cur.itemName }} - - - 类型：{{ cur.type == 'type' ? '设备' : '模具' }} - - - {{ cur.type == 'type' ? '设备' : '模具' }}名称：{{ cur.name }} - - - 是否以旧换新：{{ cur.isRadeIn == 'TRUE' ? '是' : '否' }} - - - 数量：{{ cur.qty }} - - + + 齐套检查-Bom： + {{ data.bomInspect }} + @@ -122,54 +109,6 @@ function getSparePartsApplicationDetail() { }) } -// 触发提交表单 -function agree() { - proxy.$modal.confirm('确定通过申请吗').then(() => { - proxy.$modal.loading('加载中') - loading.value = true - sparePartsApplicationApproveApi.sparePartsApplicationAgree(data.value.id).then((res) => { - proxy.$modal.closeLoading() - if (res.data) { - proxy.$modal.showToast('审核成功') - setTimeout(() => { - proxy.$tab.navigateBack() - loading.value = false - }, 1500) - } else { - proxy.$modal.showToast('审核失败') - loading.value = false - } - }).catch(() => { - proxy.$modal.closeLoading() - loading.value = false - }) - }) - -} - -// 驳回 -function reject(item) { - proxy.$modal.confirm('确定驳回申请吗？').then(() => { - proxy.$modal.loading('加载中') - loading.value = true - sparePartsApplicationApproveApi.sparePartsApplicationReject(item.id).then(async (res) => { - if (res.data) { - proxy.$modal.showToast('已驳回') - setTimeout(() => { - proxy.$tab.navigateBack() - loading.value = false - }, 1500) - } else { - proxy.$modal.showToast('审核失败') - loading.value = false - } - }).catch(() => { - proxy.$modal.closeLoading() - loading.value = false - }) - - }) -} onLoad((option) => { if (option.type) type.value = option.type @@ -230,7 +169,7 @@ onShow(() => { view { &:nth-child(1) { - width: 200rpx; + width: 240rpx; } &:nth-child(2) { diff --git a/src/pages/mes/orderDayPlan/orderDayPlan.vue b/src/pages/mes/orderDayPlan/orderDayPlan.vue index 2a40fc5..a2c94d1 100644 --- a/src/pages/mes/orderDayPlan/orderDayPlan.vue +++ b/src/pages/mes/orderDayPlan/orderDayPlan.vue @@ -3,9 +3,9 @@ + border-color=#5599FF @search="searchTable()"> - @@ -27,6 +27,8 @@ 状态： + + @@ -142,7 +147,6 @@ async function getTabsList() { //首次进页面触发 onShow(() => { - console.log(searchValue.value) tabParams.value.pageNo = 1 tabParams.value.status = '' list.value = [] @@ -167,9 +171,18 @@ function openDetail(item, index) { proxy.$tab.navigateTo(`/pages/mes/orderDayPlan/detail?id=${item.id}`) } +//打开Bom检查 +function openBomInspect(item, index) { + proxy.$tab.navigateTo(`/pages/mes/orderDayPlan/bomInspect?planNoDay=${item.planNoDay}`) +} + +function openInspectItem(item, index) { + const objString = JSON.stringify(item); + proxy.$tab.navigateTo(`/pages/mes/orderDayPlan/inspectionItems?obj=${objString}`) +} + //切换标签页 function tabsChange(index) { - console.log(index) current.value = index tabParams.value.pageNo = 1 if (index == '0') { @@ -189,9 +202,7 @@ const searchTableParams = ref({ async function searchTable() { list.value = [] - console.log(this.searchValue) searchTableParams.value.planNoDay = this.searchValue - console.log(searchTableParams.value) await orderDayPlanListApi.getOrderDayPage(searchTableParams.value).then((res) => { if (res.data.list.length > 0) { list.value = list.value.concat(res.data.list) diff --git a/src/pages/mes/workScheduling/bomInspect.vue b/src/pages/mes/workScheduling/bomInspect.vue new file mode 100644 index 0000000..b1dd4fc --- /dev/null +++ b/src/pages/mes/workScheduling/bomInspect.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mes/workScheduling/detail.vue b/src/pages/mes/workScheduling/detail.vue new file mode 100644 index 0000000..df9163e --- /dev/null +++ b/src/pages/mes/workScheduling/detail.vue @@ -0,0 +1,301 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mes/workScheduling/equipmentInspect.vue b/src/pages/mes/workScheduling/equipmentInspect.vue new file mode 100644 index 0000000..5d64fec --- /dev/null +++ b/src/pages/mes/workScheduling/equipmentInspect.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mes/workScheduling/inspectionItems.vue b/src/pages/mes/workScheduling/inspectionItems.vue new file mode 100644 index 0000000..a15b7d2 --- /dev/null +++ b/src/pages/mes/workScheduling/inspectionItems.vue @@ -0,0 +1,405 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mes/workScheduling/workScheduling.vue b/src/pages/mes/workScheduling/workScheduling.vue new file mode 100644 index 0000000..fed7e7b --- /dev/null +++ b/src/pages/mes/workScheduling/workScheduling.vue @@ -0,0 +1,311 @@ + + + + + \ No newline at end of file diff --git a/src/pages/mes/workScheduling/workerInspect.vue b/src/pages/mes/workScheduling/workerInspect.vue new file mode 100644 index 0000000..b4269bc --- /dev/null +++ b/src/pages/mes/workScheduling/workerInspect.vue @@ -0,0 +1,148 @@ + + + + + \ No newline at end of file