diff --git a/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue b/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue
index 3a1d99d..2669f3d 100644
--- a/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue
+++ b/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue
@@ -221,6 +221,8 @@
编辑
+
+
-
+
+
+
- | {{ stationGroup.totalQuantity*stationGroup.totalHours }} |
+ {{ stationGroup.totalHours }} |
|
@@ -109,7 +109,7 @@
{{ dateGroup.date }}
- {{ dateGroup.totalQuantity*dateGroup.totalHours }} |
+ {{ dateGroup.totalHours }} |
|
-
+
@@ -288,6 +288,11 @@ export default {
if (!date) return ''
return date.split(' ').length > 1 ? date.split(' ')[0] : date
},
+ formatProcessRouteDate(date) {
+ const formattedDate = this.formatDate(date)
+ const match = formattedDate.match(/^(\d{4})-(\d{2})-(\d{2})$/)
+ return match ? `${match[2]}-${match[3]}` : formattedDate
+ },
toProcessNumber(value) {
const num = Number(value)
return Number.isFinite(num) ? num : 0
@@ -391,6 +396,14 @@ export default {
}
return this.getProcessBaseClass(process)
},
+ getProcessRouteName(process) {
+ const name = String(process.工序名称 || '')
+ const assignee = String(process.指派对象 || '')
+ if (!assignee || name.includes(`(${assignee})`) || name.includes(`（${assignee}）`)) {
+ return name
+ }
+ return `${name}(${assignee})`
+ },
getRouteProcesses(row) {
if (Array.isArray(row.子数据) && row.子数据.length > 0) {
return row.子数据
@@ -404,6 +417,7 @@ export default {
工序名称: name,
加工状态: 0,
收检合格数: 0,
+ 计划开始时间: '',
指派对象: '',
订单行号: 0,
收料数量: 0,
@@ -417,12 +431,55 @@ export default {
}
const outsourceGroupClasses = this.getOutsourceGroupClassState(processes)
- return processes.map((process, index) => {
- const name = process.工序名称 || ''
- const className = this.getProcessClass(process, index, outsourceGroupClasses)
- const arrow = index < processes.length - 1 ? '->' : ''
- return `${this.escapeProcessHtml(name)}${arrow}`
- }).join('')
+ const maxPerRow = 8
+ const rows = Math.ceil(processes.length / maxPerRow)
+ let tableHtml = ''
+
+ for (let rowIndex = 0; rowIndex < rows; rowIndex++) {
+ const startIndex = rowIndex * maxPerRow
+ const endIndex = Math.min(startIndex + maxPerRow, processes.length)
+ const rowProcesses = processes.slice(startIndex, endIndex)
+
+ if (rowIndex > 0) {
+ tableHtml += ' |
'
+ }
+
+ tableHtml += ''
+ rowProcesses.forEach((process, index) => {
+ const className = this.getProcessClass(process, startIndex + index, outsourceGroupClasses)
+ const planDate = this.formatProcessRouteDate(process.计划开始时间 || process.计划完成时间 || '')
+ tableHtml += `| ${this.escapeProcessHtml(planDate)} | `
+ if (index < rowProcesses.length - 1) {
+ tableHtml += ' | '
+ }
+ })
+ tableHtml += '
'
+
+ tableHtml += ''
+ rowProcesses.forEach((process, index) => {
+ const className = this.getProcessClass(process, startIndex + index, outsourceGroupClasses)
+ const name = this.getProcessRouteName(process)
+ tableHtml += `| ${this.escapeProcessHtml(name)} | `
+ if (index < rowProcesses.length - 1) {
+ tableHtml += '→ | '
+ }
+ })
+ tableHtml += '
'
+
+ tableHtml += ''
+ rowProcesses.forEach((process, index) => {
+ const className = this.getProcessClass(process, startIndex + index, outsourceGroupClasses)
+ const count = this.toProcessNumber(process.收检合格数)
+ tableHtml += `| 合格${this.escapeProcessHtml(count)} | `
+ if (index < rowProcesses.length - 1) {
+ tableHtml += ' | '
+ }
+ })
+ tableHtml += '
'
+ }
+
+ tableHtml += '