From fbe0595485e2e7c0fde9c0d95f02e38b58e7b2d3 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 10:39:36 +0800
Subject: [PATCH] 1.现场收料界面 2.界面优化

---
 H5/Js/Scbl.js |   84 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index bea1c7a..cbfdb80 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -7,16 +7,19 @@
                 "loginGuid": '',
                 "loginAccount": '',
             },
-            sms: "",
-            num:"",
-            billNo:"",
+            splitNum: "",
+            num: "",
+            type: "",
+            billNo: "",
+            selectType: "",
             daa001: "",
-            barcode:"",
+            barcode: "",
             ItemBlDetail:[],
             modeInfo: [],
             active: 0,
             show: false,
             actions: [],
+            ItemDetail: [],
         }
     },
     mounted() {
@@ -25,6 +28,8 @@
             loginGuid: this.GetLoginInfor().loginGuid,
             loginAccount: this.GetLoginInfor().loginAccount,
         };
+        this.type = this.Request("type");
+        selectType = this.type == "bl" ? selectType = "鐢熶骇琛ユ枡" : selectType = "鐢熶骇瓒呴";
     },
     methods: {
         getInfo() {
@@ -32,8 +37,11 @@
 
             var that = this;
             that.isLoading = true;
+
+
+
             that.AxiosHttp("post", 'MesItemBl/GetSCBLBillNo', {
-                type: "鐢熶骇琛ユ枡",
+                type: selectType,
             }, false)
                 .then(function (res) {
                     var json = res;
@@ -57,11 +65,6 @@
                     console.log(error);
                 });
         },
-        onClick(index, title) {
-            this.$toast(`${index} ${title}`);
-            this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
-        },
         onSelect(item) {
             // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
             // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -77,28 +80,37 @@
             that.isLoading = true;
             that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
                 billNo: that.billNo,
-                type: "鐢熶骇琛ユ枡"
+                type: selectType
             }, false)
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
-                        that.ItemBlDetail = json.data.tbBillList.item2;
-                        that.daa001 = json.data.tbBillList.item1;
+                        that.ItemDetail = json.data.tbBillList;
+                        that.daa001 = json.data.tbBillList.daa001;
+                        that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$refs.billNo.focus();
+                        that.billNo = "";
+                        that.daa001 = "";
+                        that.ItemBlDetail = [];
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
-                    console.log(error);
+                    //console.log(error);
+                    tthat.$refs.billNo.focus();
+                    that.billNo = "";
+                    that.daa001 = "";
+                    that.ItemBlDetail = [];
                 });
         },
-        getBarcode(value) {
+        getBarcode() {
 
-            this.barcode = value;
+            //this.barcode = value;
 
             var that = this;
             that.isLoading = true;
@@ -132,7 +144,8 @@
                 userName: that.userInfo.loginAccount,
                 barcode: that.barcode,
                 blNo: that.billNo,
-                billNo: that.daa001
+                billNo: that.daa001,
+                type: selectType
             }, false)
                 .then(function (res) {
                     var json = res;
@@ -144,20 +157,34 @@
                         //that.ItemBlDetail = json.data.tbBillList.item2
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
                         that.GetMesItemBlDetailByBillNo();
+                        that.$refs.barcode.focus();
+                        that.barcode = "";
+                        that.num = "";
+                        that.splitNum = "";
+                        
+
                     } else if (json.status == 2) {
                         that.$refs.splitNum.focus();
-                        that.scanInfo.splitNum = json.data.tbBillList.splitNum;
-                        that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
+                        that.splitNum = json.data.cfNum;
+                        that.num = json.data.num;
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$refs.barcode.focus();
+                        that.barcode = "";
+                        that.num = "";
+                        that.splitNum = "";
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
-                    console.log(error);
+                    //console.log(error);
+                    that.$refs.barcode.focus();
+                    that.barcode = "";
+                    that.num = "";
+                    that.splitNum = "";
                 });
         },
         tmcf() {
@@ -190,7 +217,7 @@
                 return;
             }
 
-            if (!that.sms) {
+            if (!that.splitNum) {
                 this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
                 that.isLoading = false;
                 return;
@@ -201,23 +228,34 @@
                 barcode: that.barcode,
                 blNo: that.billNo,
                 billNo: that.daa001,
-                num: that.sms
+                num: that.splitNum,
+                type: selectType
             }, false)
                 .then(function (res) {
                     var json = res;
                     if (json.status == 0) {
                         that.ItemBlDetail = json.data.pendingList;
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+                        that.$refs.barcode.focus();
+                        that.barcode = "";
+                        that.num = "";
+                        that.splitNum = "";
+                        that.GetMesItemBlDetailByBillNo();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$refs.barcode.focus();
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
-                    console.log(error);
+                    //console.log(error);
+                    that.$refs.barcode.focus();
+                    that.barcode = "";
+                    that.num = "";
+                    that.splitNum = "";
                 });
         }
     }

--
Gitblit v1.9.3