From 4f720babf189067538a09fc254f528b1f200f7a9 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 18 Oct 2024 17:41:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/CollectOrderTabs.vue |  2 +-
 src/views/collect/fieldOperation.vue   | 46 ++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 2b1da47b..eb99fd4b 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -91,7 +91,7 @@
             <!--            <i class="el-icon-s-fold"></i>-->
               <span slot="title">工位退货</span>
             </el-menu-item>
-            <el-menu-item :index=3 @click="clickMenuItem(3)"  v-if="workPlaceClass == 2" >
+            <el-menu-item :index=3 @click="clickMenuItem(3)"  v-if="workPlaceClass == 2 || workPlaceClass == 1" >
             <!--            <i class="el-icon-s-platform"></i>-->
               <span slot="title">工位库存</span>
             </el-menu-item>
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index f1bfb832..06067e37 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -1,9 +1,9 @@
 <template>
-  <div>
-    <!--<div style=" display: flex;justify-content: center;">-->
-    <!--  <h2 style="color: #0aa6e0">欢迎使用现场作业工作台</h2>-->
-    <!--</div>-->
-    <!--<el-divider/>-->
+  <div style="padding: 20px">
+    <div style=" display: flex;justify-content: left;">
+      <h1 style="color: #000000;font-weight: bold;margin-left: 20px">采集工位</h1>
+    </div>
+    <el-divider/>
     <!-- 分割线 -->
     <!--<el-form :model="query" class="query-form" size="mini" label-width="100px" :inline="true">-->
       <!--<el-form-item prop="key" label="工位信息:">-->
@@ -19,8 +19,8 @@
     <!--</el-form>-->
 
 
-      <el-row :gutter="8">
-        <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6" >
+      <el-row :gutter="8" style="height: 50%">
+        <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6" v-if="info.workPlaceClass == 1">
           <el-card :body-style="{margin:'20px'}"
                    style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
           >
@@ -47,6 +47,38 @@
         </el-col>
       </el-row>
 
+    <div style=" display: flex;justify-content: left;margin-top: 30px">
+      <h1 style="color: #000000;font-weight: bold;margin-left: 20px">上货工位</h1>
+    </div>
+    <el-divider/>
+
+    <el-row :gutter="8" style="height: 50%">
+      <el-col v-for="(info, index)  in stationList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6" v-if="info.workPlaceClass == 2">
+        <el-card :body-style="{margin:'20px'}"
+                 style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
+        >
+
+          <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" >
+            <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.workplaceName }}</p> <!-- 假设你的信息对象中包含一个title属性 -->
+            <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
+            <!--              &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
+            <!--&lt;!&ndash;              <span>QR</span>&ndash;&gt;-->
+            <!--              <div ref="qrcode" :id="'qrcode-'+index" style="width: 60px;height: 60px;"></div>-->
+
+            <!--            </div>-->
+          </div>
+          <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  >
+            <!-- 假设这里有一些信息内容 -->
+            <p style="font-size: 14px;background-color: #e1f3fb" >{{ info.remake }}</p>
+            <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(index)">开始作业</el-button>
+
+          </div>
+
+
+
+        </el-card>
+      </el-col>
+    </el-row>
 
 
     </div>