Browse Source

EDS批量录入弹框修改

master
shenzhouyu 1 month ago
parent
commit
ade1e753ce
  1. 34
      cclqms-vue/src/views/modules/qc/EdsBatchEntryDialog.vue
  2. 43
      cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue
  3. 7
      cclqms-vue/src/views/modules/qc/IQCResultEntry.vue

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

@ -89,9 +89,8 @@
{{ enteredCount(group) }}/{{ group.rows.length }}
</span>
<el-button
type="success"
type="primary"
size="mini"
plain
:disabled="readonly"
@click.stop="addRowToGroup(group)">
{{ $t('qc.common.add') }}
@ -635,7 +634,7 @@ export default {
return false
})
},
/** 上方标签区回车:先校验 EDS 卷号,通过后再同步并跳下一格 */
/** 上方标签区回车:先校验 EDS 卷号,通过后同步到行、清空当前格并跳下一格 */
onTagEnter (num) {
if (this.readonly || this.tagChecking) return
const serialNo = this.tagMap[num] != null ? String(this.tagMap[num]).trim() : ''
@ -646,7 +645,9 @@ export default {
this.tagChecking = true
this.validateEdsRollNo(serialNo).then((ok) => {
if (ok) {
// 先写入各检验项对应行,再清空上方输入,避免扫码后残留
this.onTagChange(num)
this.$set(this.tagMap, num, '')
this.focusNextTag(num)
} else {
this.$set(this.tagMap, num, '')
@ -1071,7 +1072,7 @@ export default {
gap: 6px 8px;
width: 100%;
padding-right: 8px;
line-height: 1.4;
line-height: 1;
}
.item-code,
.item-name {
@ -1094,10 +1095,12 @@ export default {
gap: 4px 6px;
}
.spec-card {
display: inline-block;
display: inline-flex;
align-items: center;
justify-content: center;
padding: 0 8px;
height: 20px;
line-height: 20px;
height: 22px;
line-height: 1;
text-align: center;
border: 1px solid #dcdfe6;
border-radius: 3px;
@ -1122,8 +1125,13 @@ export default {
background: #fdf6ec;
}
.item-header .el-button--mini {
padding: 3px 8px;
display: inline-flex;
align-items: center;
justify-content: center;
height: 22px;
padding: 0 8px;
margin-left: 0;
line-height: 1;
}
.dialog-footer {
text-align: center;
@ -1138,9 +1146,9 @@ export default {
.eds-batch-entry-dialog .el-collapse-item__header {
height: auto;
min-height: 42px;
line-height: 1.4;
padding-top: 8px;
padding-bottom: 8px;
line-height: normal;
padding-top: 10px;
padding-bottom: 10px;
display: flex;
align-items: center;
flex-direction: row;
@ -1148,6 +1156,10 @@ export default {
.eds-batch-entry-dialog .el-collapse-item__arrow {
order: -1;
margin: 0 8px 0 0 !important;
line-height: 1 !important;
height: auto !important;
display: inline-flex;
align-items: center;
}
.eds-batch-entry-dialog .el-collapse-item__header > *:not(.el-collapse-item__arrow) {
order: 1;

43
cclqms-vue/src/views/modules/qc/IPQCResultEntry.vue

@ -522,23 +522,29 @@
<el-row :gutter="12" class="info-row">
<el-col :span="3">
<div class="info-item">
<label>{{ $t('qc.common.materialCode') }}</label>
<el-input v-model="detailData.partNo" disabled size="small"></el-input>
<label>{{ $t('qc.ipqcPage.workOrderNo') }}</label>
<el-input v-model="detailData.orderNo" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="3">
<div class="info-item">
<label>{{ $t('qc.iqcPage.partType') }}</label>
<el-input v-model="detailData.invdefinetype" disabled size="small"></el-input>
<label>{{ $t('qc.common.materialCode') }}</label>
<el-input v-model="detailData.partNo" disabled size="small"></el-input>
</div>
</el-col>
</el-col>
<el-col :span="6">
<div class="info-item">
<label>{{ $t('qc.iqcPage.partName') }}</label>
<el-input v-model="detailData.partDesc" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="3">
<el-col :span="2">
<div class="info-item">
<label>{{ $t('qc.iqcPage.partType') }}</label>
<el-input v-model="detailData.invdefinetype" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="2">
<div class="info-item">
<label>{{ $t('qc.iqcPage.spec') }}</label>
<el-input v-model="detailData.spec" disabled size="small"></el-input>
@ -550,7 +556,7 @@
<el-input v-model="detailData.umName" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="4">
<el-col :span="3">
<div class="info-item">
<label>
<span v-if="detailData.submitFlag === 'Y'">{{ $t('qc.iqcPage.cooperator') }}</span>
@ -568,9 +574,16 @@
<el-input v-model="detailData.responsiblePersonName" readonly size="small"></el-input>
</div>
</el-col>
</el-row>
<!-- 第二行:数量信息 -->
<el-row :gutter="12" class="info-row" style="margin-top: 12px">
<el-col :span="3">
<div class="info-item">
<label>{{ $t('qc.iqcPage.seqNo') }}</label>
<el-input v-model="detailData.seqNo" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="3">
<div class="info-item">
<label>{{ $t('qc.iqcPage.sendQty') }}</label>
@ -617,20 +630,8 @@
</div>
</el-col>
</el-row>
<el-row :gutter="12" class="info-row" style="margin-top: 12px">
<el-col :span="4">
<div class="info-item">
<label>{{ $t('qc.ipqcPage.workOrderNo') }}</label>
<el-input v-model="detailData.orderNo" disabled size="small"></el-input>
</div>
</el-col>
<el-col :span="3">
<div class="info-item">
<label>{{ $t('qc.iqcPage.seqNo') }}</label>
<el-input v-model="detailData.seqNo" disabled size="small"></el-input>
</div>
</el-col>
</el-row>
<!-- <el-row :gutter="12" class="info-row" style="margin-top: 12px">
</el-row> -->
</div>
</div>

7
cclqms-vue/src/views/modules/qc/IQCResultEntry.vue

@ -7439,9 +7439,10 @@ export default {
overflow: hidden;
}
.inspection-table /deep/ .el-table__header-wrapper th {
background: linear-gradient(135deg, #f5f7fa 0%, #e8eaed 100%);
color: #303133;
.inspection-table /deep/ .el-table__header-wrapper th,
.inspection-table /deep/ .el-table__fixed-header-wrapper th {
background: linear-gradient(135deg, #f5f7fa 0%, #e8eaed 100%) !important;
color: #303133 !important;
font-weight: 600;
font-size: 13px;
padding: 12px 0;

Loading…
Cancel
Save