diff --git a/cclqms-vue/src/i18n/locales/qc.cn.js b/cclqms-vue/src/i18n/locales/qc.cn.js index 7be5ad0..ffc4ca1 100644 --- a/cclqms-vue/src/i18n/locales/qc.cn.js +++ b/cclqms-vue/src/i18n/locales/qc.cn.js @@ -809,6 +809,8 @@ module.exports = { productQuantity: '产品数', edsDefectQty: '不良数', edsBatchEntryTitle: '实测值批量录入', + edsFullscreen: '全屏', + edsExitFullscreen: '退出全屏', edsMeasuredSeqArea: '实测值序号', edsTagBindHint: '扫入:各检验项新增一行该卷号;移除:各检验项删除该卷号', edsTagLabel: '标签({n})', diff --git a/cclqms-vue/src/i18n/locales/qc.en.js b/cclqms-vue/src/i18n/locales/qc.en.js index 2076f01..b539d2b 100644 --- a/cclqms-vue/src/i18n/locales/qc.en.js +++ b/cclqms-vue/src/i18n/locales/qc.en.js @@ -809,6 +809,8 @@ module.exports = { productQuantity: 'Product Quantity', edsDefectQty: 'Defect Quantity', edsBatchEntryTitle: 'Batch Entry of Measured Values', + edsFullscreen: 'Full Screen', + edsExitFullscreen: 'Exit Full Screen', edsMeasuredSeqArea: 'Measured value sequence', edsTagBindHint: 'Scan in: add the roll to every item; Remove: delete the roll from every item', edsTagLabel: 'Tag({n})', diff --git a/cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue b/cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue index ace15b9..9a25e25 100644 --- a/cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue +++ b/cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue @@ -3,6 +3,7 @@ class="eds-batch-entry-dialog" :close-on-click-modal="false" :visible.sync="dialogVisible" + :fullscreen="isFullscreen" append-to-body top="4vh" width="1380px" @@ -10,14 +11,19 @@ @closed="onClosed">
{{ $t('qc.iqcPage.edsBatchEntryTitle') }} - - {{ $t('qc.iqcPage.syncEds') }} - +
+ + {{ $t(isFullscreen ? 'qc.iqcPage.edsExitFullscreen' : 'qc.iqcPage.edsFullscreen') }} + + + {{ $t('qc.iqcPage.syncEds') }} + +
@@ -307,6 +313,7 @@ export default { }, data () { return { + isFullscreen: false, loading: false, saving: false, scanInRollNo: '', @@ -360,6 +367,7 @@ export default { watch: { visible (val) { if (val) { + this.isFullscreen = false // 打开即清空上方扫入/移除输入,避免闪现上次内容 this.scanInRollNo = '' this.removeRollNo = '' @@ -1064,11 +1072,16 @@ export default { display: flex; align-items: center; justify-content: space-between; + flex-wrap: wrap; + gap: 8px; padding-right: 40px; font-size: 16px; font-weight: 600; color: #303133; } +.eds-dialog-actions { + margin-left: auto; +} .eds-batch-body { min-height: 420px; } @@ -1197,6 +1210,34 @@ export default {