From f064c1aa85c6d778b1bedfb980ad42fcf50b63c9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 二月 2025 08:59:38 +0800
Subject: [PATCH] 1.委外退料优化 2.委外补料、超领优化
---
H5/Wwbl.aspx | 24 ++++++--
H5/Wwtl.aspx | 35 +++++++----
H5/Js/Wwbl.js | 44 ++++++++++++--
H5/Js/Wwtl.js | 22 +++---
4 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/H5/Js/Wwbl.js b/H5/Js/Wwbl.js
index 92b26bf..719f579 100644
--- a/H5/Js/Wwbl.js
+++ b/H5/Js/Wwbl.js
@@ -8,7 +8,8 @@
"loginAccount": '',
},
sms: "",
- num:"",
+ num: "",
+ type: "",
billNo:"",
daa001: "",
barcode:"",
@@ -25,6 +26,8 @@
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
};
+ this.type = this.Request("type");
+ selectType = this.type == "bl" ? selectType = "濮斿琛ユ枡" : selectType = "濮斿瓒呴";
},
methods: {
getInfo() {
@@ -33,7 +36,7 @@
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'MesItemBl/GetSCBLBillNo', {
- type: "濮斿琛ユ枡",
+ type: selectType,
}, false)
.then(function (res) {
var json = res;
@@ -77,7 +80,7 @@
that.isLoading = true;
that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
billNo: that.billNo,
- type: "濮斿琛ユ枡",
+ type: selectType,
}, false)
.then(function (res) {
var json = res;
@@ -85,21 +88,30 @@
that.ItemBlDetail = json.data.tbBillList.item2;
that.daa001 = json.data.tbBillList.item1;
+ that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.$refs.billNo.focus();
+ that.billNo = "";
+ that.daa001 = "";
+ that.ItemBlDetail = [];
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
+ //console.log(error);
+ that.$refs.billNo.focus();
+ that.billNo = "";
+ that.daa001 = "";
+ that.ItemBlDetail = [];
});
},
- getBarcode(value) {
+ getBarcode() {
- this.barcode = value;
+ //this.barcode = value;
var that = this;
that.isLoading = true;
@@ -144,16 +156,34 @@
//that.num = json.data.tbBillList.item.num;
//that.ItemBlDetail = json.data.tbBillList.pendingList
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.GetMesItemBlDetailByBillNo();
+ that.$refs.barcode.focus();
+ that.barcode = "";
+ that.num = "";
+ that.splitNum = "";
+ }
+ else if (json.status == 2) {
+ that.$refs.splitNum.focus();
+ that.splitNum = json.data.cfNum;
+ that.num = json.data.num;
}
else {
that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.barcode = "";
+ that.num = "";
+ that.splitNum = "";
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
+ //console.log(error);
+ that.$refs.barcode.focus();
+ that.barcode = "";
+ that.num = "";
+ that.splitNum = "";
});
},
tmcf() {
diff --git a/H5/Js/Wwtl.js b/H5/Js/Wwtl.js
index 5f7e6c4..a327347 100644
--- a/H5/Js/Wwtl.js
+++ b/H5/Js/Wwtl.js
@@ -59,11 +59,11 @@
console.log(error);
});
},
- onClick(index, title) {
- this.$toast(`${index} ${title}`);
- this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
+ //onClick(index, title) {
+ // this.$toast(`${index} ${title}`);
+ // this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
- },
+ //},
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -94,11 +94,11 @@
console.log(error);
});
},
- getDepot(value) {
- if (!value) {
- return;
- }
- this.depotSectionCode = value;
+ getDepot() {
+ //if (!value) {
+ // return;
+ //}
+ //this.depotSectionCode = value;
var that = this;
that.isLoading = true;
that.AxiosHttp("post", 'MesItemTbl/SctlScanDepots', {
@@ -120,9 +120,9 @@
console.log(error);
});
},
- getBarcode(value) {
+ getBarcode() {
- this.barcode = value;
+ //this.barcode = value;
var that = this;
that.isLoading = true;
diff --git a/H5/Wwbl.aspx b/H5/Wwbl.aspx
index 79989f2..2d43067 100644
--- a/H5/Wwbl.aspx
+++ b/H5/Wwbl.aspx
@@ -9,7 +9,7 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
<van-nav-bar
- title="濮斿琛ユ枡"
+ :title="type=='cl'?'濮斿瓒呴':'濮斿琛ユ枡'"
left-text="杩斿洖"
left-arrow
@click-left="GoBack()"
@@ -17,12 +17,14 @@
<div>
<van-cell-group>
<van-field
+ ref="billNo"
value=""
label="琛ユ枡鍗曞彿"
clearable
placeholder="鎵爜/閫夋嫨/鎵嬪綍"
:right-icon-size="19"
v-model="billNo"
+ @keyup.enter.native ="GetMesItemBlDetailByBillNo"
v-focus.noKeyboard
><template #button>
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
@@ -34,13 +36,16 @@
v-model="daa001"
:right-icon-size="19"
placeholder="宸ュ崟鍙�"
+ disabled
></van-field>
<van-field
+ ref="barcode"
value=""
label="鐗╂枡鏉＄爜"
clearable
placeholder="璇锋壂鐮�"
- @input="getBarcode"
+ @keyup.enter.native ="getBarcode"
+ <%--@input="getBarcode"--%>
:right-icon-size="19"
v-model="barcode"
v-focus.noKeyboard
@@ -58,7 +63,6 @@
v-model="sms"
label="鍙戣揣鏁伴噺"
placeholder="鍙戣揣鏁伴噺"
-disabled
><template #button>
<van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
</template></van-field>
@@ -67,9 +71,17 @@
<div class="van-tab-left">
<van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡">
+ <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="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.bld002}}</van-col>
+ <van-col span="12" class="text-left padding-left">
+ <div>{{value.bld002}}</div>
+ <div>{{value.bld003}}</div>
+ </van-col>
<van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
<van-col span="6">宸查鏁皗{value.bld008}}</van-col>
</van-row>
@@ -85,5 +97,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwbl.js?<%=14 %>"></script>
+ <script src="Js/Wwbl.js?<%=142 %>"></script>
</asp:Content>
diff --git a/H5/Wwtl.aspx b/H5/Wwtl.aspx
index 0d19b26..15ea1d4 100644
--- a/H5/Wwtl.aspx
+++ b/H5/Wwtl.aspx
@@ -23,27 +23,30 @@
placeholder="璇锋壂鐮�"
:right-icon-size="19"
v-model="billNo"
+ @keyup.enter.native="getMesItemTblDetailByBillNo"
v-focus.noKeyboard
><template #button>
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-field
+ ref="sectionCode"
value=""
label="搴撲綅缂栧彿"
v-model="depotSectionCode"
clearable
:right-icon-size="19"
- @input="getDepot"
+ @keyup.enter.native="getDepot"
placeholder="璇锋壂鐮佸簱浣嶇紪鍙�"
></van-field>
<van-field
+ ref="barcode"
value=""
label="鐗╂枡鏉＄爜"
clearable
placeholder="璇锋壂鐮�"
v-model="barcode"
:right-icon-size="19"
- @input="getBarcode"
+ @keyup.enter.native="getBarcode"
v-focus.noKeyboard
></van-field>
<van-field
@@ -64,15 +67,23 @@
</van-cell-group>
</div>
- <van-tabs @click="onClick" color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呴��鏄庣粏">
- <van-row v-for="value in ItemTblDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <%--<van-col span="18">鐗╂枡鍚嶇О:{{value.itemName}}</van-col>--%>
- <van-col span="6">鐢宠鏁�:{{value.tld005}}</van-col>
- <van-col span="6">宸查��鏁�:{{value.tld006}}</van-col>
- </van-row>
- </van-tab>
+ <van-tabs <%--@click="onClick"--%> 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="value in ItemTblDetail" 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.tld005}}</van-col>
+ <van-col span="6">宸查鏁皗{value.tld006}}</van-col>
+ </van-row>
+</van-tab>
<van-tab title="宸查��鏄庣粏"></van-tab>
</van-tabs>
@@ -84,6 +95,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwtl.js?<%=156 %>"></script>
+ <script src="Js/Wwtl.js?<%=157 %>"></script>
</asp:Content>
--
Gitblit v1.9.3