From ed69214e0b6edc6f91202a69e77d9f61abca5cf3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 25 Apr 2023 15:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=EF=BC=8Cnavbar=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue         | 12 ++++++++++--
 src/views/inout/DialogNewReviewOrder.vue |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ebed5200..ffffc357 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,9 +9,15 @@
       <template v-if="device!=='mobile'">
 
         <div class="inv-hos-title">
-          <span style="font-weight: bold;color: #303133;">平潭协和医院</span>
+            <span
+              style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
           <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
+            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
+          <span
+            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
+              this.userName
+            }})</span>
         </div>
         <search id="header-search" class="right-menu-item"/>
         <screenfull id="screenfull" class="right-menu-item hover-effect"/>
@@ -120,6 +126,7 @@ export default {
   data() {
     return {
       inv: store.getters.locInvName,
+      deptName: store.getters.locDeptName,
       selInvVisible: false,
       userInfo: {},
       deptList: [],
@@ -270,6 +277,7 @@ export default {
 
   },
   created() {
+    this.userName = this.$store.getters.name;
       this.userInfo = {
         id: store.getters.adminId,
         locInvCode: store.getters.locInvCode,
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index 249a0bc9..685d6766 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -266,6 +266,7 @@ export default {
           if (response.code == 20000) {
             this.detailList = response.data.orderDetailEntities || [];
             this.formData = response.data.orderEntity;
+            this.orderQuery = this.formData;
           } else {
             this.$message.error(response.message);
           }
@@ -286,6 +287,7 @@ export default {
 
 
     addCode() {
+      debugger
       if (this.$isBlank(this.udiCode)) {
         this.$message.error("UDI码不能为空！");
       }