From 83a1daf289c55dcc323e6cc71dacb491dd996591 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 9 Nov 2024 17:19:03 +0800
Subject: [PATCH] =?UTF-8?q?11/9=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/cargowWorkplaceManage.vue | 2 +-
 src/views/basic/workplace/workplaceManage.vue       | 6 +++---
 src/views/collect/IoCreateOrder.vue                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 0bf5b251..6e17de23 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -528,7 +528,7 @@ import { delCollect, getBindCollectList } from '@/api/basic/collectPoint/cargowW
 import addCollectWorkplace from './addCollectWorkplace'
 import addPlaidDialog from './addPlaidDialog'
 import freightManage from "./freightManage"
-import { deleteQueue, getQueueList, printQueueLabel } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import {  printQueueLabel } from '@/api/basic/workPlace/SysWorkplaceQueue'
 import { getWorkplaceFreightList } from '@/api/basic/workPlace/SysWorkplaceFreight'
 
 export default {
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index a8887a20..711f9c5a 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -112,7 +112,7 @@
                 <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
                 <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
                 <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-                <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增工位</el-button>
+                <el-button type="primary" icon="el-icon-plus" @click="addWorkplace">新增采集工位</el-button>
               </el-button-group>
             </div>
             <el-divider style="margin: 15px"></el-divider>
@@ -749,8 +749,8 @@ export default {
       chooseBusTypeDialogVisible: false,
       fromName: 'add',
       fromMap: {
-        'add': '新增工位',
-        'edit': '编辑工位'
+        'add': '新增采集工位',
+        'edit': '编辑采集工位'
       },
       busName: '',
       busTypeMap: {
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index bffbe689..804b9cd3 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -9,7 +9,7 @@
     >
       <el-card>
         <el-row style="margin-bottom: 8px">
-          <span style="font-size: 18px;font-weight: bold;color: red" v-if="redMesg">请先扫取货槽编码</span>
+          <span style="font-size: 18px;font-weight: bold;color: red" v-if="redMesg && this.splitType == 'out'">请先扫取货槽编码</span>
           <span style="font-size: 18px;font-weight: bold">{{curQueueName }}</span>
           <el-button-group
             style="display: flex; margin-top: 5px; float: right"