From 531f76782761a75e7c2e424489b8ca6907b7b675 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 26 May 2023 10:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                | 13 ++++++++++
 src/pages/modules/workorder/index.vue | 34 +++++++++++++++++++++------
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 7892f37..c887fa2 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -75,3 +75,16 @@ export const reportQuery = (st, et, code, wcode) => post('api/produceWorkorder/r
   device_code: code,
   workorder_code: wcode
 })
+
+// 修改报工数量
+export const updateReport = (id, report, nok, repare) => post('api/produceshiftorder/updateReport', {
+  macoperate_id: id,
+  report_qty: report,
+  nok_qty: nok,
+  repare_qty: repare
+})
+
+// 删除报工记录
+export const deleteReport = (id) => post('api/produceshiftorder/deleteReport', {
+  macoperate_id: id
+})
diff --git a/src/pages/modules/workorder/index.vue b/src/pages/modules/workorder/index.vue
index 80ed21d..c4a263c 100644
--- a/src/pages/modules/workorder/index.vue
+++ b/src/pages/modules/workorder/index.vue
@@ -1,16 +1,17 @@
 <template>
 <div class="content">
     <div class="header">
-        <div class="header-user-content">
+        <div class="header-user-content" @click="toSelect">
             <div class="header-user-txt">
                 <span class="span1">登录人员：</span>
-                <span class="span2">{{userName}}</span>
+                <span class="span2">admin{{userName}}</span>
             </div>
-            <div class="drop-button-wraper" @click="toSelect"><span class="icon_dropdown"></span></div>
+            <div class="drop-button-wraper"><span class="icon_dropdown"></span></div>
             <div v-show="show" class="dropdown-wrap">
                 <ul class="dropdown-list drift">
                     <li class="dropdown-item" @click="exit">退出</li>
                 </ul>
+                <div class="popper__arrow"></div>
             </div>
         </div>
         <div class="header-time-wrap">
@@ -107,13 +108,16 @@ export default {
     position relative
     height 45px
     _fj(flex-start)
+    cursor pointer
 .header-user-txt
-    height 100%
-    line-height 45px
+    padding 14.5px 0
+    line-height 1
     .span1
         _font(14px, 1, #fff,,)
+        vertical-align middle
     .span2
         _font(16px, 1, #fff,,)
+        vertical-align middle
 .drop-button-wraper
     height 100%
     line-height 45px
@@ -123,7 +127,8 @@ export default {
     vertical-align middle
 .dropdown-wrap
     position absolute
-    top 45px
+    width 100%
+    top 39px
     right 0
     transform-origin center top
     transition transform .3s ease-in-out
@@ -135,8 +140,23 @@ export default {
 .dropdown-list
     padding 0
 .dropdown-item
-    _font(14px, 34px, #606266,,)
+    _font(14px, 34px, #606266,,center)
     padding 0 20px
+.popper__arrow
+    position absolute
+    display block
+    width 0
+    height 0
+    border-color transparent
+    border-style solid
+    border-width 6px
+    filter drop-shadow(0 2px 12px rgba(0,0,0,.03))
+    top -6px
+    left 50%
+    transform translateX(-50%)
+    margin-right 3px
+    border-top-width 0
+    border-bottom-color #ebeef5
 .header-time-wrap
     height 45px
 .header-time