Browse Source

EDS批量录入添加全屏按钮

master
shenzhouyu 3 days ago
parent
commit
31d0d0534f
  1. 2
      cclqms-vue/src/i18n/locales/qc.cn.js
  2. 2
      cclqms-vue/src/i18n/locales/qc.en.js
  3. 57
      cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue

2
cclqms-vue/src/i18n/locales/qc.cn.js

@ -809,6 +809,8 @@ module.exports = {
productQuantity: '产品数', productQuantity: '产品数',
edsDefectQty: '不良数', edsDefectQty: '不良数',
edsBatchEntryTitle: '实测值批量录入', edsBatchEntryTitle: '实测值批量录入',
edsFullscreen: '全屏',
edsExitFullscreen: '退出全屏',
edsMeasuredSeqArea: '实测值序号', edsMeasuredSeqArea: '实测值序号',
edsTagBindHint: '扫入:各检验项新增一行该卷号;移除:各检验项删除该卷号', edsTagBindHint: '扫入:各检验项新增一行该卷号;移除:各检验项删除该卷号',
edsTagLabel: '标签({n})', edsTagLabel: '标签({n})',

2
cclqms-vue/src/i18n/locales/qc.en.js

@ -809,6 +809,8 @@ module.exports = {
productQuantity: 'Product Quantity', productQuantity: 'Product Quantity',
edsDefectQty: 'Defect Quantity', edsDefectQty: 'Defect Quantity',
edsBatchEntryTitle: 'Batch Entry of Measured Values', edsBatchEntryTitle: 'Batch Entry of Measured Values',
edsFullscreen: 'Full Screen',
edsExitFullscreen: 'Exit Full Screen',
edsMeasuredSeqArea: 'Measured value sequence', edsMeasuredSeqArea: 'Measured value sequence',
edsTagBindHint: 'Scan in: add the roll to every item; Remove: delete the roll from every item', edsTagBindHint: 'Scan in: add the roll to every item; Remove: delete the roll from every item',
edsTagLabel: 'Tag({n})', edsTagLabel: 'Tag({n})',

57
cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue

@ -3,6 +3,7 @@
class="eds-batch-entry-dialog" class="eds-batch-entry-dialog"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
:fullscreen="isFullscreen"
append-to-body append-to-body
top="4vh" top="4vh"
width="1380px" width="1380px"
@ -10,14 +11,19 @@
@closed="onClosed"> @closed="onClosed">
<div slot="title" class="eds-dialog-title"> <div slot="title" class="eds-dialog-title">
<span>{{ $t('qc.iqcPage.edsBatchEntryTitle') }}</span> <span>{{ $t('qc.iqcPage.edsBatchEntryTitle') }}</span>
<el-button
size="mini"
type="warning"
:loading="syncEdsLoading || saving"
:disabled="readonly || loading || tagChecking"
@click="handleSyncEds">
{{ $t('qc.iqcPage.syncEds') }}
</el-button>
<div class="eds-dialog-actions">
<el-button size="mini" @click="isFullscreen = !isFullscreen">
{{ $t(isFullscreen ? 'qc.iqcPage.edsExitFullscreen' : 'qc.iqcPage.edsFullscreen') }}
</el-button>
<el-button
size="mini"
type="warning"
:loading="syncEdsLoading || saving"
:disabled="readonly || loading || tagChecking"
@click="handleSyncEds">
{{ $t('qc.iqcPage.syncEds') }}
</el-button>
</div>
</div> </div>
<div v-loading="loading" class="eds-batch-body"> <div v-loading="loading" class="eds-batch-body">
<!-- 实测值序号:扫入 / 移除标签号 --> <!-- 实测值序号:扫入 / 移除标签号 -->
@ -307,6 +313,7 @@ export default {
}, },
data () { data () {
return { return {
isFullscreen: false,
loading: false, loading: false,
saving: false, saving: false,
scanInRollNo: '', scanInRollNo: '',
@ -360,6 +367,7 @@ export default {
watch: { watch: {
visible (val) { visible (val) {
if (val) { if (val) {
this.isFullscreen = false
// 打开即清空上方扫入/移除输入,避免闪现上次内容 // 打开即清空上方扫入/移除输入,避免闪现上次内容
this.scanInRollNo = '' this.scanInRollNo = ''
this.removeRollNo = '' this.removeRollNo = ''
@ -1064,11 +1072,16 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap;
gap: 8px;
padding-right: 40px; padding-right: 40px;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
color: #303133; color: #303133;
} }
.eds-dialog-actions {
margin-left: auto;
}
.eds-batch-body { .eds-batch-body {
min-height: 420px; min-height: 420px;
} }
@ -1197,6 +1210,34 @@ export default {
</style> </style>
<style> <style>
.eds-batch-entry-dialog > .el-dialog {
max-width: calc(100% - 24px);
}
.eds-batch-entry-dialog > .el-dialog.is-fullscreen {
display: flex;
flex-direction: column;
max-width: 100%;
overflow: hidden;
}
.eds-batch-entry-dialog > .is-fullscreen > .el-dialog__header,
.eds-batch-entry-dialog > .is-fullscreen > .el-dialog__footer {
flex-shrink: 0;
}
.eds-batch-entry-dialog > .is-fullscreen > .el-dialog__body,
.eds-batch-entry-dialog > .is-fullscreen .eds-batch-body {
display: flex;
flex: 1;
flex-direction: column;
min-height: 0;
}
.eds-batch-entry-dialog > .is-fullscreen .tag-bind-section,
.eds-batch-entry-dialog > .is-fullscreen .toolbar {
flex-shrink: 0;
}
.eds-batch-entry-dialog > .is-fullscreen .item-collapse {
min-height: 0;
max-height: none;
}
.eds-batch-entry-dialog .el-dialog__body { .eds-batch-entry-dialog .el-dialog__body {
padding: 12px 16px 8px; padding: 12px 16px 8px;
} }

Loading…
Cancel
Save