From e78f3b403da5b930bfc90e207d3264187830b488 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 25 六月 2025 14:51:26 +0800
Subject: [PATCH] 1.采购退货优化 2.采购入库界面调整
---
H5/Js/PurchaseReturn.js | 156 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 97 insertions(+), 59 deletions(-)
diff --git a/H5/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index b2618f8..cf35b11 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -14,7 +14,7 @@
quantity:0
},
formData: {},
- tableData: [],
+ ItemDetail: [],
codeTableData: [],
itemOutNoList: [],
itemOutNoStr: [],
@@ -27,6 +27,12 @@
messageId: 0,
show: false,
+
+ scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ cfBarInfo: [],
}
},
mounted() {
@@ -55,12 +61,14 @@
that.show = true;
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
});
@@ -78,12 +86,14 @@
that.itemOutNoList = json.data.tbBillList;
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
});
@@ -104,33 +114,6 @@
this.getItem();
- //var that = this;
-
- //that.isLoading = true;
- //that.AxiosHttp("post", 'MesInvItemOuts/GetPage', {
- // billNo: this.scanFormData.itemOutNo,
- // pageIndex: 1,
- // limit: 1,
- //}, false)
- // .then(function (res) {
- // var json = res;
- // if (json.status == 0) {
- // that.formData = json.data.tbBillList[0];
- // that.formData.billTypeName = "鍑哄簱鍗�";
-
- // that.getScanBarcode();
- // }
- // else {
- // that.$toast.fail(json.message);
- // }
- // that.isLoading = false;
- // })
- // .catch(function (error) {
- // that.isLoading = false;
- // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- // console.log(error);
- // });
-
},
getItem() {
var that = this;
@@ -138,56 +121,34 @@
let itemOut = this.itemOutNoList.filter(it => it.billNo == that.scanFormData.itemOutNo);
- this.invItemOutId = itemOut[0].id;
+ //this.invItemOutId = itemOut[0].id;
that.AxiosHttp("post", 'MesCgthSq/GetSumItem', {
- id: that.invItemOutId,
+ //id: that.invItemOutId,
billNo: that.scanFormData.itemOutNo,
barcode: that.scanFormData.barcode,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.tableData = json.data.tbBillList.sumItem;
- that.scanFormData.itemNo = json.data.tbBillList.itemNo
- //that.scanFormData.quantity = json.data.tbBillList.quantity
- //console.log(json);
+ that.ItemDetail = json.data.tbBillList;
that.$refs.barcode.focus();
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
+ that.ItemDetail = [];
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
+ that.ItemDetail = [];
});
},
- //getScanBarcode() {
- // var that = this;
- // that.isLoading = true;
- // that.AxiosHttp("post", 'MesInvItemOuts/GetScanBarcode', {
- // id: that.formData.guid
- // }, false)
- // .then(function (res) {
- // var json = res;
- // if (json.status == 0) {
- // that.codeTableData = res.data.tbBillList;
- // }
- // else {
- // that.$toast.fail(json.message);
- // }
- // that.isLoading = false;
- // })
- // .catch(function (error) {
- // that.isLoading = false;
- // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- // console.log(error);
- // });
- //},
SaveBarCodes() {
//if (!this.scanFormData.barcode) {
@@ -213,21 +174,98 @@
that.getItem();
that.$refs.barcode.focus();
that.scanFormData.barcode = null;
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+ that.scanFormData.quantity = json.data.tbBillList.barcodeNum;
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.barcode.focus();
that.scanFormData.barcode = null;
}
- that.$notify({ type: 'success', message: json.message });
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
that.$refs.barcode.focus();
});
- }
+ },
+ getChaiFen() {
+ //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (that.scanFormData.itemOutNo.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.scanInfo.splitNum * 1 <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.scanFormData.barcode.length * 1 <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ //that.ip = "";
+ //that.prot = "";
+ //that.getPrintInfo();
+
+ //if (that.ip.length <= 0 || that.prot.length <= 0) {
+ // alert(that.ip);
+ // alert(that.prot);
+ // return;
+ //}
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesCgthSq/ScanCodeCF', {
+ billNo: that.scanFormData.itemOutNo,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanFormData.barcode,
+ Num: that.scanInfo.splitNum,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.scanInfo.splitNum = null;
+ that.scanFormData.quantity = null;
+ that.scanFormData.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.getItem();
+ //that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
+
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
}
})
\ No newline at end of file
--
Gitblit v1.9.3