From 9b415b9ecc0f9f06a24131772e4989140668c380 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 2 Sep 2024 13:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E5=8F=96=E6=B6=88min-height=E7=9A=84=E8=AE=BE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/callEmptyVehicle.vue |   2 +-
 src/layout/clcKanban.vue        |   2 +-
 src/layout/clcNoPlan.vue        | 113 ++++++++++++++++++++++++++++++--
 src/layout/dbsTable.vue         |   2 +-
 src/layout/doKitting.vue        |   2 +-
 src/layout/eLocationConfig.vue  |   2 +-
 src/layout/finishKitting.vue    |   2 +-
 src/layout/goods.vue            |   2 +-
 src/layout/goodsIn.vue          |   2 +-
 src/layout/goodsToStation.vue   |   2 +-
 src/layout/inventory.vue        |   2 +-
 src/layout/kateOrdersTable.vue  |   2 +-
 src/layout/pickTaskMonitor.vue  |   2 +-
 src/layout/sortBoxs.vue         |   2 +-
 src/layout/standSettings.vue    |   2 +-
 src/layout/stationConfig.vue    |   2 +-
 src/layout/uploadDbs.vue        |   2 +-
 src/layout/uploadOrders.vue     |   2 +-
 src/layout/workFlow.vue         |   2 +-
 src/layout/workSummary.vue      |   2 +-
 20 files changed, 127 insertions(+), 24 deletions(-)

diff --git a/src/layout/callEmptyVehicle.vue b/src/layout/callEmptyVehicle.vue
index 302802a..ae6c645 100644
--- a/src/layout/callEmptyVehicle.vue
+++ b/src/layout/callEmptyVehicle.vue
@@ -281,7 +281,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/clcKanban.vue b/src/layout/clcKanban.vue
index c349af8..3a4772a 100644
--- a/src/layout/clcKanban.vue
+++ b/src/layout/clcKanban.vue
@@ -396,7 +396,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue
index 022c2fd..9b64d8f 100644
--- a/src/layout/clcNoPlan.vue
+++ b/src/layout/clcNoPlan.vue
@@ -7,7 +7,7 @@
                         工作台
                     </legend>
                     <div class="title-div">
-                        <span class="title-text">Kitting备料执行</span>
+                        <span class="title-text">非计划领料</span>
                     </div>
                     <div class="station-div">
                         <span class="station-text">工作站：</span>
@@ -18,7 +18,110 @@
                 </fieldset>
                 <fieldset class="main-area">
                     <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>
                     <el-form ref="workFormRef" :model="workFormEntity" :label-position="labelPosition"
                         label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
@@ -318,7 +421,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 80px; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
@@ -345,13 +448,13 @@ export default {
     cursor: pointer;
 }
 
-:deep(.el-input) {
+.display-form-div :deep(.el-input) {
     width: 195px;
     height: 130px;
     font-size: 25px;
 }
 
-:deep(.el-input-number) {
+.display-form-div-left :deep(.el-input-number) {
     width: 125px;
     height: 130px;
     font-size: 25px;
diff --git a/src/layout/dbsTable.vue b/src/layout/dbsTable.vue
index 3e2d1c9..a309104 100644
--- a/src/layout/dbsTable.vue
+++ b/src/layout/dbsTable.vue
@@ -345,7 +345,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index 9d4ee26..cf09bb5 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -321,7 +321,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/eLocationConfig.vue b/src/layout/eLocationConfig.vue
index 0981463..a6f1b90 100644
--- a/src/layout/eLocationConfig.vue
+++ b/src/layout/eLocationConfig.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/finishKitting.vue b/src/layout/finishKitting.vue
index e2cca13..42c896a 100644
--- a/src/layout/finishKitting.vue
+++ b/src/layout/finishKitting.vue
@@ -287,7 +287,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/goods.vue b/src/layout/goods.vue
index 66510a8..0b135f4 100644
--- a/src/layout/goods.vue
+++ b/src/layout/goods.vue
@@ -395,7 +395,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue
index 0b7cff8..c70f0e9 100644
--- a/src/layout/goodsIn.vue
+++ b/src/layout/goodsIn.vue
@@ -266,7 +266,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/goodsToStation.vue b/src/layout/goodsToStation.vue
index 0981463..a6f1b90 100644
--- a/src/layout/goodsToStation.vue
+++ b/src/layout/goodsToStation.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/inventory.vue b/src/layout/inventory.vue
index 3a32f2a..c772a4f 100644
--- a/src/layout/inventory.vue
+++ b/src/layout/inventory.vue
@@ -258,7 +258,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/kateOrdersTable.vue b/src/layout/kateOrdersTable.vue
index e8a03c1..e3435a0 100644
--- a/src/layout/kateOrdersTable.vue
+++ b/src/layout/kateOrdersTable.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/pickTaskMonitor.vue b/src/layout/pickTaskMonitor.vue
index e14d585..d167fe0 100644
--- a/src/layout/pickTaskMonitor.vue
+++ b/src/layout/pickTaskMonitor.vue
@@ -306,7 +306,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 7112d76..ad156aa 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -168,7 +168,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/standSettings.vue b/src/layout/standSettings.vue
index 0981463..a6f1b90 100644
--- a/src/layout/standSettings.vue
+++ b/src/layout/standSettings.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/stationConfig.vue b/src/layout/stationConfig.vue
index 50f4b33..126262d 100644
--- a/src/layout/stationConfig.vue
+++ b/src/layout/stationConfig.vue
@@ -380,7 +380,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/uploadDbs.vue b/src/layout/uploadDbs.vue
index 00d7c10..cad3612 100644
--- a/src/layout/uploadDbs.vue
+++ b/src/layout/uploadDbs.vue
@@ -187,7 +187,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/uploadOrders.vue b/src/layout/uploadOrders.vue
index 077ad7f..1ee37ab 100644
--- a/src/layout/uploadOrders.vue
+++ b/src/layout/uploadOrders.vue
@@ -189,7 +189,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
index 0981463..a6f1b90 100644
--- a/src/layout/workFlow.vue
+++ b/src/layout/workFlow.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;
diff --git a/src/layout/workSummary.vue b/src/layout/workSummary.vue
index 0981463..a6f1b90 100644
--- a/src/layout/workSummary.vue
+++ b/src/layout/workSummary.vue
@@ -381,7 +381,7 @@ export default {
 
 .title-area {
     display: flex;
-    min-height: 10%;
+    /* min-height: 10%; */
     max-height: max-content;
     margin-bottom: 10px;
     min-width: inherit;