diff --git a/MES_Manage_View_V20/src/views/AnomalousManagement/UrgentTask/index.vue b/MES_Manage_View_V20/src/views/AnomalousManagement/UrgentTask/index.vue index 92d7783..624bc69 100644 --- a/MES_Manage_View_V20/src/views/AnomalousManagement/UrgentTask/index.vue +++ b/MES_Manage_View_V20/src/views/AnomalousManagement/UrgentTask/index.vue @@ -104,7 +104,7 @@ - + @@ -289,6 +289,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 @@ -392,6 +397,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.子数据 @@ -405,6 +418,7 @@ export default { 工序名称: name, 加工状态: 0, 收检合格数: 0, + 计划开始时间: '', 指派对象: '', 订单行号: 0, 收料数量: 0, @@ -418,12 +432,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 += `` + 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 += `` + 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 += `` + if (index < rowProcesses.length - 1) { + tableHtml += '' + } + }) + tableHtml += '' + } + + tableHtml += '
${this.escapeProcessHtml(planDate)}
${this.escapeProcessHtml(name)}→
合格${this.escapeProcessHtml(count)}
' + return tableHtml }, mergeOrderData(dataList) { // 第一步：先按照订单行号对原始数据进行排序 @@ -760,11 +817,48 @@ export default { } .process-route { - line-height: 20px; + line-height: 1.4; white-space: normal; word-break: break-all; } +::v-deep .process-route-wrap { + width: 100%; + text-align: left; +} + +::v-deep .process-route-table { + width: auto; + border-collapse: collapse; + text-align: left; + table-layout: auto; +} + +::v-deep .process-route-table td { + text-align: left; + padding: 2px 2px; + font-size: 11px; + white-space: nowrap; + line-height: 1.4; +} + +::v-deep .process-route-date { + font-size: 10px !important; + color: #8899aa !important; + padding: 2px 2px !important; +} + +::v-deep .process-route-count { + font-weight: 700; + font-size: 12px !important; +} + +::v-deep .process-route-spacer td { + height: 4px; + padding: 0 !important; + line-height: 1 !important; +} + ::v-deep .process-route-green { color: #28d961; font-weight: 700; @@ -781,8 +875,16 @@ export default { } ::v-deep .process-route-arrow { - margin: 0 4px; - color: #909399; + color: rgba(0, 164, 255, 0.6) !important; + font-size: 10px !important; + padding: 2px 0 !important; + width: 8px; + text-align: center !important; +} + +::v-deep .process-route-arrow-hidden { + padding: 2px 0 !important; + width: 8px; } .search-container { @@ -858,4 +960,7 @@ export default { display: flex; align-items: center; } +.el-table tr{ + background-color: initial; +} diff --git a/MES_Manage_View_V20/src/views/PlanManagement/InstallMakePlanDone/index.vue b/MES_Manage_View_V20/src/views/PlanManagement/InstallMakePlanDone/index.vue new file mode 100644 index 0000000..2509561 --- /dev/null +++ b/MES_Manage_View_V20/src/views/PlanManagement/InstallMakePlanDone/index.vue @@ -0,0 +1,1394 @@ + + + + + + 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 2669f3d..d69c6cd 100644 --- a/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue +++ b/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlando/index.vue @@ -213,7 +213,7 @@ - + diff --git a/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlandone/index.vue b/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlandone/index.vue index 5b70eaf..431ee22 100644 --- a/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlandone/index.vue +++ b/MES_Manage_View_V20/src/views/PlanManagement/SelfMakePlandone/index.vue @@ -180,7 +180,7 @@ @click="getitemdata(scope.row.订单号)">查看 - +