diff --git a/src/views/modules/sampleTracking/projectProofTracking.vue b/src/views/modules/sampleTracking/projectProofTracking.vue index 85da95b..ebff8c6 100644 --- a/src/views/modules/sampleTracking/projectProofTracking.vue +++ b/src/views/modules/sampleTracking/projectProofTracking.vue @@ -289,7 +289,7 @@ @@ -332,14 +332,14 @@ - +
当前没有默认行,请点击“新增一行”后填写并保存。 @@ -1555,6 +1555,13 @@ export default { }, ensureBuProcessConfigRows () { const allCodes = this.getAllProcessCodes() + const builtinCodeMap = {} + DEFAULT_PROCESS_COLUMNS.forEach(item => { + if (item && item.code) { + builtinCodeMap[item.code] = true + } + }) + const defaultSelectedCodes = allCodes.filter(code => !!builtinCodeMap[code]) const rows = [] const usedBuMap = {} const appendRow = (buNo, buDesc, site) => { @@ -1568,22 +1575,25 @@ export default { buNo: key, buDesc: buDesc || key, processOrderCodes: allCodes.slice(), - processCodes: allCodes.slice() + // 新增默认工序默认不勾选:仅预勾选系统内置工序,自定义新增项需事业部手工勾选。 + processCodes: (defaultSelectedCodes.length > 0 ? defaultSelectedCodes : allCodes).slice() } if (cfg) { const validOrderCodes = this.getValidProcessOrderCodes(cfg.processOrderCodes) row.processOrderCodes = validOrderCodes - if (cfg.showAll === false) { - const validCodes = this.getValidProcessCodes(cfg.processCodes, validOrderCodes) - if (validCodes.length > 0 && validCodes.length < validOrderCodes.length) { - const selectedCodeMap = {} - validCodes.forEach(code => { - selectedCodeMap[code] = true - }) - row.processCodes = validOrderCodes.filter(code => selectedCodeMap[code]) - } + const validCodes = this.getValidProcessCodes(cfg.processCodes, validOrderCodes) + if (validCodes.length > 0) { + const selectedCodeMap = {} + validCodes.forEach(code => { + selectedCodeMap[code] = true + }) + row.processCodes = validOrderCodes.filter(code => selectedCodeMap[code]) } else { - row.processCodes = validOrderCodes.slice() + const defaultSelectedCodeMap = {} + row.processCodes.forEach(code => { + defaultSelectedCodeMap[code] = true + }) + row.processCodes = validOrderCodes.filter(code => defaultSelectedCodeMap[code]) } } rows.push(row)