From 9eeb6d731a951e5f93f1a4970cad32824c112ef8 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Mon, 23 Sep 2024 19:07:34 +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=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE-?=
 =?UTF-8?q?->=E5=B1=85=E4=B8=AD=202.=20=E6=95=B4=E7=90=86=E7=9B=92?=
 =?UTF-8?q?=E5=AD=90=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9=203.=20=E9=9D=9E?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A2=86=E6=96=99=E4=BF=AE=E6=94=B9=204.=20?=
 =?UTF-8?q?=E6=96=99=E7=AE=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/clcNoPlan.vue     |  7 ++++++-
 src/layout/finishKitting.vue |  3 +++
 src/layout/goods.vue         | 26 ++++++++++++++++++++++----
 src/layout/sortBoxs.vue      |  4 ++--
 src/layout/vehicle.vue       | 12 ++++++------
 src/utils/formatter.js       |  6 ++++--
 src/views/login.vue          |  2 +-
 7 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue
index e2cc5fa..5c25108 100644
--- a/src/layout/clcNoPlan.vue
+++ b/src/layout/clcNoPlan.vue
@@ -157,7 +157,7 @@
                                         <div style="display: flex; margin-top: 20px;">
                                             <div class="display-form-div-left">
                                                 <el-input-number v-model.number="confirmFormEntity.realPickNum"
-                                                    ref="confirmRealPickNum" controls-position="right" :min="0" />
+                                                    ref="confirmRealPickNum" v-on:keyup.enter="getCurrentGoodsPickNumMethod()" controls-position="right" :min="0" />
                                             </div>
                                             <div class="display-form-div-right">
                                                 <span class="display-form-text-right">PC</span>
@@ -196,6 +196,7 @@
 <script setup>
 import store from '@/store'
 import { clcNoPlan, clcNoPlanConfirmBack } from '@/api/task'
+import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
 import { errorBox } from '@/utils/myMessageBox.js'
 import { getStockNumByGoodsId } from '@/api/stock'
 import { reactive, ref } from 'vue'
@@ -259,14 +260,18 @@ export default {
             })
         },
         getCurrentGoodsPickNumMethod() {
+            this.confirmFormEntity.vehicleId = replaceEnglishAndNumberIGAI(this.confirmFormEntity.vehicleId)
             if (this.confirmFormEntity.vehicleId == '' || this.confirmFormEntity.vehicleId == null|undefined) {
                 this.$refs.confirmVehicleId.focus()
+                return
             }
             if (this.confirmFormEntity.goodsId == '' || this.confirmFormEntity.goodsId == null|undefined) {
                 this.$refs.confirmGoodsId.focus()
+                return
             }
             if (this.confirmFormEntity.realPickNum == null | undefined) {
                 this.$refs.confirmRealPickNum.focus()
+                return
             }
         },
         // 重置参数
diff --git a/src/layout/finishKitting.vue b/src/layout/finishKitting.vue
index 9e7b759..167489f 100644
--- a/src/layout/finishKitting.vue
+++ b/src/layout/finishKitting.vue
@@ -111,6 +111,7 @@
                     </el-form>
                 </fieldset>
                 <div style="width: 0;height: 0;overflow: hidden">
+                    <!-- <div> -->
                     <div id="printArea" class="objectDialogFlowPrint">
                         <!-- <div class="myPrint"> -->
                         <div class="pageWarp" v-for="item in printTabs">
@@ -447,11 +448,13 @@ export default {
     margin: 5px;
     width: 50%;
     border-right: #156082 dashed 1px;
+    align-content: center;
 }
 
 .print-tab-right {
     margin: 5px;
     width: 50%;
+    align-content: center;
 }
 
 .print-disp {
diff --git a/src/layout/goods.vue b/src/layout/goods.vue
index 8d4e3d3..9b46039 100644
--- a/src/layout/goods.vue
+++ b/src/layout/goods.vue
@@ -37,6 +37,8 @@
                 <el-table-column prop="goodsInVehicleType" label="料箱类型2" min-width="120px" />
                 <el-table-column prop="feedingType" label="补料方式" min-width="120px" />
                 <el-table-column prop="feedingValue" label="补货点" min-width="120px" />
+                <el-table-column prop="heat" label="热度" min-width="120px" />
+                <el-table-column prop="releasePoint" label="卸货点" min-width="120px" />
                 <el-table-column prop="dataSource" label="数据来源" min-width="120px" />
                 <el-table-column prop="lastUpdateTime" label="最近更新时间" :formatter="timeFormat" min-width="120px" />
                 <el-table-column prop="lastUpdateUser" label="最近更新用户" min-width="120px" />
@@ -121,13 +123,13 @@
                         </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
-                                <el-form-item label="料箱类型描述" prop="vehicleTypeDescription">
-                                    <el-input v-model="goodsFormEntity.vehicleTypeDescription" clearable />
+                                <el-form-item label="热度" prop="heat">
+                                    <el-input v-model="goodsFormEntity.heat" clearable />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="料箱类型2" prop="goodsInVehicleType">
-                                    <el-input v-model="goodsFormEntity.goodsInVehicleType" clearable />
+                                <el-form-item label="卸货点" prop="releasePoint">
+                                    <el-input v-model="goodsFormEntity.releasePoint" clearable />
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -144,6 +146,18 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
+                        <el-row :gutter="16">
+                            <el-col :span="12" :offset="0">
+                                <el-form-item label="料箱类型描述" prop="vehicleTypeDescription">
+                                    <el-input v-model="goodsFormEntity.vehicleTypeDescription" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="料箱类型2" prop="goodsInVehicleType">
+                                    <el-input v-model="goodsFormEntity.goodsInVehicleType" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                         <el-row :gutter="16">
                             <el-col :span="12" :offset="0">
                                 <el-form-item label="数据来源" prop="dataSource">
@@ -259,6 +273,8 @@ export default {
                 feedingType: row.feedingType,
                 feedingValue: row.feedingValue,
                 dataSource: row.dataSource,
+                heat: row.heat,
+                releasePoint: row.releasePoint,
             }
             this.dialogVisible = true
         },
