From 441d502846cd4801fc7f9617efcdc25a51e22ad9 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 28 八月 2025 09:25:25 +0800
Subject: [PATCH] 移龙巍27号下午两点左右的打码版本

---
 H5/Js/Scbl.js              |   17 +
 H5/Js/cprk.js              |   15 +
 H5/My.aspx                 |    2 
 H5/Js/PurchaseReturn.js    |   12 
 H5/Js/Scll.js              |    9 
 H5/Js/Qcrk.js              |   15 +
 H5/Js/IPQC_SJ/Add.js       |    9 
 H5/Js/Scbg.js              |   27 ++
 Scripts/config.js          |  125 +++++++++--
 H5/Js/Scllhb.js            |   10 +
 H5/PurchaseReturn.aspx     |  260 ++++++++++++++-----------
 H5/Js/BarCfBefore.js       |    8 
 H5/Js/PurchaseInventory.js |    1 
 H5/Js/Sctl.js              |   15 +
 H5/Js/QcPrint.js           |    1 
 H5/Js/Sccl.js              |   20 ++
 H5/Js/BarCf.js             |    9 
 17 files changed, 405 insertions(+), 150 deletions(-)

diff --git a/H5/Js/BarCf.js b/H5/Js/BarCf.js
index 9f2065a..ad71d69 100644
--- a/H5/Js/BarCf.js
+++ b/H5/Js/BarCf.js
@@ -87,10 +87,13 @@
                         //that.barMessage = json.data.tbBillList.message;
                         //that.$refs.barcode.focus();
                         //that.formData.barcode = null;
+
+                        that.$playSound('success');
                         that.$refs.cfNum.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                     }
@@ -100,6 +103,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.$refs.barcode.focus();
                 });
@@ -113,10 +117,12 @@
 
             if (that.formData.cfNum * 1 <= 0) {
                 that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.formData.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             that.isLoading = true;
@@ -134,10 +140,12 @@
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                         that.formData.cfNum = null;
+                        that.$playSound('success');
                         that.$notify({ type: 'success', message: json.message });
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.cfNum.focus();
                     }
                     that.isLoading = false;
@@ -145,6 +153,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
diff --git a/H5/Js/BarCfBefore.js b/H5/Js/BarCfBefore.js
index 526f35f..eb0c438 100644
--- a/H5/Js/BarCfBefore.js
+++ b/H5/Js/BarCfBefore.js
@@ -87,10 +87,12 @@
                         //that.barMessage = json.data.tbBillList.message;
                         //that.$refs.barcode.focus();
                         //that.formData.barcode = null;
+                        that.$playSound('success');
                         that.$refs.cfNum.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                     }
@@ -100,6 +102,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.$refs.barcode.focus();
                 });
