From 19f3fef4eeb16c13f425bef9f0485d4cc1c3271d Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 11 十二月 2025 13:22:08 +0800
Subject: [PATCH] 同步蓝宝委外(2025-12-11)
---
H5/Wwbl.aspx | 10
H5/Wwllhb.aspx.cs | 14
H5/Wwtl.aspx | 17
H5/Js/Wwck.js | 284 ++++++++++++
H5/Js/Wwcl.js | 6
H5/Wwck.aspx.cs | 14
H5/Wwck.aspx | 188 ++++++++
H5/Js/Wwll.js | 138 +++++
H5/Js/Wwllhb.js | 367 +++++++++++++++
H5/Js/Wwbl.js | 9
H5/Wwll.aspx | 154 +++++-
H5/Wwllhb.aspx | 133 +++++
H5/Wwcl.aspx | 20
13 files changed, 1,296 insertions(+), 58 deletions(-)
diff --git a/H5/Js/Wwbl.js b/H5/Js/Wwbl.js
index d871eea..7f3c993 100644
--- a/H5/Js/Wwbl.js
+++ b/H5/Js/Wwbl.js
@@ -86,7 +86,8 @@
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList.item2;
+ that.ItemBlDetail = json.data.tbBillList.items;
+ console.log(that.ItemBlDetail);
that.daa001 = json.data.tbBillList.daa001;
that.$refs.barcode.focus();
}
@@ -159,9 +160,9 @@
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
that.GetMesItemBlDetailByBillNo();
that.$refs.barcode.focus();
- that.barcode = "";
- that.num = "";
- that.splitNum = "";
+ that.barcode = json.data.success.barcode;
+ that.sms = json.data.success.fum;
+ that.num = json.data.success.num;
}
else if (json.status == 2) {
that.$refs.splitNum.focus();
diff --git a/H5/Js/Wwck.js b/H5/Js/Wwck.js
new file mode 100644
index 0000000..4fc0791
--- /dev/null
+++ b/H5/Js/Wwck.js
@@ -0,0 +1,284 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ modeInfo: { daa001: "", planNo: "" },
+ scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ItemDetail: [],
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ type: "",
+ cfBarInfo: [],
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
+ billno:"",
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ this.type = this.Request("type");
+ selectType = this.type == "bl" ? selectType = "濮斿琛ユ枡" : selectType = "濮斿瓒呴";
+ },
+ methods: {
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,//椹煎嘲鍛藉悕娉�
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ //鑾峰彇搴撲綅淇℃伅
+ GetBarKwByItem() {
+ //Womdaa
+ //WwGd
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+
+ getModel() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetItemsByWwckNo', {
+ daa001: that.billno,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
+ that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.modeInfo.startTime = json.data.tbBillList.startTime;
+ that.modeInfo.daa001 = json.data.tbBillList.allList[0].daA001;
+ that.$refs.barcode.focus();
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ that.currentIndex = -1;
+ that.ItemBarKw = [];
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
+ that.modeInfo.planNo = "";
+ that.modeInfo.startTime = "";
+ that.ItemDetail = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
+ });
+ },
+ //鎵爜
+ getScan() {
+ var that = this;
+ if (this.isLoading) {
+ return;
+ }
+ if (that.modeInfo.daa001.length <= 0) {
+ that.$toast.fail("濮斿宸ュ崟涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/WwckScanCode', {
+ daa001: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.barcode,
+ blNo: that.billno,
+ type: selectType,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.scanInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.getModel();
+ that.$refs.barcode.focus();
+ that.scanInfo.barcode = null;
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.scanInfo.splitNum = json.data.tbBillList.splitNum;
+ that.scanInfo.barcodeNum = json.data.tbBillList.barcodeNum;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ }
+ //that.$notify({ type: 'success', message: json.message });
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.barcode.focus();
+ });
+ },
+ //鎷嗗垎
+ getChaiFen() {
+ if (this.isLoading) {
+ return;
+ }
+ var that = this;
+ if (that.modeInfo.daa001.length <= 0) {
+ that.$toast.fail("濮斿宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ return;
+ }
+ if (that.scanInfo.splitNum * 1 <= 0) {
+ that.$toast.fail("鎷嗗垎鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (that.scanInfo.barcode.length * 1 <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ return;
+ }
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/WwckScanCodeCF', {
+ daa001: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.barcode,
+ Num: that.scanInfo.splitNum,
+ blNo: that.billno,
+ type: selectType,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.modeInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.sendPrintMessage(json.data.tbBillList);
+ that.getModel();
+ that.$refs.barcode.focus();
+ that.scanInfo.barcode = null;
+ that.scanInfo.barcodeNum = "";
+ that.scanInfo.splitNum = "";
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.splitNum.focus();
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ that.$refs.splitNum.focus();
+ });
+ },
+ //鑾峰彇宸ュ崟淇℃伅
+ getInfo() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetWWCKsq', {//WwGd/GetXcslDaa
+ type: selectType,
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
+ };
+ });
+ }
+ }
+ 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);
+ });
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+
+ this.billno = item.name;
+ this.getModel();
+ //this.$toast(item.name);
+ },
+ }
+})
\ No newline at end of file
diff --git a/H5/Js/Wwcl.js b/H5/Js/Wwcl.js
index f5ea47e..472a690 100644
--- a/H5/Js/Wwcl.js
+++ b/H5/Js/Wwcl.js
@@ -138,9 +138,9 @@
var json = res;
if (json.status == 0) {
- that.barcode = json.data.tbBillList.item.barcode;
- that.sms = json.data.tbBillList.item.fum;
- that.num = json.data.tbBillList.item.num;
+ that.barcode = json.data.success.barcode;
+ that.sms = json.data.success.fum;
+ that.num = json.data.success.num;
that.ItemBlDetail = json.data.tbBillList.pendingList
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
}
diff --git a/H5/Js/Wwll.js b/H5/Js/Wwll.js
index e359115..fe3c6ce 100644
--- a/H5/Js/Wwll.js
+++ b/H5/Js/Wwll.js
@@ -9,6 +9,20 @@
},
modeInfo: { daa001: "", planNo: "" },
scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ItemDetail: [],
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ cfBarInfo: [],
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -19,6 +33,61 @@
};
},
methods: {
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @param {Object} item 褰撳墠琛屾暟鎹�
+ * @param {Number} index 褰撳墠琛岀储寮�
+ */
+ handleRowClick(item, index) {
+ if (this.isLoading) {
+ return;
+ }
+
+ // 閲嶇疆鎵�鏈夎鐨勯�変腑鐘舵��
+ this.currentIndex = -1;
+
+ // 璁剧疆褰撳墠閫変腑琛�
+ this.currentIndex = index;
+ this.selItem = {
+ itemid: item.itemId,//椹煎嘲鍛藉悕娉�
+ index: index
+ };
+
+ console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
+
+ this.GetBarKwByItem();
+ },
+ //鑾峰彇搴撲綅淇℃伅
+ GetBarKwByItem() {
+ //Womdaa
+ //WwGd
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.ItemBarKw = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.ItemBarKw = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.ItemBarKw = [];
+ });
+ },
+
getModel() {
var that = this;
that.isLoading = true;
@@ -29,13 +98,20 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.modeInfo = json.data.tbBillList;
+ that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
+ that.modeInfo.planNo = json.data.tbBillList.planNo;
+ that.modeInfo.startTime = json.data.tbBillList.startTime;
that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.daa001.focus();
that.modeInfo.daa001 = "";
+ that.modeInfo.planNo = "";
+ that.modeInfo.startTime = "";
+ that.ItemDetail = [];
}
that.isLoading = false;
})
@@ -47,6 +123,7 @@
that.modeInfo.daa001 = "";
});
},
+ //鎵爜
getScan() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
@@ -87,6 +164,7 @@
that.$refs.barcode.focus();
});
},
+ //鎷嗗垎
getChaiFen() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
@@ -132,5 +210,63 @@
that.$refs.splitNum.focus();
});
},
+ //鑾峰彇宸ュ崟淇℃伅
+ getInfo() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'WwGd/GetXcslDaa', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.daA021
+ };
+ });
+ }
+ }
+ 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);
+ });
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ const regex = /\[([^\]]+)\]/;
+ const matchResult = item.name.match(regex);
+
+ if (matchResult && matchResult[1]) {
+ this.modeInfo.daa001 = matchResult[1]; // PPBOM00000088-1
+ console.log('鎻愬彇鐨凞AA001:', this.modeInfo.daa001);
+ } else {
+ this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ this.modeInfo.daa001 = '';
+ }
+ this.getModel();
+ //this.$toast(item.name);
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/Wwllhb.js b/H5/Js/Wwllhb.js
new file mode 100644
index 0000000..83ae237
--- /dev/null
+++ b/H5/Js/Wwllhb.js
@@ -0,0 +1,367 @@
+锘縱ar vm = new Vue({
+ el: '#app',
+ data: function () {
+ return {
+ isLoading: false,
+ userInfo: {
+ "loginGuid": '',
+ "loginAccount": '',
+ },
+ modeInfo: { daa001: "", planNo: "" },
+ scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
+ ItemDetail: [],
+ ip: "",
+ port: "",
+ oldBarInfo: [],
+ cfBarInfo: [],
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ //isPrinterPopupVisible: false, // 鎺у埗寮圭獥鏄剧ず/闅愯棌
+ //selectedPrinter: '', // 褰撳墠閫夋嫨鐨勬墦鍗版満缂栧彿
+ //printerList: [
+ // { printerId: 'Printer1', ipAddress: '192.168.1.1' },
+ // { printerId: 'Printer2', ipAddress: '192.168.1.2' },
+ // { printerId: 'Printer3', ipAddress: '192.168.1.3' }
+ //], // 鎵撳嵃鏈哄垪琛�
+ }
+ },
+ mounted() {
+ var that = this;
+ this.userInfo = {
+ loginGuid: this.GetLoginInfor().loginGuid,
+ loginAccount: this.GetLoginInfor().loginAccount,
+ };
+ },
+ methods: {
+ getModel() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Wwgdhb/GetItemsByDaa001', {
+ hbNo: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+
+ if (json.status == 0) {
+ 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 = "";
+ that.ItemDetail = [];
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
+ });
+ },
+ getScan() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ 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;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Wwgdhb/ScanCode', {
+ hbNo: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.barcode,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ // that.scanInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+ that.getModel();
+ that.$refs.barcode.focus();
+ that.scanInfo.barcode = null;
+ }
+ 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;
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.$refs.barcode.focus();
+ }
+
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ that.$refs.barcode.focus();
+ });
+ },
+ getChaiFen() {
+ //this.isPrinterPopupVisible = true; // 鏄剧ず寮圭獥
+
+ if (this.isLoading) {
+ return;
+ }
+
+ 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 = "";
+ //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", 'Wwgdhb/ScanCodeCF', {
+ hbNo: that.modeInfo.daa001,
+ userName: that.userInfo.loginAccount,
+ barcode: that.scanInfo.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.scanInfo.barcodeNum = null;
+ that.scanInfo.barcode = null;
+ that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
+
+ //that.sendMessage(json.data.tbBillList);
+
+ that.$refs.barcode.focus();
+ that.getModel();
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ });
+ },
+
+
+ sendMessage(tbBillList) {
+ const cfDetails = tbBillList.cfBarInfo.map(item => {
+ return "! 0 200 200 210 1\r\n" +
+ "PAGE - WIDTH 700 \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";
+ });
+ //alert(cfDetails);
+ let sendData = {
+ Type: 'Bar',
+ Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
+ Detail: cfDetails,
+ Ip: tbBillList.printInfo[0].ip,
+ Port: tbBillList.printInfo[0].port,
+ }
+ console.log('sendMessage 寮�濮�1:')
+ console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
+
+ //getPrintInfo() {
+ // var that = this;
+
+ // that.AxiosHttp("post", 'MesPrint/getPrintInfo', {
+ // userName: that.userInfo.loginAccount,
+ // }, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+ // alert(json.data.tbBillList[0].port);
+ // alert(json.data.tbBillList[0].ip);
+ // that.port = json.data.tbBillList[0].port;
+ // that.ip = json.data.tbBillList[0].ip;
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // that.$playSound('error');
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // });
+
+ //},
+ //printCfBar(cfBar) {
+ // var that = this;
+
+ // that.AxiosHttp("post", 'MesPrint/getCfInfo', {
+ // userName: that.userInfo.loginAccount,
+ // cfBar: cfBar,
+ // oldBar: that.scanInfo.barcode
+ // }, false)
+ // .then(function (res) {
+ // var json = res;
+ // if (json.status == 0) {
+ // that.$notify({ type: 'success', message: '鎵撳嵃璇锋眰宸插彂閫�' });
+ // that.$playSound('success');
+ // }
+ // else {
+ // that.$toast.fail(json.message);
+ // that.$playSound('error');
+ // }
+ // that.isLoading = false;
+ // })
+ // .catch(function (error) {
+ // that.isLoading = false;
+ // that.$toast.fail("鎵撳嵃鏈嶅姟寮傚父锛�" + error.message);
+ // that.$playSound('error');
+ // });
+ //},
+
+
+ //鎵撳嵃鏈烘敞閲�
+ //selectPrinter(printer) {
+ // this.selectedPrinter = printer.printerId; // 鏇存柊閫変腑鐨勬墦鍗版満缂栧彿
+ //},
+ //confirmSelection() {
+ // if (this.selectedPrinter) {
+ // alert(`鎮ㄩ�夋嫨浜嗘墦鍗版満锛�${this.selectedPrinter}`);
+ // // 鍦ㄨ繖閲屽鐞嗛�夋嫨缁撴灉锛屼緥濡傝皟鐢ㄦ帴鍙ｆ垨鏇存柊鐘舵��
+ // this.isPrinterPopupVisible = false; // 鍏抽棴寮圭獥
+ // } else {
+ // alert('璇烽�夋嫨涓�涓墦鍗版満锛�');
+ // }
+ //},
+ //onPrinterSelected(value) {
+ // console.log('褰撳墠閫変腑鐨勬墦鍗版満缂栧彿:', value);
+ //},
+
+ //鑾峰彇宸ュ崟淇℃伅
+ getInfo() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Wwgdhb/GetXcslDaa', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo // 鎷兼帴瀛楁
+
+ };
+ });
+ }
+ }
+ 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);
+ });
+ },
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.show = false;
+ console.log(item);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ const regex = /\[([^\]]+)\]/;
+ const matchResult = item.name;
+
+ if (matchResult) {
+ this.modeInfo.daa001 = matchResult; // PPBOM00000088-1
+ console.log('鎻愬彇鐨凞AA001:', this.modeInfo.daa001);
+ } else {
+ this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ that.$playSound('error');
+ this.modeInfo.daa001 = '';
+ }
+ this.getModel();
+ //this.$toast(item.name);
+
+ },
+ }
+})
\ No newline at end of file
diff --git a/H5/Wwbl.aspx b/H5/Wwbl.aspx
index b707233..309a196 100644
--- a/H5/Wwbl.aspx
+++ b/H5/Wwbl.aspx
@@ -79,11 +79,11 @@
</van-row>
<van-row v-for="value in ItemBlDetail" class="font">
<van-col span="12" class="text-left padding-left">
- <div>{{value.bld002}}</div>
- <div>{{value.bld003}}</div>
+ <div>{{value.itemNo}}</div>
+ <div>{{value.itemName}}</div>
</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
+ <van-col span="6">{{value.dsQty}}</van-col>
+ <van-col span="6">{{value.sQty}}</van-col>
</van-row>
</van-tab>
</van-tabs>
@@ -97,5 +97,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwbl.js?<%=1441 %>"></script>
+ <script src="Js/Wwbl.js?<%=1444 %>"></script>
</asp:Content>
diff --git a/H5/Wwck.aspx b/H5/Wwck.aspx
new file mode 100644
index 0000000..9492495
--- /dev/null
+++ b/H5/Wwck.aspx
@@ -0,0 +1,188 @@
+锘�<%@ Page Title="" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <style>
+ .bg-info {
+ background-color:#fff;
+ }
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
+</style>
+</asp:Content>
+
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
+ <van-nav-bar
+ :title="type=='cl'?'濮斿瓒呴':'濮斿琛ユ枡'"
+ left-text="杩斿洖"
+ left-arrow
+ @click-left="GoBack()"
+></van-nav-bar>
+
+ <div class="mySolid">
+ <van-cell-group>
+
+ <van-field
+ ref ="billno"
+ value=""
+ label="鐢宠鍗曞彿"
+ clearable
+ placeholder="璇烽�夋嫨鐢宠鍗曞彿"
+ :right-icon-size="19"
+ v-model="billno"
+ @keyup.enter.native ="getModel"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+
+ <van-field
+ ref="daa001"
+ v-model="modeInfo.daa001"
+ label="濮斿宸ュ崟"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getModel"
+ autofocus="true"
+ ></van-field>
+ <van-field
+ v-model="modeInfo.planNo"
+ label="浠诲姟鍗曞彿"
+ clearable
+ :right-icon-size="19"
+ placeholder="浠诲姟鍗曞彿"
+ disabled
+></van-field>
+
+<%-- <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>--%>
+
+ <van-field
+ ref="barcode"
+ v-model="scanInfo.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan"
+></van-field>
+ <van-field
+ v-model="scanInfo.barcodeNum"
+ 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-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <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"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, 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="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</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"><%--ItemBlDetail.ysitems--%>
+ <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>
+ </div>
+</asp:Content>
+
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
+ <comloading v-if="isLoading"></comloading>
+
+</asp:Content>
+<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
+ <script src="Js/Wwck.js?<%=105326 %>"></script>
+</asp:Content>
diff --git a/H5/Wwck.aspx.cs b/H5/Wwck.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/Wwck.aspx.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class H5_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Wwcl.aspx b/H5/Wwcl.aspx
index 2076d91..ff029cd 100644
--- a/H5/Wwcl.aspx
+++ b/H5/Wwcl.aspx
@@ -69,11 +69,19 @@
<div class="van-tab-left">
<van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
<van-tab title="寰呭彂鐗╂枡">
- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.bld002}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>
+ <van-row>
+ <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6">寰呮壂</van-col>
+ <van-col span="6">宸叉壂</van-col>
+</van-row>
+ <van-row v-for="value in ItemBlDetail" class="font">
+ <van-col span="12" class="text-left padding-left">
+ <div>{{value.itemNo}}</div>
+ <div>{{value.itemName}}</div>
+ </van-col>
+ <van-col span="6">{{value.dsQty}}</van-col>
+ <van-col span="6">{{value.sQty}}</van-col>
+ </van-row>
</van-tab>
</van-tabs>
</div>
@@ -86,5 +94,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwcl.js?<%=122 %>"></script>
+ <script src="Js/Wwcl.js?<%=123 %>"></script>
</asp:Content>
diff --git a/H5/Wwll.aspx b/H5/Wwll.aspx
index 14a854a..2c616bd 100644
--- a/H5/Wwll.aspx
+++ b/H5/Wwll.aspx
@@ -4,18 +4,43 @@
.bg-info {
background-color:#fff;
}
-
+ .org-info {
+ height: 0.5rem;
+ line-height: 0.5rem;
+ padding: 0 0.16rem;
+ }
</style>
</asp:Content>
+
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="濮斿棰嗘枡"
left-text="杩斿洖"
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <%--<div class="mySolid">--%>
+
+ <div class="mySolid">
<van-cell-group>
+
+ <van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇烽�夋嫨宸ュ崟鍙疯繘琛屾煡璇�"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+
<van-field
ref="daa001"
v-model="modeInfo.daa001"
@@ -35,6 +60,25 @@
placeholder="浠诲姟鍗曞彿"
disabled
></van-field>
+
+<%-- <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>--%>
+
<van-field
ref="barcode"
v-model="scanInfo.barcode"
@@ -59,49 +103,85 @@
label="鍙戞枡鏁伴噺"
placeholder="鍙戞枡鏁伴噺"
>
- <van-button slot="button" type="info" size="small" plain @click="getChaiFen">
- 鏉＄爜鎷嗗垎
- </van-button>
+ <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="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">寰呮壂</van-col>
- <van-col span="6">宸叉壂</van-col>
- </van-row>
- <van-row v-for="(itm,index) in modeInfo.daisao1" :key="index">
- <van-col span="12" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
- </van-col>
- <van-col span="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
- </van-row>
- </van-tab>
- <van-tab title="鐗╂枡鎬绘竻鍗�" class="mySolid font">
- <van-row>
- <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="6">闇�棰嗘暟</van-col>
- <van-col span="6">宸查鏁�</van-col>
+ </div>
+
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <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 modeInfo.totals1" :key="index">
- <van-col span="12" class="text-left padding-left">
- <div>{{itm.itemNo}}</div>
+ <!-- 澧炲姞琛岀偣鍑讳笌閫変腑楂樹寒 -->
+ <van-row
+ v-for="(itm,index) in ItemDetail.items"
+ :key="index"
+ :style="{ background: currentIndex === index ? '#87CEEB' : '' }"
+ @click.native="handleRowClick(itm, 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="6">{{itm.dab006}}</van-col>
- <van-col span="6">{{itm.dab007}}</van-col>
- </van-row>
- </van-tab>
+ </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="10" class="text-left padding-left">鏉＄爜缂栧彿</van-col>
+ <van-col span="5" class="text-left padding-left">搴撲綅</van-col>
+ <van-col span="4">鏁伴噺</van-col>
+ <van-col span="5">浠撳簱</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemBarKw" :key="index">
+ <van-col span="10" class="text-left padding-left">
+ <div class="blue-text">{{itm.iteM_BARCODE}}</div>
+ </van-col>
+ <van-col span="5" class="text-left padding-left">
+ <div>{{itm.depoT_SECTIONS_CODE}}</div>
+ </van-col>
+ <van-col span="4" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="5" >{{itm.depot_name}}</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"><%--ItemBlDetail.ysitems--%>
+ <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>
+ </div>
</asp:Content>
+
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
- <%--<comback ></comback>--%>
+
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwll.js?<%=12324 %>"></script>
+ <script src="Js/Wwll.js?<%=123265 %>"></script>
</asp:Content>
diff --git a/H5/Wwllhb.aspx b/H5/Wwllhb.aspx
new file mode 100644
index 0000000..19fe4be
--- /dev/null
+++ b/H5/Wwllhb.aspx
@@ -0,0 +1,133 @@
+锘�<%@ Page Title="濮斿棰嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Wwllhb.aspx.cs" Inherits="H5_Scll" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
+ <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
+ ref ="selectKey"
+ value=""
+ label="鍚堝苟宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇疯緭鍏ュ悎骞跺伐鍗曞彿杩涜鏌ヨ"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+ <van-field
+ ref="daa001"
+ v-model="modeInfo.daa001"
+ label="鍚堝苟鍗曞彿"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getModel"
+ autofocus="true">
+ </van-field>
+
+ <van-field
+ ref="barcode"
+ v-model="scanInfo.barcode"
+ label="鐗╂枡鏉＄爜"
+ clearable
+ placeholder="璇锋壂鐮�"
+ :right-icon-size="19"
+ v-focus.noKeyboard
+ @keyup.enter.native="getScan">
+ </van-field>
+
+ <van-field
+ v-model="scanInfo.barcodeNum"
+ 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-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <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.xcslWjsBarList" :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.xcslYjsBarList" :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>
+ </div>
+</asp:Content>
+
+<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
+ <comloading v-if="isLoading"></comloading>
+</asp:Content>
+
+<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
+ <script src="Js/Wwllhb.js?<%=1234 %>"></script>
+</asp:Content>
\ No newline at end of file
diff --git a/H5/Wwllhb.aspx.cs b/H5/Wwllhb.aspx.cs
new file mode 100644
index 0000000..f11cc1f
--- /dev/null
+++ b/H5/Wwllhb.aspx.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+public partial class H5_Scll : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/H5/Wwtl.aspx b/H5/Wwtl.aspx
index 5cc1bcf..548e033 100644
--- a/H5/Wwtl.aspx
+++ b/H5/Wwtl.aspx
@@ -80,12 +80,25 @@
<div>{{value.itemNo}}</div>
<div>{{value.itemName}}</div>
</van-col>
- <van-col span="6">鐢宠鏁皗{value.tld005}}</van-col>
- <van-col span="6">宸查鏁皗{value.tld006}}</van-col>
+ <van-col span="6">鐢宠鏁皗{value.dsQty}}</van-col>
+ <van-col span="6">宸查鏁皗{value.sQty}}</van-col>
</van-row>
</van-tab>
<van-tab title="宸查��鏄庣粏"></van-tab>
</van-tabs>
+ <van-row>
+ <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="6">寰呮壂</van-col>
+ <van-col span="6">宸叉壂</van-col>
+</van-row>
+ <van-row v-for="value in ItemTblDetail.items" class="font">
+ <van-col span="12" class="text-left padding-left">
+ <div>{{value.itemNo}}</div>
+ <div>{{value.itemName}}</div>
+ </van-col>
+ <van-col span="6">鐢宠鏁皗{value.dsQty}}</van-col>
+ <van-col span="6">宸查鏁皗{value.sQty}}</van-col>
+ </van-row>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
--
Gitblit v1.9.3