From e2cd8572c048f58e4d25213198cf459bd349445f Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 01 四月 2025 09:36:12 +0800
Subject: [PATCH] 1.期初入库页面优化

---
 H5/Qcrk.aspx  |   50 +++++++++++++++++--------
 H5/Js/Qcrk.js |   61 +++++++++++++++++++++++-------
 2 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/H5/Js/Qcrk.js b/H5/Js/Qcrk.js
index deaeac2..c374524 100644
--- a/H5/Js/Qcrk.js
+++ b/H5/Js/Qcrk.js
@@ -11,7 +11,7 @@
             barcode:"",
             itemNo:"",
             num: "",
-            barcode:"",
+            barInfo:[]
         }
     },
     mounted() {
@@ -39,7 +39,12 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.$notify({ type: 'success', message: json.data.tbBillList });
+                        /*that.$notify({ type: 'success', message: json.data.tbBillList });*/
+                        if (!that.barcode?.trim()) {
+                            that.$refs.barcode.focus();
+                        } else {
+                            that.scanBarcode();
+                        }
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -52,26 +57,54 @@
                 });
         },
       
-        getBarcode(value) {
-
-            //this.barcode = value;
-
+        getBarcode() {
             var that = this;
-            that.isLoading = true;
 
+            that.isLoading = true;
+            that.AxiosHttp("post", 'WmsBase/GetBarInfo', {
+                barcode: that.barcode,
+            }, false)
+                .then(function (res) {
+                    var json = res;
+                    if (json.status == 0) {
+
+                        that.barInfo = res.data.tbMesItems;
+                        that.num = res.data.tbBillList.quantity;
+                        if (!that.depotNo?.trim()) { 
+                            that.$refs.depotNo.focus();
+                        } else {
+                            that.scanBarcode();
+                        }
+                    }
+                    else {
+                        that.$toast.fail(json.message);
+                        that.$refs.barcode.focus();
+                        that.barcode = null;
+                    }
+                    that.isLoading = false;
+                })
+                .catch(function (error) {
+                    that.isLoading = false;
+                    that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�" + error.message);
+                    that.$refs.barcode.focus();
+                });
+        },
+
+        scanBarcode() {
+            var that = this;
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
                 that.isLoading = false;
                 return;
             }
 
-            if (!that.barcode) {
+            if (!that.barcode?.trim()) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
                 that.isLoading = false;
                 return;
             }
 
-            if (!that.depotNo) {
+            if (!that.depotNo?.trim()) {
                 this.$toast.fail("浠撳簱涓嶈兘涓虹┖");
                 that.isLoading = false;
                 return;
@@ -85,11 +118,11 @@
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-
-                        that.barcode = json.data.tbBillList.barcode;
-                        that.itemNo = json.data.tbBillList.itemNo;
-                        that.num = json.data.tbBillList.num;
                         that.$notify({ type: 'success', message: json.data.tbBillList.message });
+                        that.barcode = null;
+                        that.num = null;
+                        that.barInfo = [];
+                        that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
@@ -101,6 +134,6 @@
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                     console.log(error);
                 });
-        },
+        }
     }
 })
\ No newline at end of file
diff --git a/H5/Qcrk.aspx b/H5/Qcrk.aspx
index e5ac13d..624e67b 100644
--- a/H5/Qcrk.aspx
+++ b/H5/Qcrk.aspx
@@ -14,33 +14,39 @@
           left-arrow
           @click-left="GoBack()"
         ></van-nav-bar>
-        <div>
+        <div class="content-wrapper">
         <van-cell-group>
-  <van-field
-    value=""
-    label="搴撲綅缂栫爜"
-    clearable 
-     placeholder="鎵爜/鎵嬪綍"
-    :right-icon-size="19"
-      v-model="depotNo"
-      @change="getDepot"
-     v-focus.noKeyboard
-  ></van-field>
  <van-field
   value=""
+     ref ="barcode"
   label="鐗╂枡鏉$爜"
    clearable 
  placeholder="璇锋壂鐮�"
-     @change="getBarcode"
+    <%-- @change="getBarcode"--%>
+      @keyup.enter.native="getBarcode"
   :right-icon-size="19"
      v-model="barcode"
   v-focus.noKeyboard
 ></van-field>
    <van-field
   value=""
-       v-model="itemNo"
+       v-model="barInfo.itemNo"
   label="鐗╂枡缂栫爜"
-  placeholder="鐗╂枡缂栫爜"
+  placeholder=""
+  disabled
+></van-field>
+   <van-field
+  value=""
+       v-model="barInfo.itemName"
+  label="鐗╂枡鍚嶇О"
+  placeholder=""
+  disabled
+></van-field>
+<van-field
+  value=""
+       v-model="barInfo.itemModel"
+  label="鐗╂枡瑙勬牸"
+  placeholder=""
   disabled
 ></van-field>
   <van-field
@@ -48,9 +54,21 @@
     clearable
     v-model="num"
     label="鏉$爜鏁伴噺"
-    placeholder="鏉$爜鏁伴噺"
+    placeholder=""
 disabled
  ></van-field>
+            <van-field
+  value=""
+  ref="depotNo"
+  label="搴撲綅缂栫爜"
+  clearable 
+   placeholder="鎵爜/鎵嬪綍"
+  :right-icon-size="19"
+    v-model="depotNo"
+<%--    @change="getDepot"--%>
+    @keyup.enter.native="getDepot"
+   v-focus.noKeyboard
+></van-field>
 </van-cell-group>
     </div>
 
@@ -60,5 +78,5 @@
   <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qcrk.js?<%=121134 %>"></script>
+ <script src="Js/Qcrk.js?<%=1231 %>"></script>
 </asp:Content>

--
Gitblit v1.9.3