From b50ca3ca2cb9f0add65268b324cddd502744f6b2 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 03 九月 2025 13:05:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA

---
 H5/BarCf.aspx |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/H5/BarCf.aspx b/H5/BarCf.aspx
index 9e29a10..5293dae 100644
--- a/H5/BarCf.aspx
+++ b/H5/BarCf.aspx
@@ -8,6 +8,11 @@
 </style>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+        <van-notice-bar 
+    :scrollable="false" 
+    :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')" 
+    class="org-info"
+/></van-notice-bar>
     <van-nav-bar
   title="鍦ㄥ簱鍒嗘枡"
   left-text="杩斿洖"
@@ -24,7 +29,8 @@
  placeholder="璇锋壂鐮�"
   :right-icon-size="19"
   v-focus.noKeyboard
-  @change="getScan"
+          @keyup.enter.native="getScan"
+<%--  @change="getScan"--%>
 ></van-field>
    <van-field
   v-model="formData.itemNo"
@@ -56,6 +62,7 @@
   label="鎷嗗垎鏁伴噺"
   clearable 
   placeholder="璇疯緭鍏ユ媶鍒嗘暟閲�"
+       @input="handleNumberInput3"
  :right-icon-size="19"
  v-focus.noKeyboard
 ></van-field>
@@ -68,8 +75,8 @@
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
     <comloading  v-if="isLoading"></comloading>
-    <comback ></comback>
+    <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
-    <script src="Js/BarCf.js?<%=121 %>"></script>
+    <script src="Js/BarCf.js?<%=1211111 %>"></script>
 </asp:Content>

--
Gitblit v1.9.3