diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index a0ab979..ec5ad76 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -420,6 +420,7 @@ module.exports = { lineChangeTimeRequired: '换线时间不能为空!', lineChangePersonRequired: '换线人员不能为空!', selectInspectionConclusion: '请选择检验结论!', + exceptionFix: '异常修改', selectMachine: '请选择机台!', fillSendQty: '请填写送检数量!', fillArrivalQty: '请填写到货数量!', diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index 925b56d..ece5190 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -420,6 +420,7 @@ module.exports = { lineChangeTimeRequired: 'Line change time is required!', lineChangePersonRequired: 'Line change operator is required!', selectInspectionConclusion: 'Please select inspection conclusion!', + exceptionFix: 'Exception Fix', selectMachine: 'Please select machine!', fillSendQty: 'Please enter quantity for inspection!', fillArrivalQty: 'Please enter received quantity!', diff --git a/cclqms-vue/src/utils/qcCollectedLock.js b/cclqms-vue/src/utils/qcCollectedLock.js new file mode 100644 index 0000000..46c6017 --- /dev/null +++ b/cclqms-vue/src/utils/qcCollectedLock.js @@ -0,0 +1,34 @@ +export function isCollectionFlagOn (flag) { + if (flag === true || flag === 1) return true + const value = String(flag == null ? '' : flag).trim().toUpperCase() + return value === 'Y' || value === 'TRUE' || value === '1' +} + +export function hasSubDetailData (row) { + if (!row) return false + const count = Number(row.subDetailRecordNum) + return !isNaN(count) && count > 0 +} + +export function isCollectedItemLocked (row, collectedItemMap, exceptionFixMode) { + if (exceptionFixMode) return false + if (!hasSubDetailData(row)) return false + if (isCollectionFlagOn(row.collectionFlag)) return true + if (collectedItemMap && collectedItemMap[row.itemNo]) return true + return false +} + +export function canShowExceptionFixButton (row) { + return row && (row.state === '待检验' || row.state === '待审核') +} + +export function mergeCollectedDetailFlags (detailList, collectedItemMap, vueSet) { + if (!detailList || !detailList.length || !collectedItemMap || !vueSet) return + detailList.forEach(row => { + if (isCollectionFlagOn(row.collectionFlag) && hasSubDetailData(row)) { + vueSet(collectedItemMap, row.itemNo, true) + } else if (collectedItemMap[row.itemNo] && !isCollectionFlagOn(row.collectionFlag)) { + vueSet(row, 'collectionFlag', 'Y') + } + }) +} diff --git a/cclqms-vue/src/utils/qcItemResultPersist.js b/cclqms-vue/src/utils/qcItemResultPersist.js new file mode 100644 index 0000000..a4c6284 --- /dev/null +++ b/cclqms-vue/src/utils/qcItemResultPersist.js @@ -0,0 +1,33 @@ +const APPLY_TIMER_KEY = '_itemResultApplyTimer' + +/** 结论/实测值变更后,防抖调用检验单「应用」(type=1) 落库 */ +export function scheduleSilentDetailApply (vm, debounceMs = 400) { + if (!vm || !vm.detailData || vm.detailData.submitFlag === 'Y') { + return + } + if (typeof vm.applyDetailInformationSilently !== 'function') { + return + } + if (vm[APPLY_TIMER_KEY]) { + clearTimeout(vm[APPLY_TIMER_KEY]) + } + vm[APPLY_TIMER_KEY] = setTimeout(() => { + vm[APPLY_TIMER_KEY] = null + vm.applyDetailInformationSilently() + }, debounceMs) +} + +/** 关闭弹框前立即应用,避免防抖未触发导致未落库 */ +export function flushSilentDetailApply (vm) { + if (!vm) { + return Promise.resolve() + } + if (vm[APPLY_TIMER_KEY]) { + clearTimeout(vm[APPLY_TIMER_KEY]) + vm[APPLY_TIMER_KEY] = null + } + if (typeof vm.applyDetailInformationSilently === 'function') { + return vm.applyDetailInformationSilently() + } + return Promise.resolve() +} diff --git a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue index d69a578..a5817c7 100644 --- a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue @@ -319,11 +319,12 @@ fixed="right" header-align="center" align="center" - width="130" + width="170" :label="$t('qc.common.operation')"> @@ -709,16 +710,11 @@ - @@ -972,23 +974,19 @@