|
|
|
@ -236,6 +236,7 @@ |
|
|
|
:fixed="item.fixed === '' ? false : item.fixed" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:column-key="item.columnProp" |
|
|
|
:class-name="item.columnProp === 'partDesc' ? 'proof-part-description-column' : ''" |
|
|
|
:filters="getTrackingColumnFilters(item)" |
|
|
|
:filter-multiple="false" |
|
|
|
:filtered-value="getTrackingColumnFilteredValue(item)" |
|
|
|
@ -292,6 +293,7 @@ |
|
|
|
:prop="item.actualField" |
|
|
|
:label="item.label" |
|
|
|
:width="getProcessColumnWidth(item)" |
|
|
|
class-name="proof-process-column" |
|
|
|
sortable="custom" |
|
|
|
align="center" |
|
|
|
header-align="center" |
|
|
|
@ -323,12 +325,13 @@ |
|
|
|
</template> |
|
|
|
<template v-else> |
|
|
|
<el-date-picker |
|
|
|
class="proof-process-date-picker" |
|
|
|
v-model="scope.row[item.actualField]" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="" |
|
|
|
style="width: 122px" |
|
|
|
style="width: 100px" |
|
|
|
@change="handleProcessDateChange(scope.row, item, $event)" |
|
|
|
@dblclick.native.stop="handleProcessDateDoubleClick(scope.row, item)" |
|
|
|
/> |
|
|
|
@ -2193,7 +2196,7 @@ export default { |
|
|
|
return '' |
|
|
|
}, |
|
|
|
formatImportanceDisplay (value) { |
|
|
|
return this.isImportanceChecked(value) ? '✓' : '' |
|
|
|
return this.isImportanceChecked(value) ? '❗️' : '' |
|
|
|
}, |
|
|
|
getTrackingColumnFilters (item) { |
|
|
|
if (!item || item.columnProp !== 'importance') { |
|
|
|
@ -2913,14 +2916,15 @@ export default { |
|
|
|
) |
|
|
|
// 没有数据 |
|
|
|
if (rows.length === 0) { |
|
|
|
return 110 |
|
|
|
return 118 |
|
|
|
} |
|
|
|
// 放大字号后为日期输入和完成按钮留足宽度,避免完整日期被截断。 |
|
|
|
// 有任何一个未完成 |
|
|
|
if (rows.some(row => !this.isProcessStatusComplete(row, item))) { |
|
|
|
return 134 |
|
|
|
return 140 |
|
|
|
} |
|
|
|
// 全部完成 |
|
|
|
return 110 |
|
|
|
return 118 |
|
|
|
}, |
|
|
|
isProcessColumnVisibleForRow (row, processCol) { |
|
|
|
if (!row || !processCol) { |
|
|
|
@ -6668,6 +6672,34 @@ export default { |
|
|
|
font-size: 12px; |
|
|
|
} |
|
|
|
|
|
|
|
/* 仅加粗当前主表的工序内容和物料描述,保留各自现有字号。 */ |
|
|
|
.el-table.proof-tracking-table .proof-process-column .cell, |
|
|
|
.el-table.proof-tracking-table .proof-process-date-picker .el-input__inner, |
|
|
|
.el-table.proof-tracking-table .process-date-display, |
|
|
|
.el-table.proof-tracking-table .proof-part-description-column .cell { |
|
|
|
font-weight: 700; |
|
|
|
} |
|
|
|
|
|
|
|
/* 仅放大工序日期,其他单元格、表头和按钮保持原字号。 */ |
|
|
|
.el-table.proof-tracking-table .proof-process-date-picker .el-input__inner, |
|
|
|
.el-table.proof-tracking-table .process-date-display { |
|
|
|
font-size: 14px; |
|
|
|
} |
|
|
|
|
|
|
|
/* 仅移除工序日期框的前缀图标;右侧清空按钮和日期选择功能保留。 */ |
|
|
|
.el-table.proof-tracking-table .proof-process-date-picker .el-input__prefix { |
|
|
|
display: none; |
|
|
|
} |
|
|
|
|
|
|
|
.el-table.proof-tracking-table .proof-process-date-picker { |
|
|
|
min-width: 100px; |
|
|
|
} |
|
|
|
|
|
|
|
.el-table.proof-tracking-table .proof-process-date-picker .el-input__inner { |
|
|
|
padding-left: 6px; |
|
|
|
padding-right: 20px; |
|
|
|
} |
|
|
|
|
|
|
|
.search-form { |
|
|
|
margin-bottom: 0; |
|
|
|
padding-top: 8px; |
|
|
|
@ -7082,7 +7114,7 @@ export default { |
|
|
|
min-width: 74px; |
|
|
|
text-align: center; |
|
|
|
color: #606266; |
|
|
|
margin-right: 9px; |
|
|
|
margin-right: 32px; |
|
|
|
} |
|
|
|
|
|
|
|
.process-complete-btn { |
|
|
|
|