From 7470b2a50a3579bff1f7cb4402f9a759190708fe Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 24 五月 2025 08:13:34 +0800
Subject: [PATCH] 1.内箱核对优化 2.
---
H5/Js/Cpbdsj.js | 58 +++++++++++++++++++++++------
H5/Cpdbsj.aspx | 11 +++--
2 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 4764a29..66f9f12 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -155,6 +155,7 @@
<van-button
type="warning"
class="action-button reset-button"
+<%-- @click.native="handleClear"--%>
>閲嶇疆</van-button>
<van-button
type="info"
@@ -172,7 +173,7 @@
<van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
<van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
<van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
+ <van-col span="3" >閲嶉噺</van-col>
</van-row>
<van-row
v-for="(itm,index) in XbarInfo"
@@ -186,7 +187,7 @@
<van-col span="7" class="text-left padding-left">
<div>{{itm.item_model}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.weight}}</van-col>
</van-row>
</van-tab>
@@ -195,7 +196,7 @@
<van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
<van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
<van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
+ <van-col span="3" >閲嶉噺</van-col>
</van-row>
<van-row v-for="(itm,index) in KbBarMxInfo" :key="index">
<van-col span="7" class="text-left padding-left" >{{itm.iteM_BARCODE}}</van-col>
@@ -207,7 +208,7 @@
<div>{{itm.item_model}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="3" class="blue-text">{{itm.weight}}</van-col>
</van-row>
</van-tab>
</van-tabs>
@@ -219,5 +220,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=121111114 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=1211111141 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index ed2086c..e6e21c6 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -15,7 +15,17 @@
KbBarMxInfo: [],
GX: "G007:鏍稿閫佹",
Xvalue:4,
- XbarInfo: [],
+ XbarInfo: [
+ //{
+ // iteM_BARCODE: "", // 鏉＄爜
+ // item_no: "", // 鐗╂枡缂栧彿
+ // item_name: "", // 鐗╂枡鍚嶇О
+ // item_model: "", // 瑙勬牸鍨嬪彿
+ // quantity: 0, // 鏁伴噺
+ // is_hedui: "0", // 鏄惁鏍稿(1:宸叉牳瀵� 0:鏈牳瀵�),
+ // weight: "" // 浜у搧閲嶉噺
+ //}
+ ],
DAA001: [],
}
},
@@ -131,8 +141,6 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
});
},
-
-
productBinding() {
if (this.isLoading) {
@@ -204,15 +212,37 @@
if (matchedItem.is_hedui === "1") {
that.$toast("宸叉牳瀵�");
} else {
- that.$set(matchedItem, 'is_hedui', "1");
- that.$playSound('success');
- that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
- that.LsBar = "";
- // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
- const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
- if (allChecked && that.XbarInfo.length > 0) {
- that.submitAllChecked();
- }
+
+ that.AxiosHttp("post", 'Womdaa/GetWeightByXt', {
+ LsBar: that.LsBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ var weigth = json.data.tbBillList.weight;
+ that.$set(matchedItem, 'is_hedui', "1");
+ that.$set(matchedItem, 'weight', weigth);
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
+ that.LsBar = "";
+ // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
+ const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
+ if (allChecked && that.XbarInfo.length > 0 && that.XbarInfo.length === that.Xvalue) {
+ that.submitAllChecked();
+ }
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ });
}
} else {
that.$playSound('error');
@@ -222,6 +252,10 @@
that.LsBar = ""; // 娓呯┖杈撳叆妗�
},
+ GetWeightByXt() {
+
+ },
+
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
submitAllChecked() {
--
Gitblit v1.9.3