From 5157b0de09a722a1f40edacb98074c4a2450d447 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 30 Aug 2024 21:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderAllot.vue | 12 +++++-------
 src/views/collect/CollectOrderEnd.vue   |  1 -
 src/views/collect/CollectOrderTabs.vue  |  6 +++---
 src/views/collect/IoCreateOrder.vue     | 17 ++++++++---------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue
index 0274d45a..1496931f 100644
--- a/src/views/collect/CollectOrderAllot.vue
+++ b/src/views/collect/CollectOrderAllot.vue
@@ -1,13 +1,11 @@
 <template>
   <div>
 
-    <el-card>
-      <CollectOrderAllotCardComponents style="margin: -15px"
-                                       :tagStatus="'1'"
-                                       :workPlaceCode="workPlaceCode"
-                                       @parent-method="parentMethod"
-      ></CollectOrderAllotCardComponents>
-    </el-card>
+    <CollectOrderAllotCardComponents
+        :tagStatus="'1'"
+        :workPlaceCode="workPlaceCode"
+        @parent-method="parentMethod"
+    ></CollectOrderAllotCardComponents>
 
 
     <!--    <el-tabs type="border-card" style="margin: 15px">-->
diff --git a/src/views/collect/CollectOrderEnd.vue b/src/views/collect/CollectOrderEnd.vue
index 4f58dfab..3b54db60 100644
--- a/src/views/collect/CollectOrderEnd.vue
+++ b/src/views/collect/CollectOrderEnd.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <prescribePanel
-      style="margin: -15px"
       :RowType="type"
       :workPlaceCode="workPlaceCode"
     ></prescribePanel>
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 3e41eb1e..8cdd8b4a 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -9,13 +9,13 @@
         <el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" >
 
           <el-col :span="18" style="margin-left: 0px" >
-              <span style="font-size: 12px;color: #1c84c6">当前工位:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 16px;color: #000000">{{this.formData.workplaceName}}</span>
+              <span style="font-size: 16px;color: #409EFF">当前工位:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 16px;color: #000000">{{this.formData.workplaceName}}</span>
               &nbsp&nbsp&nbsp&nbsp
                 <span :style="{ color: formData.workplaceStatus === 0 ? 'green' : 'red' }"> ({{ formData.workplaceStatus === 0 ? '服务中' : '服务暂停' }} ) </span>
-                <el-button type="primary" @click="toggleWorkplaceStatus" style="margin-left: 10px;" >切换状态</el-button>
+<!--                <el-button type="primary" @click="toggleWorkplaceStatus" style="margin-left: 10px;" >切换状态</el-button>-->
               </span>
 
-              <span style="font-size: 12px;color: #1c84c6;margin-left: 80px">当前业务类型:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 16px;color: #000000">{{this.formData.busName}}</span>
+              <span style="font-size: 16px;color: #409EFF;margin-left: 20px">当前业务类型:&nbsp&nbsp&nbsp&nbsp<span style="font-size: 16px;color: #000000">{{this.formData.busName}}</span>
               &nbsp&nbsp&nbsp&nbsp <el-button type="primary" @click="toggleBusType" style="margin-left: 10px;" >切换业务</el-button>
             </span>
 
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 630ac1a9..d317726e 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -27,12 +27,12 @@
         <!--          </el-col>-->
         <!--        </el-row>-->
 
-<!--        <el-alert-->
-<!--          style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
-<!--          :title="msgTip"-->
-<!--          :closable="false"-->
-<!--          type="warning">-->
-<!--        </el-alert>-->
+        <!--        <el-alert-->
+        <!--          style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"-->
+        <!--          :title="msgTip"-->
+        <!--          :closable="false"-->
+        <!--          type="warning">-->
+        <!--        </el-alert>-->
 
 
         <el-row>
@@ -132,7 +132,7 @@
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="8">-->
+          <!--          <el-col :span="8">-->
           <!--            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" v-if="!corpOrderIdDisabled">-->
           <!--              <el-select-->
           <!--                v-model="orderFormData.workPlaceCode"-->
@@ -166,8 +166,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-      </el-card>
-      <el-card style="margin: 5px;">
+        <el-divider></el-divider>
         <el-row>
           <el-col :span="18">
             <el-form-item prop="code" label="扫码录入:">