代码更新:
1. 取消min-height的设定
This commit is contained in:
parent
2a52f91fd1
commit
9b415b9ecc
|
|
@ -281,7 +281,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -396,7 +396,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
工作台
|
工作台
|
||||||
</legend>
|
</legend>
|
||||||
<div class="title-div">
|
<div class="title-div">
|
||||||
<span class="title-text">Kitting备料执行</span>
|
<span class="title-text">非计划领料</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="station-div">
|
<div class="station-div">
|
||||||
<span class="station-text">工作站:</span>
|
<span class="station-text">工作站:</span>
|
||||||
|
|
@ -18,7 +18,110 @@
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<fieldset class="main-area">
|
<fieldset class="main-area">
|
||||||
<legend>
|
<legend>
|
||||||
备料执行
|
领料下发
|
||||||
|
</legend>
|
||||||
|
<el-form ref="workFormRef" :model="workFormEntity" :label-position="labelPosition"
|
||||||
|
label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
|
||||||
|
<div style="display: flex;">
|
||||||
|
<div style="display: block; margin: 5px;">
|
||||||
|
<div style="display: flex;">
|
||||||
|
<div style="display: flex; flex-direction: column;">
|
||||||
|
<div class="display-title-div">
|
||||||
|
<span class="display-title-text">料号</span>
|
||||||
|
</div>
|
||||||
|
<div class="display-form-div">
|
||||||
|
<el-input v-model="workFormEntity.goodsId" size="default" ref="goodsId"
|
||||||
|
@blur="getCurrentWorkInfo()" clearable></el-input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; flex-direction: column;">
|
||||||
|
<div class="display-title-div">
|
||||||
|
<span class="display-title-text">当前库存数量</span>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; margin-top: 20px;">
|
||||||
|
<div class="display-form-div-left">
|
||||||
|
<el-input-number v-model.number="workFormEntity.planPickNum"
|
||||||
|
controls-position="right" :min="0" width="200px" disabled />
|
||||||
|
</div>
|
||||||
|
<div class="display-form-div-right">
|
||||||
|
<span class="display-form-text-right">PC</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; flex-direction: column;">
|
||||||
|
<div class="display-title-div">
|
||||||
|
<span class="display-title-text">需要数量</span>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; margin-top: 20px;">
|
||||||
|
<div class="display-form-div-left">
|
||||||
|
<el-input-number v-model.number="workFormEntity.remainNumReal"
|
||||||
|
controls-position="right" :min="0" />
|
||||||
|
</div>
|
||||||
|
<div class="display-form-div-right">
|
||||||
|
<span class="display-form-text-right">PC</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; margin-top: 15px">
|
||||||
|
<!-- <div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 25px;">工单</span>
|
||||||
|
</div> -->
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 120px; margin: 5px; padding: 5px; background-color: #00AAE8;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 25px;">
|
||||||
|
工单#
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 400px; margin: 5px; padding: 5px; background-color: #00AAE8;">
|
||||||
|
<el-input v-model="workFormEntity.goodsId" size="default" ref="goodsId"
|
||||||
|
@blur="getCurrentWorkInfo()" clearable></el-input>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="display: flex; margin-top: 5px; margin-top: 15px">
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 160px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span
|
||||||
|
style="align-self: center; font-weight: bold;font-size: 20px;">当前进度:</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 240px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
||||||
|
{{ workFormEntity.finishedRows + '/' + workFormEntity.totalRows }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 20px;">行</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 240px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
||||||
|
{{ workFormEntity.finishedCounts + '/' + workFormEntity.totalCounts }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style="display: inline-flex; justify-content: center; width: 80px; margin: 5px; padding: 5px; background-color: #CCCCCC;">
|
||||||
|
<span style="align-self: center; font-weight: bold;font-size: 20px;">
|
||||||
|
PC
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="margin: 10px;">
|
||||||
|
<div class="arrow" @click="confirmTask()">
|
||||||
|
<span
|
||||||
|
style="margin-left: 25px; align-self: center; font-weight: bold;font-size: 45px; writing-mode: vertical-lr;">完成确认</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</el-form>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset class="main-area">
|
||||||
|
<legend>
|
||||||
|
领料确认
|
||||||
</legend>
|
</legend>
|
||||||
<el-form ref="workFormRef" :model="workFormEntity" :label-position="labelPosition"
|
<el-form ref="workFormRef" :model="workFormEntity" :label-position="labelPosition"
|
||||||
label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
|
label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
|
||||||
|
|
@ -318,7 +421,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 80px; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
@ -345,13 +448,13 @@ export default {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.el-input) {
|
.display-form-div :deep(.el-input) {
|
||||||
width: 195px;
|
width: 195px;
|
||||||
height: 130px;
|
height: 130px;
|
||||||
font-size: 25px;
|
font-size: 25px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.el-input-number) {
|
.display-form-div-left :deep(.el-input-number) {
|
||||||
width: 125px;
|
width: 125px;
|
||||||
height: 130px;
|
height: 130px;
|
||||||
font-size: 25px;
|
font-size: 25px;
|
||||||
|
|
|
||||||
|
|
@ -345,7 +345,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -287,7 +287,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -395,7 +395,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -306,7 +306,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -380,7 +380,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -189,7 +189,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
|
|
@ -381,7 +381,7 @@ export default {
|
||||||
|
|
||||||
.title-area {
|
.title-area {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 10%;
|
/* min-height: 10%; */
|
||||||
max-height: max-content;
|
max-height: max-content;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
min-width: inherit;
|
min-width: inherit;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user