diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index c46560d..f05a08c 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -445,6 +445,7 @@ module.exports = { dataCollectSuccess: '数据采集成功', dataCollectNoEquipment: '未找到开始检验时选择的设备,请先开始检验并选择设备!', dataCollectSelectEquipment: '请至少选择一台要采集的设备!', + dataCollectSelectMode: '请为已开启采集的设备选择累计采集或删除后采集!', dataCollectNewBatchConfirm: '检测到设备有新批次数据,是否继续采集?', reloadSheetsFirst: '请勾选要重载的检验单!', confirmReloadN: '是否重载该 {n} 条检验单?', @@ -678,6 +679,8 @@ module.exports = { dataCollectEquipmentTitle: '数据采集设备', equipmentType: '设备类型', whetherCollect: '是否采集', + accumulateCollect: '累计采集', + deleteAfterCollect: '删除后采集', apply: '应用', fileList: '文件清单', qcFileTab: 'QC检验文件', diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index 236936f..8179c94 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -445,6 +445,7 @@ module.exports = { dataCollectSuccess: 'Data collected', dataCollectNoEquipment: 'No equipment found from start inspection. Please start inspection and select equipment first!', dataCollectSelectEquipment: 'Please select at least one equipment to collect!', + dataCollectSelectMode: 'Please choose Accumulate or Delete-then-collect for each selected equipment!', dataCollectNewBatchConfirm: 'New batch data detected for equipment. Continue collection?', reloadSheetsFirst: 'Select inspection sheet(s) to reload!', confirmReloadN: 'Reload {n} inspection sheet(s)?', @@ -678,6 +679,8 @@ module.exports = { dataCollectEquipmentTitle: 'Data collection equipment', equipmentType: 'Equipment type', whetherCollect: 'Collect', + accumulateCollect: 'Accumulate', + deleteAfterCollect: 'Delete then collect', apply: 'Apply', fileList: 'File list', qcFileTab: 'QC files', diff --git a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue index 885b597..6931a7f 100644 --- a/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/FQCResultEntry.vue @@ -1402,17 +1402,20 @@ detailData: { deep: true, handler: function (newV, oldV) { - this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty + const samplingQty = this.toQty(this.detailData.samplingQty) + const passQty = this.toQty(this.detailData.passQty) + const rollQty = this.toQty(this.detailData.rollQty) + this.detailData.notPassQty = samplingQty - passQty if (this.detailData.inspectionResult === '不合格') { if (this.detailData.disposalMeasures === '让步接收' || this.detailData.disposalMeasures === '') { - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } else if (this.detailData.disposalMeasures === '挑选使用') { - this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty + this.detailData.batchQualifiedQty = rollQty - this.toQty(this.detailData.notPassQty) } else { this.detailData.batchQualifiedQty = 0 } } else { - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } } }, @@ -3259,6 +3262,12 @@ qcPrint(this.FAISelections) }, + /** 数量空值/非法值参与计算时按 0 */ + toQty (val) { + if (val === null || val === undefined || val === '') return 0 + const n = Number(val) + return isNaN(n) ? 0 : n + }, // 数据采集 dataAcquisition () { this.dataAcquisitionDialogVisible = true @@ -6035,8 +6044,8 @@ .latest-parse-time { color: #67c23a; - font-size: 13px; - font-weight: 600; + font-size: 11px; + font-weight: 500; white-space: nowrap; margin-left: 12px; display: inline-flex; @@ -6046,11 +6055,11 @@ .latest-parse-time::before { content: ''; display: inline-block; - width: 8px; - height: 8px; + width: 6px; + height: 6px; border-radius: 50%; background-color: #67c23a; - margin-right: 6px; + margin-right: 5px; flex-shrink: 0; } diff --git a/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue index d5970c1..f944807 100644 --- a/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue @@ -1629,17 +1629,20 @@ detailData: { deep: true, handler: function (newV, oldV) { - this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty + const samplingQty = this.toQty(this.detailData.samplingQty) + const passQty = this.toQty(this.detailData.passQty) + const rollQty = this.toQty(this.detailData.rollQty) + this.detailData.notPassQty = samplingQty - passQty if (this.detailData.inspectionResult === '不合格') { if (this.detailData.disposalMeasures === '让步接收') { - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } else if (this.detailData.disposalMeasures === '返工返修' || this.detailData.disposalMeasures === '拒收退回') { this.detailData.batchQualifiedQty = 0 } else if (this.detailData.disposalMeasures === '挑选使用') { - this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty + this.detailData.batchQualifiedQty = rollQty - this.toQty(this.detailData.notPassQty) } } else if (this.detailData.inspectionResult === '合格'){ - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } // this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty // if (this.detailData.inspectionResult === '不合格') { @@ -3560,6 +3563,12 @@ qcPrint(this.IPQCSelections) }, + /** 数量空值/非法值参与计算时按 0 */ + toQty (val) { + if (val === null || val === undefined || val === '') return 0 + const n = Number(val) + return isNaN(n) ? 0 : n + }, // 数据采集 dataAcquisition () { this.dataAcquisitionDialogVisible = true @@ -6515,8 +6524,8 @@ .latest-parse-time { color: #67c23a; - font-size: 13px; - font-weight: 600; + font-size: 11px; + font-weight: 500; white-space: nowrap; margin-left: 12px; display: inline-flex; @@ -6526,11 +6535,11 @@ .latest-parse-time::before { content: ''; display: inline-block; - width: 8px; - height: 8px; + width: 6px; + height: 6px; border-radius: 50%; background-color: #67c23a; - margin-right: 6px; + margin-right: 5px; flex-shrink: 0; } diff --git a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue index af6ce94..f14cf9c 100644 --- a/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/IQCResultEntry.vue @@ -1577,15 +1577,17 @@ export default { .sort((a, b) => (a.sortLv || 0) - (b.sortLv || 0)) }, }, - watch: { + watch: { detailData: { deep: true, handler: function (newV, oldV) { - this.detailData.notPassQty = - this.detailData.samplingQty - this.detailData.passQty + const samplingQty = this.toQty(this.detailData.samplingQty) + const passQty = this.toQty(this.detailData.passQty) + const rollQty = this.toQty(this.detailData.rollQty) + this.detailData.notPassQty = samplingQty - passQty if (this.detailData.inspectionResult === '不合格') { if (this.detailData.disposalMeasures === '让步接收') { - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } else if ( this.detailData.disposalMeasures === '返工返修' || this.detailData.disposalMeasures === '拒收退回' @@ -1593,10 +1595,10 @@ export default { this.detailData.batchQualifiedQty = 0 } else if (this.detailData.disposalMeasures === '挑选使用') { this.detailData.batchQualifiedQty = - this.detailData.rollQty - this.detailData.notPassQty + rollQty - this.toQty(this.detailData.notPassQty) } } else if (this.detailData.inspectionResult === '合格') { - this.detailData.batchQualifiedQty = this.detailData.rollQty + this.detailData.batchQualifiedQty = rollQty } }, }, @@ -3699,17 +3701,23 @@ export default { } }, noBatchQualifiedQtyChange() { - if (this.detailData.noBatchQualifiedQty > this.detailData.rollQty) { + const rollQty = this.toQty(this.detailData.rollQty) + const noBatchQualifiedQty = this.toQty(this.detailData.noBatchQualifiedQty) + if (noBatchQualifiedQty > rollQty) { // 恢复原值 this.detailData.noBatchQualifiedQty = - this.detailData.rollQty - this.detailData.batchQualifiedQty + rollQty - this.toQty(this.detailData.batchQualifiedQty) this.$message.warning(this.$t('qc.entry.batchNgGtIncoming')) return false } - // 给合格数量赋值 - let newValue = - this.detailData.rollQty - this.detailData.noBatchQualifiedQty - this.$set(this.detailData, 'batchQualifiedQty', newValue) + // 给合格数量赋值(未填按 0 参与计算) + this.$set(this.detailData, 'batchQualifiedQty', rollQty - noBatchQualifiedQty) + }, + /** 数量空值/非法值参与计算时按 0 */ + toQty (val) { + if (val === null || val === undefined || val === '') return 0 + const n = Number(val) + return isNaN(n) ? 0 : n }, // 数据采集 dataAcquisition () { @@ -5035,8 +5043,9 @@ export default { this.detailData.notPassQty = row.notPassQty } this.detailData.batchQualifiedQty = row.batchQualifiedQty - // 给批次不合格数量赋值 - this.detailData.noBatchQualifiedQty = this.detailData.notPassQty + // 给批次不合格数量赋值(空值按 0,并据此重算批次合格数) + this.detailData.noBatchQualifiedQty = this.toQty(this.detailData.notPassQty) + this.noBatchQualifiedQtyChange() this.getInspectionFormData() this.detailInformationFlag = true }, @@ -6914,8 +6923,8 @@ export default { .latest-parse-time { color: #67c23a; - font-size: 13px; - font-weight: 600; + font-size: 11px; + font-weight: 500; white-space: nowrap; margin-left: 12px; display: inline-flex; @@ -6925,11 +6934,11 @@ export default { .latest-parse-time::before { content: ''; display: inline-block; - width: 8px; - height: 8px; + width: 6px; + height: 6px; border-radius: 50%; background-color: #67c23a; - margin-right: 6px; + margin-right: 5px; flex-shrink: 0; } diff --git a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue index 3dae9c8..583e801 100644 --- a/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue +++ b/cclqms-vue/src/views/modules/qc/OQCResultEntry.vue @@ -1460,7 +1460,9 @@ detailData: { deep: true, handler: function (newV, oldV) { - this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty + const samplingQty = this.toQty(this.detailData.samplingQty) + const passQty = this.toQty(this.detailData.passQty) + this.detailData.notPassQty = samplingQty - passQty } }, detailList: { @@ -3109,6 +3111,12 @@ this.detailData.passQty = 0 } }, + /** 数量空值/非法值参与计算时按 0 */ + toQty (val) { + if (val === null || val === undefined || val === '') return 0 + const n = Number(val) + return isNaN(n) ? 0 : n + }, // 数据采集 dataAcquisition () { this.dataAcquisitionDialogVisible = true @@ -6130,8 +6138,8 @@ .latest-parse-time { color: #67c23a; - font-size: 13px; - font-weight: 600; + font-size: 11px; + font-weight: 500; white-space: nowrap; margin-left: 12px; display: inline-flex; @@ -6141,11 +6149,11 @@ .latest-parse-time::before { content: ''; display: inline-block; - width: 8px; - height: 8px; + width: 6px; + height: 6px; border-radius: 50%; background-color: #67c23a; - margin-right: 6px; + margin-right: 5px; flex-shrink: 0; } diff --git a/cclqms-vue/src/views/modules/qc/QcDataAcquisitionDialog.vue b/cclqms-vue/src/views/modules/qc/QcDataAcquisitionDialog.vue index 30d6baf..6b3382b 100644 --- a/cclqms-vue/src/views/modules/qc/QcDataAcquisitionDialog.vue +++ b/cclqms-vue/src/views/modules/qc/QcDataAcquisitionDialog.vue @@ -2,7 +2,7 @@ @@ -17,7 +17,7 @@ :label="$t('qc.iqcPage.equipmentType')" header-align="center" align="left" - min-width="240" + min-width="180" show-overflow-tooltip>