@@ -113,16 +116,19 @@
 
             if (that.formData.cfNum * 1 <= 0) {
                 that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             // ... existing code ...
             if (parseFloat(that.formData.cfNum) > parseFloat(that.formData.sumQuantity)) {
                 that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘澶т簬鏉$爜鏁伴噺锛�");
+                that.$playSound('error');
                 return;
             }
             // ... existing code ...
             if (that.formData.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             that.isLoading = true;
@@ -140,6 +146,7 @@
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                         that.formData.cfNum = null;
+                        that.$playSound('success');
                         that.$notify({ type: 'success', message: json.message });
                     }
                     else {
@@ -151,6 +158,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js
index d19e67d..cba4509 100644
--- a/H5/Js/IPQC_SJ/Add.js
+++ b/H5/Js/IPQC_SJ/Add.js
@@ -186,9 +186,11 @@
             }, true, 1).then(function (res1) {
                 if (res1.rtnCode == 1) {
                     that.tableMxData = res1.rtnData;
+                    that.$playSound('success');
 
                 } else {
                     that.$toast.fail(res1.rtnMsg);
+                    that.$playSound('error');
                 }
             }).catch(function (error) {
                 that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
@@ -201,6 +203,7 @@
 
             if (!that.inputValue) {
                 this.$toast.fail("妫�楠屽�间笉鑳戒负绌�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -222,12 +225,14 @@
                     that.$notify({
                         type: 'success', message: res1.rtnMsg
                     });
+                    that.$playSound('success');
                     that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
                     //that.handleTabClick();//鍒锋柊妫�楠屾槑缁嗛潰鏉�
                     //that.$refs.inputValue.focus();
                     that.inputValue = null;
                 } else {
                     that.$toast.fail(res1.rtnMsg);
+                    that.$playSound('error');
                     that.inputValue = null;
                 }
                 that.isLoading = false;
@@ -311,9 +316,11 @@
             }, true, 1).then(function (res1) {
                 if (res1.rtnData.outSum == 1) {
                     that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+                    that.$playSound('success');
                     that.init();
                 } else {
                     that.$toast.fail(res1.rtnData.outMsg);
+                    that.$playSound('error');
                 }
                 that.ttrre = false
             }).catch(function (error) {
@@ -336,9 +343,11 @@
                 }, true, 1).then(res1 => {
                     if (res1.rtnCode == 1) {
                         that.$notify({ type: 'success', message: '閲嶆柊鍔犺浇鎴愬姛' });
+                        that.$playSound('success');
                         that.init();
                     } else {
                         that.$toast.fail(res1.rtnMsg);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 }).catch(error => {
diff --git a/H5/Js/PurchaseInventory.js b/H5/Js/PurchaseInventory.js
index 615bf63..10780cb 100644
--- a/H5/Js/PurchaseInventory.js
+++ b/H5/Js/PurchaseInventory.js
@@ -70,6 +70,7 @@
                     var json = res;
                     if (json.status == 0) {
                         that.depotData = json.data.tbBillList;
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                     }
                     else {
diff --git a/H5/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index 4ceb63e..1045ce2 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -55,6 +55,7 @@
                     var json = res;
                     if (json.status == 0) {
                         that.itemOutNoList = json.data.tbBillList;
+                        that.$playSound('success');
                         that.itemOutNoStr = that.itemOutNoList.map(s => {
                             return { name: s.billNo }
                         });
@@ -133,6 +134,7 @@
                     if (json.status == 0) {
                         that.ItemDetail = json.data.tbBillList;
                         that.$refs.barcode.focus();
+                        that.$playSound('success');
                     }
                     else {
                         that.$playSound('error');
@@ -168,7 +170,6 @@
                         //if (json.data.tbBillList) {
                         //    //this.ToErp();
                         //} else {
-
                         //}
                         that.scanFormData.quantity = json.data.tbBillList.barcodeNum
                         that.getItem();
@@ -242,16 +243,19 @@
                     var json = res;
                     if (json.status == 0) {
                         //  that.modeInfo = json.data.tbBillList;
+                        that.getItem();
                         that.scanInfo.splitNum = null;
                         that.scanFormData.quantity = null;
                         that.scanFormData.barcode = null;
                         that.$notify({ type: 'success', message: json.message });
                         that.$playSound('success');
-
-                        that.sendMessage(json.data.tbBillList);
+                       //kyy
+                       //  that.sendMessage(json.data.tbBillList);
+                        that.sendPrintMessage(json.data.tbBillList);
 
                         that.$refs.barcode.focus();
-                        that.getItem();
+                       //kyy
+                       // that.getItem();
                     }
                     else {
                         that.$playSound('error');
diff --git a/H5/Js/QcPrint.js b/H5/Js/QcPrint.js
index 8c84ddb..9ade8a7 100644
--- a/H5/Js/QcPrint.js
+++ b/H5/Js/QcPrint.js
@@ -135,6 +135,7 @@
                         that.depotsInfo = json.data.tbBillList.depotsInfo;
                         that.orgInfo = json.data.tbBillList.orgInfo;
                         that.orgID = json.data.tbBillList.fSubsidiary;
+                        that.$playSound('success');
                         that.$refs.selectKey.focus();
                     }
                     else {
diff --git a/H5/Js/Qcrk.js b/H5/Js/Qcrk.js
index c374524..fc83899 100644
--- a/H5/Js/Qcrk.js
+++ b/H5/Js/Qcrk.js
@@ -28,6 +28,7 @@
 
             if (!value) {
                 this.$toast.fail("搴撲綅缂栫爜");
+                that.$playSound('error');
                 return;
             }
 
@@ -42,17 +43,20 @@
                         /*that.$notify({ type: 'success', message: json.data.tbBillList });*/
                         if (!that.barcode?.trim()) {
                             that.$refs.barcode.focus();
+                            that.$playSound('succcess');
                         } else {
                             that.scanBarcode();
                         }
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                 })
                 .catch(function (error) {
                     that.isLoading = false;
-                    that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�"); 
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -72,11 +76,13 @@
                         that.num = res.data.tbBillList.quantity;
                         if (!that.depotNo?.trim()) { 
                             that.$refs.depotNo.focus();
+                            that.$playSound('success');
                         } else {
                             that.scanBarcode();
                         }
                     }
                     else {
+                        that.$playSound('error');
                         that.$toast.fail(json.message);
                         that.$refs.barcode.focus();
                         that.barcode = null;
@@ -85,6 +91,7 @@
                 })
                 .catch(function (error) {
                     that.isLoading = false;
+                    that.$playSound('error');
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�" + error.message);
                     that.$refs.barcode.focus();
                 });
@@ -94,18 +101,21 @@
             var that = this;
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.barcode?.trim()) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.depotNo?.trim()) {
                 this.$toast.fail("浠撳簱涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -119,6 +129,7 @@
                     var json = res;
                     if (json.status == 0) {
                         that.$notify({ type: 'success', message: json.data.tbBillList.message });
+                        that.$playSound('success');
                         that.barcode = null;
                         that.num = null;
                         that.barInfo = [];
@@ -126,12 +137,14 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         }
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index 2079542..78864ea 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -68,15 +68,18 @@
                         that.$refs.barcode.focus();
                     } else {
                         that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+                        that.$playSound('error');
                     }
                 }
                 else {
                     that.$toast.fail(json.message);
+                    that.$playSound('error');
                 }
                 that.isLoading = false;
             })
             .catch(function (error) {
                 that.isLoading = false;
+                that.$playSound('error');
                 that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                 console.log(error);
             });
@@ -104,17 +107,20 @@
                         that.actions = json.data.tbBillList.map(item => {
                             return { name: item.staffName }
                         });
+                        that.$playSound('success');
 
                         that.stafList = json.data.tbBillList;
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -136,9 +142,11 @@
                         });
 
                         that.stafList = json.data.result.rksqOrderList;
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
@@ -183,6 +191,7 @@
                 this.$refs.sjBillNo.focus();
             } else {
                 this.$toast("鏈壘鍒板尮閰嶇殑閫佹鍗曞彿");
+                that.$playSound('error');
             }
             //this.GetMesItemBlDetailByBillNo();
             //this.$toast(item.name);
