diff --git a/public/config.js b/public/config.js index ca92b2f..9c0e075 100644 --- a/public/config.js +++ b/public/config.js @@ -11,4 +11,7 @@ window.SCHEDULING_ANALYSIS = "http://192.168.169.172:8088/SCHEDULING_ANALYSIS" window.PROCESS_QUALITY_RECORD = "http://192.168.169.172:9000/jmreport/view/1153140195292762112" //电子档案-热表分厂-质量记录 -window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160" //仓管-库存汇总-存料登记卡打印 \ No newline at end of file +window.WARE_MATERIAL_STOCK = "http://192.168.169.172:9000/jmreport/view/1186917825215324160" //仓管-库存汇总-存料登记卡打印 + +// 配套单打印 +window.COMPANION = "http://192.168.169.172:9000/jmreport/view/1188705683594706944" \ No newline at end of file diff --git a/src/api/productionManagement/sjKitPreparation.js b/src/api/productionManagement/sjKitPreparation.js index b3b6fab..64dfece 100644 --- a/src/api/productionManagement/sjKitPreparation.js +++ b/src/api/productionManagement/sjKitPreparation.js @@ -34,7 +34,7 @@ export const sendKit = (params) => { // 生成车间订单 export const loadBigWmsSend = (params) => { return request({ - url: '/blade-desk/workOrder/generateWorkOrder', + url: '/blade-desk/produceMonitor/generateWorkOrder', method: 'post', params: params, }); diff --git a/src/api/workRate/index.js b/src/api/workRate/index.js index 423941a..cf4d15e 100644 --- a/src/api/workRate/index.js +++ b/src/api/workRate/index.js @@ -1,8 +1,18 @@ import request from '@/axios'; export const getOrderDetail = (params) => { return request({ - url: '/blade-desk/workOrder/getOrderDetail', + url: '/blade-desk/produceMonitor/getOrderDetail', method: 'get', params: params, }); }; + + +// 获取工序详情 +export const getPlanDetail = (params) => { + return request({ + url: '/blade-desk/produceMonitor/getPlanDetail', + method: 'get', + params: params, + }); +}; \ No newline at end of file diff --git a/src/utils/templateMapper.js b/src/utils/templateMapper.js new file mode 100644 index 0000000..c938d3e --- /dev/null +++ b/src/utils/templateMapper.js @@ -0,0 +1,38 @@ +// src/utils/templateMapper.js + +/** + * 根据 rfpsType 获取对应的模板组件名称 + * @param {number} type - rfpsType 类型值 (1-22) + * @returns {string} 模板组件名称 + */ +export function getTemplateComponent(type) { + const componentMap = { + 1: 'Template1', + 2: 'Template2', + 3: 'Template3', + 4: 'Template4', + 5: 'Template5', + 6: 'Template6', + 7: 'Template7', + 8: 'Template8', + 9: 'Template9', + 10: 'Template10', + 11: 'Template11', + 12: 'Template12', + 13: 'Template13', + 14: 'Template14', + 15: 'Template15', + 16: 'Template16', + 17: 'Template17', + 18: 'Template18', + 19: 'Template19', + 20: 'Template20', + 21: 'Template21', + 22: 'Template22' + }; + return componentMap[type]; +} + +export default { + getTemplateComponent +}; \ No newline at end of file diff --git a/src/views/productionManagement/productionMonitoring/index.vue b/src/views/productionManagement/productionMonitoring/index.vue index 153fd8b..da6ba7d 100644 --- a/src/views/productionManagement/productionMonitoring/index.vue +++ b/src/views/productionManagement/productionMonitoring/index.vue @@ -66,7 +66,7 @@ - + - - + + @@ -14,12 +29,17 @@