From fa6e9dafca9a987c0ad03e70cf2fc0d04bd7cc16 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 15:52:27 +0800
Subject: [PATCH] 1.生产补料/超领,新增防抖控制,防止条码重复扫描。 2.现场收料功能完成

---
 H5/Xcsl.aspx |   84 ++++++++++++++++++++++++------------------
 1 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/H5/Xcsl.aspx b/H5/Xcsl.aspx
index 1069911..69fb4af 100644
--- a/H5/Xcsl.aspx
+++ b/H5/Xcsl.aspx
@@ -70,8 +70,8 @@
                     v-model="DAA001"
                     label="鎸囦护宸ュ崟"
                     placeholder="鎸囦护宸ュ崟"
+                    @keyup.enter.native="GetItemsXcsl" 
                     autofocus="true"
-                    readonly
                     >
                 </van-field>
 
@@ -86,9 +86,9 @@
                 <van-field
                     ref="Bar"
                     v-model="Bar"
-                    label="绠辨潯鐮�"
-                    placeholder="璇锋壂澶栫鐮�"
-                    @keyup.enter.native="getXBarInfo" 
+                    label="鐗╂枡鏉$爜"
+                    placeholder="璇锋壂鐗╂枡鏉$爜"
+                    @keyup.enter.native="ScanXcsl" 
                     autofocus="true">
                 </van-field>
 
@@ -99,63 +99,75 @@
             <van-tab title="鏉愭枡鍒楄〃" class="mySolid font">
                 <van-row>
                     <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
-                    <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
                     <van-col span="4">澶囨枡鏁�</van-col>
                     <van-col span="4">鎺ユ敹鏁�</van-col>
+                    <van-col span="8" class="text-left padding-left">鎵�灞炲崟鎹�</van-col>
                 </van-row>
-                <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+                <van-row v-for="(itm,index) in xcslItemList" :key="index">
                     <van-col span="8" class="text-left padding-left">
-                        <div class="blue-text">{{itm.itemNo}}</div>
-                        <div>{{itm.itemName}}</div>
+                        <div class="blue-text">{{itm.item_no}}</div>
+                        <div>{{itm.item_name}}</div>
                     </van-col>
+                    <van-col span="4" class="blue-text">{{itm.bL_Num}}</van-col>
+                    <van-col span="4" class="blue-text">{{itm.jS_Num}}</van-col>
                     <van-col span="8" class="text-left padding-left">
-                        <div>{{itm.itemModel}}</div>
+                        <div>{{itm.item_out_no}}</div>
                     </van-col>
-                    <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
-                    <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
                 </van-row>
             </van-tab>
             <van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
                 <van-row>
-                    <van-col span="7" class="text-left padding-left">鏉$爜</van-col>
-                    <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
-                    <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
-                    <van-col span="3" >鏁伴噺</van-col>
+                    <van-col span="5" class="text-left padding-left">鏉$爜</van-col>
+                    <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+                    <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+                    <van-col span="3" >浜哄憳</van-col>
+                    <van-col span="5" >鏃堕棿</van-col>
                 </van-row>
                 <van-row 
-                    v-for="(itm,index) in XbarInfo" 
-                    :key="index"
-                    :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
-                    <van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
-                    <van-col span="7" class="text-left padding-left">
+                    v-for="(itm,index) in xcslWjsBarList" 
+                    :key="index">
+                    <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+                    <van-col span="8" class="text-left padding-left">
                         <div class="blue-text">{{itm.item_no}}</div>
                         <div>{{itm.item_name}}</div>
                     </van-col>
-                    <van-col span="7" class="text-left padding-left">
-                        <div>{{itm.item_model}}</div>
+                    <van-col span="3" class="text-left padding-left">
+                        <div>{{itm.quantity}}</div>
                     </van-col>
-                    <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+                    <van-col span="3">
+                        <div>{{itm.useR_NAME}}</div>
+                    </van-col>
+                    <van-col span="5">
+                        <div>{{itm.create_date}}</div>
+                    </van-col>
                 </van-row>
             </van-tab>
 
-            <van-tab title="宸叉帴鏀跺垪琛�" class="mySolid font">
+            <van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
                 <van-row>
-                    <van-col span="7" class="text-left padding-left">鏉$爜</van-col>
-                    <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
-                    <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
-                    <van-col span="3" >鏁伴噺</van-col>
+                    <van-col span="5" class="text-left padding-left">鏉$爜</van-col>
+                    <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+                    <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+                    <van-col span="3" >鎺ユ敹浜�</van-col>
+                    <van-col span="5" >鎺ユ敹鏃堕棿</van-col>
                 </van-row>
-                <van-row v-for="(itm,index) in KbBarMxInfo" :key="index">
-                    <van-col span="7" class="text-left padding-left" >{{itm.iteM_BARCODE}}</van-col>
-                    <van-col span="7" class="text-left padding-left">
+                <van-row 
+                    v-for="(itm,index) in xcslYjsBarList" 
+                    :key="index">
+                    <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+                    <van-col span="8" class="text-left padding-left">
                         <div class="blue-text">{{itm.item_no}}</div>
                         <div>{{itm.item_name}}</div>
                     </van-col>
-                    <van-col span="7" class="text-left padding-left">
-                        <div>{{itm.item_model}}</div>
+                    <van-col span="3" class="text-left padding-left">
+                        <div>{{itm.quantity}}</div>
                     </van-col>
-    
-                    <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+                    <van-col span="3">
+                        <div>{{itm.useR_NAME}}</div>
+                    </van-col>
+                    <van-col span="5">
+                        <div>{{itm.xcsL_CREATE_DATE}}</div>
+                    </van-col>
                 </van-row>
             </van-tab>
         </van-tabs>
@@ -167,5 +179,5 @@
 </asp:Content>
 
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
-    <script src="Js/Xcsl.js?<%=1 %>"></script>
+    <script src="Js/Xcsl.js?<%=111 %>"></script>
 </asp:Content>
\ No newline at end of file

--
Gitblit v1.9.3