From 4020252f4f450af57a671d27b418077c55ba5c8a Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 20 二月 2025 14:51:16 +0800
Subject: [PATCH] 1.委外领料完成 2.委外补料除拆分功能已完成 3.生产领料界面优化
---
H5/Js/Wwll.js | 32 ++++++++++++++++++++++++++------
H5/Scll.aspx | 2 +-
H5/Js/Wwbl.js | 8 ++++----
H5/Wwll.aspx | 16 +++++++++-------
4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/H5/Js/Wwbl.js b/H5/Js/Wwbl.js
index 2e9c9bc..92b26bf 100644
--- a/H5/Js/Wwbl.js
+++ b/H5/Js/Wwbl.js
@@ -139,10 +139,10 @@
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.ItemBlDetail = json.data.tbBillList.pendingList
+ //that.barcode = json.data.tbBillList.item.barcode;
+ //that.sms = json.data.tbBillList.item.fum;
+ //that.num = json.data.tbBillList.item.num;
+ //that.ItemBlDetail = json.data.tbBillList.pendingList
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
}
else {
diff --git a/H5/Js/Wwll.js b/H5/Js/Wwll.js
index 105b2a4..e359115 100644
--- a/H5/Js/Wwll.js
+++ b/H5/Js/Wwll.js
@@ -30,10 +30,12 @@
var json = res;
if (json.status == 0) {
that.modeInfo = json.data.tbBillList;
+ that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
}
that.isLoading = false;
})
@@ -42,12 +44,13 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
that.$refs.daa001.focus();
+ that.modeInfo.daa001 = "";
});
},
getScan() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
- that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$toast.fail("濮斿宸ュ崟涓嶈兘涓虹┖锛�");
return;
}
that.isLoading = true;
@@ -60,13 +63,21 @@
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.$notify({ type: 'success', message: json.message });
that.isLoading = false;
})
.catch(function (error) {
@@ -79,7 +90,7 @@
getChaiFen() {
var that = this;
if (that.modeInfo.daa001.length <= 0) {
- that.$toast.fail("棰嗘枡鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$toast.fail("濮斿宸ュ崟鍙蜂笉鑳戒负绌猴紒");
return;
}
if (that.scanInfo.splitNum * 1 <= 0) {
@@ -91,18 +102,26 @@
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'WwGd/ScanCode', {
+ that.AxiosHttp("post", 'WwGd/ScanCodeCF', {
daa001: that.modeInfo.daa001,
userName: that.userInfo.loginAccount,
- barcode: that.modeInfo.barcode,
+ 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.modeInfo = json.data.tbBillList;
+ that.$notify({ type: 'success', message: json.message });
+ 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;
})
@@ -110,6 +129,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
+ that.$refs.splitNum.focus();
});
},
}
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 610cdd7..8e7e0e4 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -56,7 +56,7 @@
center
clearable
label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺" required
+ placeholder="鍙戞枡鏁伴噺"
>
<van-button slot="button" type="info" size="small" plain @click="getChaiFen">
鏉＄爜鎷嗗垎
diff --git a/H5/Wwll.aspx b/H5/Wwll.aspx
index 58e7114..14a854a 100644
--- a/H5/Wwll.aspx
+++ b/H5/Wwll.aspx
@@ -14,17 +14,18 @@
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <div class="mySolid">
+ <%--<div class="mySolid">--%>
<van-cell-group>
<van-field
ref="daa001"
v-model="modeInfo.daa001"
- label="棰嗘枡鍗曞彿"
+ label="濮斿宸ュ崟"
clearable
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-focus.noKeyboard
- @change="getModel" autofocus="true"
+ @keyup.enter.native="getModel"
+ autofocus="true"
></van-field>
<van-field
v-model="modeInfo.planNo"
@@ -42,7 +43,7 @@
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-focus.noKeyboard
- @change="getScan"
+ @keyup.enter.native="getScan"
></van-field>
<van-field
v-model="scanInfo.barcodeNum"
@@ -51,18 +52,19 @@
disabled
></van-field>
<van-field
+ ref="splitNum"
v-model="scanInfo.splitNum"
center
clearable
label="鍙戞枡鏁伴噺"
- placeholder="鍙戞枡鏁伴噺" required
+ placeholder="鍙戞枡鏁伴噺"
>
<van-button slot="button" type="info" size="small" plain @click="getChaiFen">
鏉＄爜鎷嗗垎
</van-button>
</van-field>
</van-cell-group>
- </div>
+ <%-- </div>--%>
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呭彂鐗╂枡" class="mySolid font">
<van-row>
@@ -101,5 +103,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwll.js?<%=12322 %>"></script>
+ <script src="Js/Wwll.js?<%=12324 %>"></script>
</asp:Content>
--
Gitblit v1.9.3