@@ -203,16 +212,19 @@
                         });
 
                         that.stafList = json.data.tbBillList;
+                        that.$playSound('success');
                         console.log('DAWDADWDADADADWD' + that.stafList);
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
             // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
@@ -243,16 +255,19 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 return;
             }
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 return;
             }
 
             if (!that.stafId) {
                 that.$toast.fail("鍛樺伐涓嶅厑璁镐负绌�");
+                that.$playSound('error');
                 return;
             }
 
@@ -281,11 +296,13 @@
                         console.log(entity.barcodesDetail);
                         console.log(that.BarcodesDetail);
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                         that.barcode = null;
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.barcode.focus();
                         that.barcode = null;
                     }
@@ -294,6 +311,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -306,6 +324,7 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.load = false;
                 return;
             }
@@ -330,6 +349,7 @@
 
             if (!that.sjBillNo) {
                 this.$toast.fail("閫佹鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.load = false;
                 return;
             }
@@ -344,10 +364,13 @@
                     var json = res;
                     if (json.status == 0) {
                         that.$notify({ type: 'success', message: '閫佹鎴愬姛' });
+
                         that.BarcodesDetail = [];
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                     that.load = false;
@@ -355,6 +378,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -377,10 +401,12 @@
                         console.log(that.BarcodesDetail);
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
                         that.$refs.sjBillNo.focus();
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
                         that.$refs.sjBillNo.focus();
+                        that.$playSound('error');
                         that.barcode = null;
                     }
                     that.isLoading = false;
@@ -388,6 +414,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
             // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index 78c3b87..d407253 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -56,12 +56,14 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -88,9 +90,11 @@
                         that.ItemDetail = json.data.tbBillList;
                         that.daa001 = json.data.tbBillList.daa001;
                         that.$refs.barcode.focus();
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.billNo.focus();
                         that.billNo = "";
                         that.daa001 = "";
@@ -101,6 +105,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     //console.log(error);
                     tthat.$refs.billNo.focus();
                     that.billNo = "";
@@ -121,24 +126,28 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.billNo) {
                 this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.daa001) {
                 this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -203,30 +212,35 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.billNo) {
                 this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.daa001) {
                 this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.splitNum) {
                 this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -244,6 +258,7 @@
                     if (json.status == 0) {
                         that.ItemBlDetail = json.data.pendingList;
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                         that.barcode = "";
                         that.num = "";
@@ -252,6 +267,7 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.barcode.focus();
                     }
                     that.isLoading = false;
@@ -259,6 +275,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     //console.log(error);
                     that.$refs.barcode.focus();
                     that.barcode = "";
diff --git a/H5/Js/Sccl.js b/H5/Js/Sccl.js
index 9e0cad8..4153c19 100644
--- a/H5/Js/Sccl.js
+++ b/H5/Js/Sccl.js
@@ -48,12 +48,14 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -84,15 +86,18 @@
                     if (json.status == 0) {
                         that.ItemBlDetail = json.data.tbBillList.item;
                         that.daa001 = json.data.tbBillList.bl001;
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -105,24 +110,28 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.billNo) {
                 this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.daa001) {
                 this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -143,16 +152,19 @@
                         that.sms = json.data.tbBillList.item.fum;
                         that.num = json.data.tbBillList.item.num;
                         that.ItemBlDetail = json.data.tbBillList.pendingList
+                        that.$playSound('error');
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -164,30 +176,35 @@
 
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.billNo) {
                 this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.daa001) {
                 this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
 
             if (!that.sms) {
                 this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.isLoading = false;
                 return;
             }
@@ -204,16 +221,19 @@
                     var json = res;
                     if (json.status == 0) {
                         that.ItemBlDetail = json.data.tbBillList.pendingList;
+                        that.$playSound('success');
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         }
diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 18334ca..d48712d 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -48,10 +48,12 @@
                         console.log(json)
                         that.ItemDetail = json.data.tbBillList;
                         that.modeInfo.planNo = json.data.tbBillList.planNo;
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.daa001.focus();
                         that.modeInfo.daa001 = "";
                         that.modeInfo.planNo = "";
@@ -62,6 +64,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.$refs.daa001.focus();
                     that.modeInfo.daa001 = "";
@@ -76,10 +79,12 @@
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
                 that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
 
@@ -101,6 +106,7 @@
                     }
                     else if (json.status == 2) {
                         that.$refs.splitNum.focus();
+                        that.$playSound('success');
                         that.scanInfo.splitNum = json.data.tbBillList.splitNum;
                         that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
                     }
@@ -129,14 +135,17 @@
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
                 that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.splitNum * 1 <= 0) {
                 that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             //that.ip = "";
diff --git a/H5/Js/Scllhb.js b/H5/Js/Scllhb.js
index 75cb99d..597336d 100644
--- a/H5/Js/Scllhb.js
+++ b/H5/Js/Scllhb.js
@@ -48,10 +48,12 @@
                         console.log(json)
                         that.ItemDetail = json.data.tbBillList;
                         that.modeInfo.planNo = json.data.tbBillList.planNo;
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.daa001.focus();
                         that.modeInfo.daa001 = "";
                         that.modeInfo.planNo = "";
@@ -62,6 +64,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.$refs.daa001.focus();
                     that.modeInfo.daa001 = "";
@@ -76,10 +79,12 @@
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
                 that.$toast.fail("姹囨姤鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
 
@@ -101,6 +106,7 @@
                     }
                     else if (json.status == 2) {
                         that.$refs.splitNum.focus();
+                        that.$playSound('success');
                         that.scanInfo.splitNum = json.data.tbBillList.splitNum;
                         that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
                     }
@@ -129,14 +135,17 @@
             var that = this;
             if (that.modeInfo.daa001.length <= 0) {
                 that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.splitNum * 1 <= 0) {
                 that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.scanInfo.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             //that.ip = "";
@@ -347,6 +356,7 @@
                 console.log('鎻愬彇鐨凞AA001:', this.modeInfo.daa001);
             } else {
                 this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+                that.$playSound('error');
                 this.modeInfo.daa001 = '';
             }
             this.getModel();
diff --git a/H5/Js/Sctl.js b/H5/Js/Sctl.js
index b757f6a..7ecfce0 100644
--- a/H5/Js/Sctl.js
+++ b/H5/Js/Sctl.js
@@ -50,12 +50,14 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
@@ -83,9 +85,11 @@
                     if (json.status == 0) {
                         that.ItemDetail = json.data.tbBillList;
                         that.$refs.sectionCode.focus();
+                        that.$playSound('success');
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.billNo.focus();
                         that.ItemDetail = null;
                         that.billNo = null;
@@ -95,6 +99,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     that.$refs.billNo.focus();
                     that.ItemDetail = null;
                     that.billNo = null;
@@ -115,10 +120,12 @@
                     var json = res;
                     if (json.status == 0) {
                         that.depot = json.data.tbBillList;
+                        that.$playSound('success');
                         that.$refs.barcode.focus();
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.sectionCode.focus();
                         that.depotSectionCode = null;
                     }
@@ -127,6 +134,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     that.$refs.sectionCode.focus();
                     that.depotSectionCode = null;
                     console.log(error);
@@ -141,6 +149,7 @@
 
             if (!that.billNo) {
                 this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.$refs.billNo.focus();
                 that.isLoading = false;
                 return;
@@ -148,6 +157,7 @@
 
             if (!that.depotSectionCode) {
                 this.$toast.fail("搴撲綅缂栧彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.$refs.sectionCode.focus();
                 that.depotSectionCode = null;
                 that.isLoading = false;
@@ -156,6 +166,7 @@
 
             if (!that.barcode) {
                 this.$toast.fail("鏉$爜缂栧彿涓嶈兘涓虹┖");
+                that.$playSound('error');
                 that.$refs.barcode.focus();
                 that.barcode = null;
                 that.isLoading = false;
@@ -164,6 +175,7 @@
             
             if (!that.userInfo.loginAccount) {
                 this.$toast.fail(json.message);
+                that.$playSound('error');
                 return;
             }
 
@@ -179,16 +191,19 @@
 
                         that.itemNo = json.data.tbBillList.itemNo;
                         that.sms = json.data.tbBillList.num;
+                        that.$playSound('success');
                         that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                     }
                     that.isLoading = false;
                 })
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                 });
         },
