diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index f690d43..4dff2ae 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -188,9 +188,12 @@ 开始生产 - + SOP预览 + + 工艺参数 + @@ -3243,6 +3246,7 @@ export default { rowCount: '', rollCount: '', carrierNo: '', + batchNo: '', // 合约号码 }, currentRollOps: { site: this.$store.state.user.site, @@ -4236,6 +4240,7 @@ export default { this.scheduleData.rowCount = data.row.rowCount; this.scheduleData.rollCount = data.row.rollCount; this.scheduleData.carrierNo = data.row.carrierNo; + this.scheduleData.batchNo = data.row.batchNo; //设置弹窗的标题 this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' ' + data.row.resourceDesc + ' (' + this.operatorData.operatorName + ')'; @@ -5133,6 +5138,36 @@ export default { }); }, + // 打开工艺参数页面 + openProcessDataPage() { + // 检查是否有选择的派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单'); + return false; + } + + // 获取加工中心编码和合约号码 + const workcenterNo = this.scheduleData.workCenterNo; + const batchNo = this.scheduleData.batchNo; + + if (!workcenterNo) { + this.$message.error('加工中心编码不能为空'); + return false; + } + + if (!batchNo) { + this.$message.error('合约号码不能为空'); + return false; + } + + // 从配置文件获取URL并拼接参数 + const baseUrl = window.SITE_CONFIG['processDataUrl'] || 'http://10.2.1.159:3010/#/public/processData'; + const targetUrl = `${baseUrl}/${workcenterNo}/${batchNo}`; + + // 在新窗口打开 + window.open(targetUrl, '_blank'); + }, + // SOP预览相关方法 // 打开SOP预览弹出框 sopPreviewModal() { diff --git a/static/config/index-prod.js b/static/config/index-prod.js index fee941e..686854e 100644 --- a/static/config/index-prod.js +++ b/static/config/index-prod.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index-qa.js b/static/config/index-qa.js index 8051d4c..a02c0d6 100644 --- a/static/config/index-qa.js +++ b/static/config/index-qa.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index-uat.js b/static/config/index-uat.js index cff83ca..6da42e1 100644 --- a/static/config/index-uat.js +++ b/static/config/index-uat.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index.js b/static/config/index.js index de3e455..07d08d6 100644 --- a/static/config/index.js +++ b/static/config/index.js @@ -12,5 +12,7 @@ window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })();