From 5046056a0860ee978af022154aab430d4347ca52 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 10:38:24 +0800
Subject: [PATCH] 11
---
H5/Js/PurchaseReturn.js | 109 ++++++++--
H5/Js/Xsck.js | 41 ++-
H5/Cpdbsj.aspx | 15 +
H5/Qtck.aspx | 2
H5/Xsck.aspx | 12 +
Scripts/config.js | 4
H5/Dbrk.aspx | 2
H5/Js/Wwll.js | 138 +++++++++++++
H5/Js/Dbrk.js | 6
H5/Js/Qtck.js | 8
H5/Js/Cpbdsj.js | 51 +++++
H5/PurchaseReturn.aspx | 40 +++
H5/Wwll.aspx | 154 +++++++++++---
13 files changed, 486 insertions(+), 96 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 3d63ea6..8f38866 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -159,6 +159,17 @@
</template>
</van-field>
+
+ <van-field
+ ref="AgvDw"
+ v-model="AgvDw"
+ label="鐐逛綅"
+ placeholder="璇烽�夋嫨鐐逛綅"
+ autofocus="true"
+ @click.native="selectDW"
+ readonly>
+ </van-field>
+
<van-field
ref="xtName"
v-model="xtName"
@@ -199,6 +210,8 @@
</div>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
+ <van-action-sheet v-model="showAgvDw" :actions="actionsAgvDw" @select="onSelectAgvDw" ></van-action-sheet>
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="绠辨槑缁�" class="mySolid font">
@@ -253,5 +266,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=12111111421514 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=1212111421525 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Dbrk.aspx b/H5/Dbrk.aspx
index 69a8c80..911eaea 100644
--- a/H5/Dbrk.aspx
+++ b/H5/Dbrk.aspx
@@ -152,5 +152,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Dbrk.js?<%=1141111 %>"></script>
+ <script src="Js/Dbrk.js?<%=1141112 %>"></script>
</asp:Content>
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index e2fa8a3..329bdf8 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -32,7 +32,10 @@
actions: [],//鍒楄〃鐨勫��
xtName: "",//绾夸綋鍚嶇О
xtNum: "",//绾夸綋缂栧彿
+ AgvDw: "",//AGV鐐逛綅
agvChecked: false,//鏄惁鍕鹃�堿GV
+ showAgvDw: false,//鐐逛綅灞曠ず
+ actionsAgvDw: [],//鍒楄〃AGV鐐逛綅
}
},
mounted() {
@@ -43,6 +46,17 @@
};
},
methods: {
+ handleAgvPositions(positionStr) {
+ if (!positionStr) return [];
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿锛屽鏋滀笉瀛樺湪鍒欒繑鍥炵┖鏁扮粍
+ if (!positionStr.includes(',')) return [];
+
+ // 灏嗗瓧绗︿覆鎸夐�楀彿鍒嗗壊骞惰浆鎹负閫夐」鏁扮粍
+ return positionStr.split(',').map(pos => ({
+ name: pos.trim() // 鍘婚櫎鍙兘鐨勭┖鏍�
+ }));
+ },
getKbBarInfo() {
var that = this;
that.isLoading = true;
@@ -52,13 +66,31 @@
}, false)
.then(function (res) {
var json = res;
+
if (json.status == 0) {
+ console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
that.DAA001 = that.KbBarInfo.daA001;
that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
that.$refs.XBar.focus();
that.XbarInfo = [];
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿
+ //const agvPosition = json.data.tbBillList.kbBarInfo[0].agvPostion;
+ //that.AgvDw = agvPosition.includes(',') ? agvPosition.split(',')[0] : '';
+ const agvPostion = json.data && json.data.tbBillList && json.data.tbBillList.kbBarInfo &&
+ json.data.tbBillList.kbBarInfo[0] && json.data.tbBillList.kbBarInfo[0].agvPostion;
+
+ if (agvPostion != null) {
+ const agvPostionStr = String(agvPostion);
+ that.AgvDw = agvPostionStr.split(',')[0];
+ that.actionsAgvDw = that.handleAgvPositions(agvPostionStr);
+ } else {
+ that.AgvDw = null;
+ that.actionsAgvDw = null;
+ }
+
}
else {
that.$playSound('error');
@@ -371,6 +403,16 @@
this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
this.show = false;
},
+
+ onSelectAgvDw(action) {
+ this.AgvDw = action.name;
+ this.showAgvDw = false;
+ },
+
+ selectDW() {
+ this.showAgvDw = true;
+ },
+
//鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
selectXt() {
this.show = true;
@@ -435,6 +477,12 @@
that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
return;
}
+
+ if (!that.AgvDw) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨AGV鐐逛綅");
+ return;
+ }
// 璁＄畻鍙鏁板拰宸茶鏁�
const oldqty = +(that.KbBarInfo.quantity || 0);
@@ -449,7 +497,8 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
KbBar: that.KbBar,
- userAccount: that.userInfo.loginAccount
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
}, false)
.then(function (res) {
var json = res;
diff --git a/H5/Js/Dbrk.js b/H5/Js/Dbrk.js
index 37ae208..7cc93b8 100644
--- a/H5/Js/Dbrk.js
+++ b/H5/Js/Dbrk.js
@@ -86,7 +86,7 @@
//that.ItemBlDetail = json.data.tbBillList;
that.ItemDetail = json.data.tbBillList;
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
}
else {
that.$toast.fail(json.message);
@@ -130,7 +130,7 @@
else {
that.$toast.fail(json.message);
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
}
})
@@ -139,7 +139,7 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
//console.log(error);
that.$refs.sectionCode.focus();
- that.sectionCode = "";
+ //that.sectionCode = "";
});
},
getBarcode() {
diff --git a/H5/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index cf35b11..6c39c84 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -26,13 +26,21 @@
messageCenter: {},
messageId: 0,
- show: false,
-
scanInfo: { barcodeNum: "", splitNum: "", barcode: "" },
ip: "",
port: "",
oldBarInfo: [],
cfBarInfo: [],
+
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+ // 褰撳墠閫変腑琛岀殑绱㈠紩
+ currentIndex: -1,
+ // 瀛樺偍閫変腑琛屾暟鎹璞�
+ selItem: {},
+ ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -45,20 +53,78 @@
//that.show = false;
},
methods: {
- getItemOutNo() {
- var that = this;
+ /**
+ * 澶勭悊琛岀偣鍑讳簨浠讹紙鍗曢�夐�昏緫锛�
+ * @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", 'MesCgthSq/GetMesCgthSq', {
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'CGCK',
+ billNo:that.scanFormData.itemOutNo
}, 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 = [];
+ });
+ },
+ getItemOutNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesCgthSq/GetMesCgthSq', {}, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
that.itemOutNoList = json.data.tbBillList;
- that.itemOutNoStr = that.itemOutNoList.map(s => {
- return { name: s.billNo }
- });
- that.show = true;
+ if (!Array.isArray(that.itemOutNoList) || that.itemOutNoList.length === 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.show = false;
+ }
+ else {
+ that.itemOutNoStr = that.itemOutNoList.map(s => ({ name: s }));
+ that.show = true;
+ }
}
else {
that.$playSound('error');
@@ -100,38 +166,27 @@
},
onSelect(item) {
- // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
- // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
-
- //let staf = this.stafList.filter(it => it.staffName === item.name);
-
this.scanFormData.itemOutNo = item.name;
-
- let itemOut = this.itemOutNoList.filter(it => it.billNo == item.name);
-
- this.invItemOutId = itemOut[0].id;
-
+ this.invItemOutId = item.name;
+ this.ItemBarKw = []; // 閫夋嫨鐢宠鍗曞彿鍚庢竻绌哄簱浣嶅垪琛�
this.getItem();
-
},
getItem() {
var that = this;
that.isLoading = true;
-
- let itemOut = this.itemOutNoList.filter(it => it.billNo == that.scanFormData.itemOutNo);
-
- //this.invItemOutId = itemOut[0].id;
-
that.AxiosHttp("post", 'MesCgthSq/GetSumItem', {
- //id: that.invItemOutId,
billNo: that.scanFormData.itemOutNo,
barcode: that.scanFormData.barcode,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemDetail = json.data.tbBillList;
+ that.ItemDetail = {
+ items: json.data.tbBillList.items,
+ ysitems: json.data.tbBillList.ysitems,
+ allList: json.data.tbBillList.allList
+ };
that.$refs.barcode.focus();
}
else {
diff --git a/H5/Js/Qtck.js b/H5/Js/Qtck.js
index f20be07..0c92e46 100644
--- a/H5/Js/Qtck.js
+++ b/H5/Js/Qtck.js
@@ -56,9 +56,11 @@
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
itemId: that.selItem.itemid,
- userName: that.userInfo.loginAccount
+ userName: that.userInfo.loginAccount,
+ type: 'QTCK',
+ billNo: that.billNo
}, false)
.then(function (res) {
var json = res;
@@ -124,6 +126,8 @@
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemBlDetailByBillNo();
//this.$toast(item.name);
diff --git a/H5/Js/Wwll.js b/H5/Js/Wwll.js
index e359115..0e89c82 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.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);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ 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/Xsck.js b/H5/Js/Xsck.js
index 7853b44..2f6ba4c 100644
--- a/H5/Js/Xsck.js
+++ b/H5/Js/Xsck.js
@@ -23,6 +23,7 @@
ItemDetail: [],
ItemBarKw: [],
currentIndex: -1,
+ zdy: "",
}
},
mounted() {
@@ -56,9 +57,11 @@
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/GetBarKwByItem', {
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
itemId: that.selItem.itemid,
- userName: that.userInfo.loginAccount
+ userName: that.userInfo.loginAccount,
+ //type: 'XSCK',
+ //billNo: that.billNo
}, false)
.then(function (res) {
var json = res;
@@ -125,6 +128,9 @@
this.show = false;
this.billNo = item.name;
+
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemDetailByBillNo();
//this.$toast(item.name);
@@ -141,6 +147,7 @@
var json = res;
if (json.status == 0) {
that.ItemBlDetail = json.data.tbBillList;
+ that.zdy = json.data.tbBillList.allList[0].createNmae;
//that.daa001 = json.data.tbBillList.item1;
that.$refs.barcode.focus();
}
@@ -157,7 +164,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
//console.log(error);
- tthat.$refs.billNo.focus();
+ that.$refs.billNo.focus();
that.billNo = "";
that.daa001 = "";
that.ItemBlDetail = [];
@@ -184,7 +191,7 @@
}
if (!that.billNo) {
- this.$toast.fail("鍙戣揣閫氱煡鍗曞彿涓嶈兘涓虹┖");
+ this.$toast.fail("鐢宠鍗曞彿涓嶈兘涓虹┖");
that.isLoading = false;
return;
}
@@ -199,7 +206,8 @@
that.AxiosHttp("post", 'MesXsck/XSCKScanBarcode', {
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- daa001: that.billNo,
+ daa001: that.daa001,
+ billNo: that.billNo,
//type: selectType
}, false)
.then(function (res) {
@@ -219,8 +227,12 @@
} else if (json.status == 2) {
that.$refs.splitNum.focus();
- that.splitNum = json.data.cfNum;
- that.num = json.data.num;
+ that.splitNum = json.data.tbBillList.splitNum; // 鎷嗗垎鏁伴噺
+ that.num = json.data.tbBillList.barcodeNum; // 鏉＄爜鏁伴噺
+ that.daa001 = json.data.tbBillList.daa001; // 宸ュ崟鍙�
+ if (json.data.tbBillList.billNo) {
+ that.billNo = json.data.tbBillList.billNo;
+ } // 鍙戣揣閫氱煡鍗曞彿锛屽彧鍦ㄦ湁鍊兼椂璧嬪��
}
else {
that.$toast.fail(json.message);
@@ -261,16 +273,16 @@
}
if (!that.billNo) {
- this.$toast.fail("琛ユ枡鍗曞彿涓嶈兘涓虹┖");
+ this.$toast.fail("鍙戣揣鍗曞彿涓嶈兘涓虹┖");
that.isLoading = false;
return;
}
- if (!that.daa001) {
- this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
- that.isLoading = false;
- return;
- }
+ //if (!that.daa001) {
+ // this.$toast.fail("宸ュ崟鍙蜂笉鑳戒负绌�");
+ // that.isLoading = false;
+ // return;
+ //}
if (!that.splitNum) {
this.$toast.fail("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
@@ -281,7 +293,8 @@
that.AxiosHttp("post", 'MesXsck/SplitBarcode', {
userName: that.userInfo.loginAccount,
barcode: that.barcode,
- daa001: that.billNo,
+ daa001: that.daa001,
+ billNo: that.billNo,
num: that.splitNum,
//type: selectType
}, false)
diff --git a/H5/PurchaseReturn.aspx b/H5/PurchaseReturn.aspx
index c82f946..92dbe7d 100644
--- a/H5/PurchaseReturn.aspx
+++ b/H5/PurchaseReturn.aspx
@@ -8,6 +8,12 @@
</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>
+
<div class="content-wrapper">
<van-nav-bar
title="閲囪喘閫�鏂�"
@@ -41,7 +47,7 @@
<%--@change="SaveBarCodes"--%>
></van-field>
<van-field
- v-model="scanFormData.itemNo"
+ v-model="scanFormData.itemid"
label="鐗╂枡缂栫爜"
placeholder="鐗╂枡缂栫爜"
disabled
@@ -70,7 +76,7 @@
</van-field>
</van-cell-group>
</div>
- <van-tabs color="#000" title-active-color="#0283EF">
+ <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>
@@ -78,7 +84,12 @@
<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-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>
@@ -91,6 +102,25 @@
</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>
@@ -100,7 +130,7 @@
</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 class="blue-text">{{itm.itemid}}</div>
<div>{{itm.itemName}}</div>
</van-col>
<van-col span="8" class="text-left padding-left">
@@ -123,5 +153,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/PurchaseReturn.js?<%=1281111111 %>"></script>
+ <script src="Js/PurchaseReturn.js?<%=1281111233 %>"></script>
</asp:Content>
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index ccd6fe9..b450565 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -165,5 +165,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Qtck.js?<%=111306 %>"></script>
+ <script src="Js/Qtck.js?<%=111307 %>"></script>
</asp:Content>
diff --git a/H5/Wwll.aspx b/H5/Wwll.aspx
index 14a854a..ad6a420 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?<%=123263 %>"></script>
</asp:Content>
diff --git a/H5/Xsck.aspx b/H5/Xsck.aspx
index 69404d7..5a7f560 100644
--- a/H5/Xsck.aspx
+++ b/H5/Xsck.aspx
@@ -47,6 +47,16 @@
v-model="barcode"
v-focus.noKeyboard
></van-field>
+ <van-field
+ value=""
+ label="鍒跺崟浜�"
+ clearable
+ placeholder="鍒跺崟浜�"
+ :right-icon-size="19"
+ v-model="zdy"
+ v-focus.noKeyboard
+ disabled
+></van-field>
<van-field
value=""
v-model="num"
@@ -141,5 +151,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xsck.js?<%=12711113 %>"></script>
+ <script src="Js/Xsck.js?<%=12711114 %>"></script>
</asp:Content>
diff --git a/Scripts/config.js b/Scripts/config.js
index 057b226..8440d06 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,5 +1,5 @@
-锘縱ar APIURL = "http://192.168.0.51:8183/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級
-var APIURL_PC = "http://192.168.0.51:8181/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級
+锘縱ar APIURL = "http://192.168.0.51:8083/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級
+var APIURL_PC = "http://192.168.0.51:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
--
Gitblit v1.9.3