diff --git a/H5/Js/cprk.js b/H5/Js/cprk.js
index 1b9f066..2acfe43 100644
--- a/H5/Js/cprk.js
+++ b/H5/Js/cprk.js
@@ -55,6 +55,7 @@
 
                         if (that.formData.barcode == "" || that.formData.barcode == null) {
                             that.$refs.barcode.focus();
+                            that.$playSound('success');
                             that.isLoading = false;
                         } else {
                             that.getScan();
@@ -62,6 +63,7 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.formData.sectionCode = null;
                         that.$refs.sectionCode.focus();
                         that.isLoading = false;
@@ -72,6 +74,7 @@
                 .catch(function (error) {
                     that.isLoading = false;
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+                    that.$playSound('error');
                     console.log(error);
                     that.formData.sectionCode = null;
                     that.$refs.sectionCode.focus();
@@ -97,6 +100,7 @@
                         //that.formData.sumQuantity = json.data.tbMesItems.quantity;
                         if (that.formData.sectionCode == "" || that.formData.sectionCode == null) {
                             that.$refs.sectionCode.focus();
+                            that.$playSound('sucess');
                             that.isLoading = false;
                         } else {
                             that.getScan();
@@ -104,6 +108,7 @@
                     }
                     else {
                         that.$toast.fail(json.message);
+                        that.$playSound('error');
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                         that.isLoading = false;
@@ -112,6 +117,7 @@
                 })
                 .catch(function (error) {
                     that.isLoading = false;
+                    that.$playSound('error');
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                     console.log(error);
                     that.$refs.barcode.focus();
@@ -122,10 +128,12 @@
 
             if (that.formData.sectionCode.length * 1 <= 0) {
                 that.$toast.fail("搴撲綅缂栫爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             if (that.formData.barcode.length * 1 <= 0) {
                 that.$toast.fail("鐗╂枡鏉$爜涓嶈兘涓虹┖锛�");
+                that.$playSound('error');
                 return;
             }
             that.isLoading = true;
@@ -141,9 +149,11 @@
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
                         that.formData.cfNum = null;
+                        that.$playSound('success');
                         that.$notify({ type: 'success', message: json.message });
                     }
                     else {
+                        that.$playSound('error');
                         that.$toast.fail(json.message);
                         that.$refs.barcode.focus();
                         that.formData.barcode = null;
@@ -152,6 +162,7 @@
                 })
                 .catch(function (error) {
                     that.isLoading = false;
+                    that.$playSound('error');
                     that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
                     console.log(error);
                 });
@@ -199,6 +210,7 @@
             this.Message = "";
             if (this.tableData.length == 0) {
                 this.Message = "鏉$爜涓虹┖锛屾棤娉曟帹閫丒RP";
+                that.$playSound('error');
                 return;
             }
             let userName = this.$loginInfo.account;
@@ -237,6 +249,7 @@
                     this.messageCenter.dealWith = 0;
                     this.messageCenter.status = 1;
                     this.messageCenter.resultData = res.msg;
+                    that.$playSound('success');
                     this.updateMessage(this.messageCenter);
                 }
             });
