diff --git a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue index 986deb6..b08255a 100644 --- a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue @@ -86,6 +86,13 @@ + + + + + + + @@ -1319,6 +1326,7 @@ + { + if (data && data.code === 0) { + this.operationDescList = data.rows || [] + } + }) + }, // 计算表格高度 calculateTableHeight() { this.$nextTick(() => { @@ -3081,6 +3123,8 @@ customerName: '', inspectionResult: '', disposalMeasures: '', + spec: '', + operationDesc: '', states: [] }; this.getDataList(); @@ -5121,7 +5165,7 @@ return columns } const props = columns.map(item => item.columnProp) - if (props.includes('releaseNo') && props.includes('lineNo')) { + if (props.includes('releaseNo') && props.includes('lineNo') && props.includes('operationDesc')) { return columns } const baseColumn = columns[0] || {} @@ -5150,6 +5194,14 @@ columnLabel: '行号', columnWidth: 80, } + const operationCol = { + ...releaseCol, + serialNumber: (baseColumn.tableId || '301017Table1') + 'OperationDesc', + columnProp: 'operationDesc', + columnLabel: '工序', + align: 'left', + columnWidth: 120, + } const result = [...columns] let insertIdx = result.findIndex(item => item.columnProp === 'poOrderNo') if (insertIdx < 0) { @@ -5165,6 +5217,10 @@ const lineIdx = result.findIndex(item => item.columnProp === 'lineNo') result.splice(lineIdx >= 0 ? lineIdx : insertIdx + 1, 0, releaseCol) } + if (!props.includes('operationDesc')) { + const lineIdx = result.findIndex(item => item.columnProp === 'lineNo') + result.splice(lineIdx >= 0 ? lineIdx + 1 : insertIdx + 2, 0, operationCol) + } return result }, diff --git a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue index 4ff2803..9e9847c 100644 --- a/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue +++ b/cclqms-vue/src/views/modules/qc/qcPartAttribute.vue @@ -782,21 +782,27 @@ + :label="$t('qc.partAttributePage.samplingProgramme')" min-width="180" + :show-overflow-tooltip="!editQcSpecBatchVisible"> + :label="$t('qc.partAttributePage.samplingLevel')" min-width="180" + :show-overflow-tooltip="!editQcSpecBatchVisible"> @@ -977,6 +983,8 @@ + {{ scope.row.itemDesc }} + + + + + + + {{ i.sitename }} + + {{ i.buDesc }} + + + + @@ -2677,6 +2712,7 @@ export default { fileCollectItemList: [], fileCollectItemSelections: [], fileCollectExcludeItemNos: [], + fileCollectItemBuKey: '', fileCollectItemQuery: { site: '', buNo: '', @@ -3957,9 +3993,29 @@ export default { openFileCollectItemPicker(row) { if (!this.partCurrentRow.partNo || !row) return this.fileCollectPickerRow = row + const preferredBuNo = row.buNo || this.partCurrentRow.buNo || '' + const preferredSite = this.partCurrentRow.site || '' + // buList.buNo 本身已是 site_bu（如 41_Flexo） + const preferredKey = + preferredBuNo.indexOf('_') >= 0 + ? preferredBuNo + : preferredBuNo + ? `${preferredSite}_${preferredBuNo}` + : '' + const matchedBu = + (this.buList || []).find((i) => i.buNo === preferredKey) || + (this.buList || []).find((i) => this.parseBuNo(i.buNo) === preferredBuNo) || + null + const buKey = matchedBu + ? matchedBu.buNo + : preferredKey || (this.buList.length > 0 ? this.buList[0].buNo : '') + const site = matchedBu + ? matchedBu.site + : preferredSite || (this.buList.length > 0 ? this.buList[0].site : '') + this.fileCollectItemBuKey = buKey this.fileCollectItemQuery = { - site: this.partCurrentRow.site, - buNo: this.partCurrentRow.buNo, + site: site, + buNo: this.parseBuNo(buKey) || preferredBuNo, inspectionTypeNo: '105', itemNo: '', itemDesc: '', @@ -3975,6 +4031,27 @@ export default { this.searchFileCollectItem() }) }, + onFileCollectItemBuChange(val) { + if (!val) { + this.fileCollectItemQuery.buNo = '' + return + } + const matched = (this.buList || []).find((i) => i.buNo === val) + if (matched) { + this.fileCollectItemQuery.site = matched.site + this.fileCollectItemQuery.buNo = this.parseBuNo(matched.buNo) + } else { + this.fileCollectItemQuery.buNo = this.parseBuNo(val) + } + }, + openFileCollectOperationPicker(row) { + if (!this.editFileCollectBatchVisible || !row) return + this.openQcSpecLinkedOperationPicker(row) + }, + clearFileCollectOperation(row) { + if (!row) return + row.operation = '' + }, loadFileCollectExcludeItemNos() { const currentItemNo = ((this.fileCollectPickerRow && this.fileCollectPickerRow.itemNo) || '').trim() return qcPartFileCollectSearch({ @@ -9137,6 +9214,23 @@ export default { } } +.qc-spec-cell-picker { + display: flex; + align-items: center; + width: 100%; + gap: 4px; +} + +.qc-spec-cell-picker-btn { + flex-shrink: 0; + padding: 3px 4px; +} + +.qc-spec-cell-picker-input { + flex: 1; + min-width: 0; +} + .qc-spec-table ::v-deep .qc-spec-row-draggable { cursor: move; }