@@ -308,6 +324,8 @@ export default {
                 goodsInVehicleType: formData.goodsInVehicleType,
                 feedingType: formData.feedingType,
                 feedingValue: formData.feedingValue,
+                heat: formData.heat,
+                releasePoint: formData.releasePoint,
                 dataSource: formData.dataSource,
                 userName: store.getters.getUserName
             }
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index e07e85c..075b57a 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -42,7 +42,7 @@
                                         <div style="display: flex; margin-top: 20px;">
                                             <div class="display-form-div-left">
                                                 <el-input-number v-model.number="workFormEntity.orderOfOrders"
-                                                    controls-position="right" :min="1" :max="10" disabled />
+                                                    controls-position="right" :min="1" disabled />
                                             </div>
                                         </div>
                                     </div>
@@ -121,8 +121,8 @@ export default {
             requestSortBox(request).then(res => {
                 const response = res.data
                 if (response.code == 0) {
+                    this.workFormEntity.orderOfOrders = response.returnData.orderOfOrders
                     ElMessage.success('请根据灯光拣选盒子。')
-                    this.resetForms()
                 } else {
                     errorBox(response.message)
                 }
diff --git a/src/layout/vehicle.vue b/src/layout/vehicle.vue
index 1a41bdc..4c1c178 100644
--- a/src/layout/vehicle.vue
+++ b/src/layout/vehicle.vue
@@ -62,7 +62,7 @@
                         </el-col>
                         <el-col :span="12">
                             <el-form-item label="状态" prop="vehicleStatus">
-                                <el-select-v2 v-model="vehicleFormEntity.vehicleStatus" placeholder="请选择托盘状态"
+                                <el-select-v2 v-model="vehicleFormEntity.vehicleStatus" placeholder="请选择料箱状态"
                                     :options="vehicleStatusOptions"></el-select-v2>
                             </el-form-item>
                         </el-col>
@@ -127,22 +127,22 @@ export default {
                 },
                 {
                     value: 1,
-                    label: '空托'
+                    label: '空箱'
                 }
             ],
             // 托盘状态
             vehicleStatusOptions: [
                 {
                     value: 1,
-                    label: '在库中'
+                    label: '入库中'
                 },
                 {
                     value: 2,
-                    label: '在站台'
+                    label: '在库中'
                 },
                 {
                     value: 3,
-                    label: '移动中'
+                    label: '出库中'
                 }
             ]
         }
@@ -210,7 +210,7 @@ export default {
                 currentLocation: formData.currentLocation,
                 isEmpty: formData.isEmpty,
                 vehicleStatus: formData.vehicleStatus,
-                lastInTime: row.lastInTime,
+                lastInTime: formData.lastInTime,
                 userName: store.getters.getUserName
             }
             updateVehicleInfo(request).then(res => {
diff --git a/src/utils/formatter.js b/src/utils/formatter.js
index 949c805..68ac85e 100644
--- a/src/utils/formatter.js
+++ b/src/utils/formatter.js
@@ -27,7 +27,7 @@ function taskStatusFormatter(value) {
         case -2:
             return '重复入库'
         case -1:
-            return '暂存任务'    
+            return '暂存任务'
         case 0:
             return '任务新建，待下发'
         case 1:
@@ -95,6 +95,8 @@ function vehicleStatusFormatter(value) {
             return '在库中'
         case 3:
             return '出库中'
+        case 4:
+            return '移库中'
         default:
             return '异常状态'
     }
@@ -167,7 +169,7 @@ function jsonFormatter(value) {
             return JSON.stringify(JSON.parse(value), null, 4)
         } catch (e) {
             return "error"
-        } 
+        }
     } else {
         return JSON.stringify(value, null, 4)
     }
diff --git a/src/views/login.vue b/src/views/login.vue
index 0fe0269..6f41224 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -57,7 +57,7 @@ const oauthConstants = {
     code_challenge: challenge,
     code_challenge_method: 'S256',
     // response_mode: "form_post",
-    redirect_uri: 'https://csclasrs.ecorp.cat.com/wms'
+    redirect_uri: 'https://csclasrs.ecorp.cat.com'
 }