@@ -252,8 +265,10 @@
             }).then(res => {
                 if (res.data.tbBillList) {
                     this.Message += "  瀹℃牳鎴愬姛锛�";
+                    that.$playSound('success');
                 } else {
                     this.Message += " 瀹℃牳澶辫触锛�";
+                    that.$playSound('error');
                 }
 
                 let entity = {
diff --git a/H5/My.aspx b/H5/My.aspx
index bd7e030..3a79cd4 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -59,6 +59,6 @@
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
      <script src="Js/comWebNav.js"></script>
-    <script src="Js/My.js?<%=123456 %>"></script>
+    <script src="Js/My.js?<%=123457 %>"></script>
 </asp:Content>
 
diff --git a/H5/PurchaseReturn.aspx b/H5/PurchaseReturn.aspx
index 2ae3b4c..875f4c1 100644
--- a/H5/PurchaseReturn.aspx
+++ b/H5/PurchaseReturn.aspx
@@ -1,127 +1,155 @@
-锘�<%@ Page Title="閲囪喘閫�鏂�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %>
+锘�<%@ Page Title="閲囪喘閫�鏂�" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" 
+    CodeFile="PurchaseReturn.aspx.cs" Inherits="H5_Scll" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
     <style>
-    .bg-info {
-        background-color:#fff;
-    }
-      
-</style>
+        .bg-info {
+            background-color: #fff;
+        }
+    </style>
 </asp:Content>
+
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
-        <div class="content-wrapper">
-    <van-nav-bar
-  title="閲囪喘閫�鏂�"
-  left-text="杩斿洖"
-  left-arrow
-  @click-left="GoBack()"
-></van-nav-bar>
-    <div class="mySolid">
-        <van-cell-group>
-  <van-field
-      value=""
-      label="鐢宠鍗曞彿"
-      clearable 
-       placeholder="閫夋嫨鐢宠鍗曞彿"
-      :right-icon-size="19"
-        v-model="scanFormData.itemOutNo"
-      @keyup.enter.native="getItem"
-       v-focus.noKeyboard
-    ><template #button>
-      <van-button size="small" type="info" plain @click="getItemOutNo" >閫夋嫨</van-button>
-    </template></van-field>
- <van-field
-   ref="barcode"
-   v-model="scanFormData.barcode"
-  label="鐗╂枡鏉$爜"
-   clearable 
- placeholder="璇锋壂鎻忕墿鏂欐潯鐮�"
-  :right-icon-size="19"
-  v-focus.noKeyboard
-     @keyup.enter.native="SaveBarCodes"
-  <%--@change="SaveBarCodes"--%>
-></van-field>
-   <van-field
-  v-model="scanFormData.itemNo"
-  label="鐗╂枡缂栫爜"
-  placeholder="鐗╂枡缂栫爜"
-  disabled
-></van-field>
-   <van-field
-  v-model="scanFormData.quantity"
-  label="鏁伴噺"
-  placeholder="鏁伴噺"
-  disabled
-></van-field>
-            <van-field
-    ref="splitNum"
-    v-model="scanInfo.splitNum"
-    center
-    clearable
-    label="鍙戞枡鏁伴噺"
-    placeholder="鍙戞枡鏁伴噺">
-    <van-button 
-        slot="button" 
-        type="info" 
-        size="small"  
-        plain 
-        @click="getChaiFen">
-        鏉$爜鎷嗗垎
-    </van-button>
-</van-field>
-</van-cell-group>
+    <div class="content-wrapper">
+        <!-- 瀵艰埅鏍� -->
+        <van-nav-bar
+            title="閲囪喘閫�鏂�"
+            left-text="杩斿洖"
+            left-arrow
+            @click-left="GoBack()"
+        ></van-nav-bar>
+
+        <!-- 琛ㄥ崟鍖哄煙 -->
+        <div class="mySolid">
+            <van-cell-group>
+                <!-- 鐢宠鍗曞彿杈撳叆妗� -->
+                <van-field
+                    value=""
+                    label="鐢宠鍗曞彿"
+                    clearable 
+                    placeholder="閫夋嫨鐢宠鍗曞彿"
+                    :right-icon-size="19"
+                    v-model="scanFormData.itemOutNo"
+                    @keyup.enter.native="getItem"
+                    v-focus.noKeyboard
+                >
+                    <template #button>
+                        <van-button size="small" type="info" plain @click="getItemOutNo">閫夋嫨</van-button>
+                    </template>
+                </van-field>
+
+                <!-- 鐗╂枡鏉$爜杈撳叆妗� -->
+                <van-field
+                    ref="barcode"
+                    v-model="scanFormData.barcode"
+                    label="鐗╂枡鏉$爜"
+                    clearable 
+                    placeholder="璇锋壂鎻忕墿鏂欐潯鐮�"
+                    :right-icon-size="19"
+                    v-focus.noKeyboard
+                    @keyup.enter.native="SaveBarCodes"
+                    <%--@change="SaveBarCodes"--%>
+                ></van-field>
+
+                <!-- 鐗╂枡缂栫爜锛堢鐢級 -->
+                <van-field
+                    v-model="scanFormData.itemNo"
+                    label="鐗╂枡缂栫爜"
+                    placeholder="鐗╂枡缂栫爜"
+                    disabled
+                ></van-field>
+
+                <!-- 鏁伴噺锛堢鐢級 -->
+                <van-field
+                    v-model="scanFormData.quantity"
+                    label="鏁伴噺"
+                    placeholder="鏁伴噺"
+                    disabled
+                ></van-field>
+
+                <!-- 鍙戞枡鏁伴噺涓庢潯鐮佹媶鍒� -->
+                <van-field
+                    ref="splitNum"
+                    v-model="scanInfo.splitNum"
+                    center
+                    clearable
+                    label="鍙戞枡鏁伴噺"
+                    placeholder="鍙戞枡鏁伴噺"
+                >
+                    <van-button 
+                        slot="button" 
+                        type="info" 
+                        size="small"  
+                        plain 
+                        @click="getChaiFen"
+                    >
+                        鏉$爜鎷嗗垎
+                    </van-button>
+                </van-field>
+            </van-cell-group>
+        </div>
+
+        <!-- 鏍囩椤靛尯鍩� -->
+        <van-tabs color="#000" title-active-color="#0283EF">
+            <!-- 寰呮壂鐗╂枡鏍囩椤� -->
+            <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="3">寰呮壂</van-col>
+                    <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
+                </van-row>
+                <van-row v-for="(itm, index) in ItemDetail.items" :key="index">
+                    <van-col span="8" class="text-left padding-left">
+                        <div class="blue-text">{{itm.itemNo}}</div>
+                        <div>{{itm.itemName}}</div>
+                    </van-col>
+                    <van-col span="8" class="text-left padding-left">
+                        <div>{{itm.itemModel}}</div>
+                    </van-col>
+                    <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+                    <van-col span="5">{{itm.recoKw}}</van-col>
+                </van-row>
+            </van-tab>
+
+            <!-- 宸叉壂鐗╂枡鏍囩椤� -->
+            <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="3">闇�棰嗘暟</van-col>
+                    <van-col span="5">宸查鏁�</van-col>
+                </van-row>
+                <van-row v-for="(itm, index) in ItemDetail.ysitems" :key="index">
+                    <van-col span="8" class="text-left padding-left">
+                        <div class="blue-text">{{itm.itemNo}}</div>
+                        <div>{{itm.itemName}}</div>
+                    </van-col>
+                    <van-col span="8" class="text-left padding-left">
+                        <div>{{itm.itemModel}}</div>
+                    </van-col>
+                    <van-col span="3">{{itm.fQty}}</van-col>
+                    <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+                </van-row>
+            </van-tab>
+        </van-tabs>
+
+        <%--<van-button type="primary" @click="SaveBarCodes">纭</van-button>--%>
+
+        <!-- 搴曢儴寮圭獥 -->
+        <van-action-sheet 
+            v-model="show" 
+            :actions="itemOutNoStr" 
+            @select="onSelect" 
+        ></van-action-sheet>
     </div>
-  <van-tabs color="#000" title-active-color="#0283EF">
-    <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="3">寰呮壂</van-col>
-            <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
-        </van-row>
-        <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
-            <van-col span="8" class="text-left padding-left">
-                <div class="blue-text">{{itm.itemNo}}</div>
-                <div>{{itm.itemName}}</div>
-            </van-col>
-            <van-col span="8" class="text-left padding-left">
-                <div>{{itm.itemModel}}</div>
-            </van-col>
-            <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
-            <van-col span="5">{{itm.recoKw}}</van-col>
-        </van-row>
-    </van-tab>
-
-    <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="3">闇�棰嗘暟</van-col>
-            <van-col span="5">宸查鏁�</van-col>
-        </van-row>
-        <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
-            <van-col span="8" class="text-left padding-left">
-                <div class="blue-text">{{itm.itemNo}}</div>
-                <div>{{itm.itemName}}</div>
-            </van-col>
-            <van-col span="8" class="text-left padding-left">
-                <div>{{itm.itemModel}}</div>
-            </van-col>
-            <van-col span="3">{{itm.fQty}}</van-col>
-            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
-        </van-row>
-    </van-tab>
-</van-tabs>
-
-<%--    <van-button type="primary" @click="SaveBarCodes" >纭</van-button>--%>
-    <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet>
-                </div>
 </asp:Content>
+
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
-    <comloading  v-if="isLoading"></comloading>
-
-
+    <comloading v-if="isLoading"></comloading>
     <%--<comback ></comback>--%>
 </asp:Content>
+
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
     <script src="Js/PurchaseReturn.js?<%=12811111 %>"></script>
-</asp:Content>
+</asp:Content>
\ No newline at end of file
diff --git a/Scripts/config.js b/Scripts/config.js
index 91756e4..8a354bc 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,10 +1,9 @@
-锘�/*var APIURL = "http://192.168.8.8:8083/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級*/
-var APIURL = "http://192.168.8.8:83/api/";//PDA鍚庣鍙戝竷姝e紡鍦板潃锛堝唴缃戯級
-/*var APIURL = "http://localhost:5204/api/";//鏈湴璋冭瘯鍦板潃*/
+锘�//var APIURL = "http://192.168.8.8:8083/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級
+//var APIURL = "http://192.168.8.8:83/api/";//PDA鍚庣鍙戝竷姝e紡鍦板潃锛堝唴缃戯級
+var APIURL = "http://localhost:5204/api/";//鏈湴璋冭瘯鍦板潃
 
-var APIURL_PC = "http://192.168.8.8:81/"; //PC鍚庣鐨勬寮忓湴鍧�锛堝唴缃戯級
-/*var APIURL_PC = "http://192.168.8.8:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝唴缃戯級*/
-/*var APIURL_PC = "http://116.148.211.203:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級*/
+//var APIURL_PC = "http://192.168.8.8:81/"; //PC鍚庣鐨勬寮忓湴鍧�锛堝唴缃戯級
+var APIURL_PC = "http://192.168.8.8:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級
 
 var APIURL_IMAGE = APIURL_PC+"upload/";
 var ISNEEDLOGIN = true;
@@ -169,32 +168,102 @@
 }
 
 
-// 鏂板鍏ㄥ眬鎵撳嵃鏂规硶
+//// 鏂板鍏ㄥ眬鎵撳嵃鏂规硶
+//Vue.prototype.sendPrintMessage = function (tbBillList) {
+//    const cfDetails = tbBillList.cfBarInfo.map(item => {
+//        return "! 0 200 200 210 1\r\n" +
+//            "PAGE - WIDTH 700 \r\n" +
+//            "GAP-SENSE \r\n" +
+///*            "BOX 0 0 700 180 0 \r\n" +*/
+//            `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
+//            `T 55 3 120 10 ${item.iteM_NO}\r\n` +
+//            `T 16 0 310 10 ${item.item_name}\r\n` +
+//            "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
+//            `T 55 2 110 42 ${item.item_model}\r\n` +
+//            "T 16 0 10 78 鏁伴噺锛歕r\n" +
+//            `T 0 5 90 78 ${item.quantity}\r\n` +
+//            `T 16 5 180 78 ${item.barType}\r\n` +
+//            `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
+///*            `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +*/
+//            "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
+//            `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
+//            "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
+//            `T 55 0 120 150 ${item.print_date}\r\n` +
+//            "B QR 580 12 M 2 U 4\r\n" +
+//            `MA,${item.iteM_BARCODE}\r\n` +
+//            "ENDQR\r\nFORM\r\nPRINT\r\n";
+//    });
+
 Vue.prototype.sendPrintMessage = function (tbBillList) {
     const cfDetails = tbBillList.cfBarInfo.map(item => {
-        return "! 0 200 200 210 1\r\n" +
-            "PAGE - WIDTH 700 \r\n" +
-            "GAP-SENSE \r\n" +
-/*            "BOX 0 0 700 180 0 \r\n" +*/
-            `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
-            `T 55 3 120 10 ${item.iteM_NO}\r\n` +
-            `T 16 0 310 10 ${item.item_name}\r\n` +
-            "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
-            `T 55 2 110 42 ${item.item_model}\r\n` +
-            "T 16 0 10 78 鏁伴噺锛歕r\n" +
-            `T 0 5 90 78 ${item.quantity}\r\n` +
-            `T 16 5 180 78 ${item.barType}\r\n` +
-            `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
-/*            `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +*/
-            "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
-            `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
-            "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
-            `T 55 0 120 150 ${item.print_date}\r\n` +
-            "B QR 580 12 M 2 U 4\r\n" +
-            `MA,${item.iteM_BARCODE}\r\n` +
-            "ENDQR\r\nFORM\r\nPRINT\r\n";
+        return "! 0 195 200 472 1\r\n" +  // 鍩虹鍋忕Щ閲忓乏绉�5鍍忕礌
+            "PAGE-WIDTH 545\r\n" +     // 椤甸潰瀹藉害鍑忓皯5鍍忕礌
+            "GAP-SENSE\r\n" +
+
+            // 澶栨 - 鏁翠綋宸︾Щ5鍍忕礌
+            "BOX -3 2 543 470 2\r\n" +
+            // ==================== 鐗╂枡鏉$爜锛堢涓�琛岋級====================
+            "LINE -3 62 425 62 1\r\n" +
+            "T 55 0 8 27 鐗╂枡鏉$爜:\r\n" +
+            `T 55 3 120 27 ${item.iteM_BARCODE}\r\n` +  // 鐗╂枡鏉$爜鍊�
+
+            // ==================== 鐗╂枡缂栫爜锛堢浜岃锛�====================
+            "LINE -3 124 543 124 1\r\n" +
+            "T 55 0 8 89 缂栫爜:\r\n" +
+            `T 55 3 120 89 ${item.iteM_NO}\r\n` +  // 鐗╂枡缂栫爜鍊�
+
+            // ==================== 渚涘簲鍟嗭紙绗笁琛岋級====================
+            "LINE -3 186 543 186 1\r\n" +     // 绗�3鏉″垎闅旂嚎锛堥棿闅�62锛�
+            "T 55 0 8 151 渚涘簲鍟�:\r\n" +
+            `T 55 3 120 151 ${item.supp_name || ''}\r\n` +  // 渚涘簲鍟嗗�硷紙鍋囪瀛楁鍚嶏級
+
+            // ==================== 鐗╂枡鍚嶇О锛堢鍥涜锛�====================
+            "LINE -3 248 543 248 1\r\n" +     // 绗�4鏉″垎闅旂嚎锛堥棿闅�62锛�
+            "T 55 0 8 213 鍚嶇О:\r\n" +
+            `T 55 3 120 213 ${item.item_name}\r\n` +  // 鐗╂枡鍚嶇О鍊�
+
+            // ==================== 瑙勬牸鍨嬪彿锛堢浜旇锛�====================
+            "LINE -3 310 543 310 1\r\n" +     // 绗�5鏉″垎闅旂嚎锛堥棿闅�62锛�
+            "T 55 0 8 275 瑙勬牸:\r\n" +
+            `T 55 3 120 275 ${item.item_model}\r\n` +  // 瑙勬牸鍨嬪彿鍊�
+
+            // ==================== 浠撳簱锛堢鍏锛�====================
+            "LINE -3 360 543 360 1\r\n" +     // 绗�6鏉″垎闅旂嚎锛堢Щ鑷崇珫绾块《绔痀=360锛�
+            "T 55 0 8 335 浠撳簱:\r\n" +
+            `T 55 3 120 335 ${item.depot_name || ''}\r\n` +  // 浠撳簱鍊硷紙鍋囪瀛楁鍚嶏級
+
+            // ==================== 鏁伴噺鍜屼粨绠″憳锛堢涓冭锛�====================
+            "LINE -3 430 543 430 1\r\n" +     // 搴曢儴妯嚎锛堜笌绔栫嚎搴曠瀵归綈锛�
+            "T 55 0 8 380 鏁伴噺:\r\n" +        // 鏂囨湰浣嶇疆淇濇寔
+            `T 55 3 120 380 ${item.quantity}\r\n` +  // 鏁伴噺鍊�
+            "T 55 0 275 380 浠撶鍛�:\r\n" +    // 鏂囨湰浣嶇疆淇濇寔
+            `T 55 3 395 380 ${item.cgy || ''}\r\n` +  // 浠撶鍛樺�硷紙鍋囪瀛楁鍚嶏級
+
+            // 涓棿绔栫嚎鍒嗛殧锛堣寖鍥碮=360-430锛屼笌涓婁笅妯嚎琛旀帴锛�
+            "LINE 265 430 265 360 1\r\n" +    // 绔栫嚎椤剁瀵归綈浠撳簱琛屽垎闅旂嚎
+
+            // ==================== 搴曢儴鏃堕棿淇℃伅 ====================
+            "T 55 0 395 440 鎵撳嵃鏃堕棿\r\n" +  // 浣嶇疆淇濇寔
+            "T 55 0 8 440 " + new Date().toLocaleString('zh-CN', {  // 鏃堕棿鏍煎紡鏀逛负骞存湀鏃ユ椂鍒嗙
+                year: 'numeric',
+                month: '2-digit',
+                day: '2-digit',
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit'
+            }) + "\r\n" +
+
+            // ==================== 浜岀淮鐮佸尯鍩燂紙宸︾Щ5鍍忕礌锛�====================
+            "BOX 425 3 535 113 1\r\n" +       // 浣嶇疆淇濇寔
+            "B QR 430 8 M 2 U 5\r\n" +        // 浣嶇疆淇濇寔
+            `MA,${item.iteM_BARCODE}\r\n` +  // 浣跨敤鐗╂枡鏉$爜鐢熸垚浜岀淮鐮�
+            "ENDQR\r\n" +
+
+            "FORM\r\n" +
+            "PRINT\r\n";
     });
 
+
     let sendData = {
         Type: 'Bar',
         Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,

--
Gitblit v1.9.3