From 4c1f4d48607b10b3c42b1577a9f384ca8ff38e4c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期日, 21 九月 2025 23:02:08 +0800
Subject: [PATCH] 1.委外退料优化 2.委外出库-pda
---
H5/Wwck.aspx | 7 ++-
H5/Wwtl.aspx | 56 +++++++++++++++++++--------
H5/Js/Wwck.js | 28 +++++++-------
3 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/H5/Js/Wwck.js b/H5/Js/Wwck.js
index dc630b0..6c244fd 100644
--- a/H5/Js/Wwck.js
+++ b/H5/Js/Wwck.js
@@ -23,6 +23,7 @@
selItem: {},
ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
DaaInfo: {},
+ billno:"",
}
},
mounted() {
@@ -91,8 +92,8 @@
getModel() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'WwGd/GetItemsByDaa001', {
- daa001: that.modeInfo.daa001,
+ that.AxiosHttp("post", 'WwGd/GetItemsByWwckNo', {
+ daa001: that.billno,
userName: that.userInfo.loginAccount
}, false)
.then(function (res) {
@@ -102,7 +103,11 @@
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);
@@ -131,10 +136,12 @@
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'WwGd/ScanCode', {
+ that.AxiosHttp("post", 'WwGd/WwckScanCode', {
daa001: that.modeInfo.daa001,
userName: that.userInfo.loginAccount,
barcode: that.scanInfo.barcode,
+ blNo: that.billno,
+ type: '濮斿棰嗘枡',
}, false)
.then(function (res) {
var json = res;
@@ -180,11 +187,13 @@
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'WwGd/ScanCodeCF', {
+ 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: '濮斿棰嗘枡',
}, false)
.then(function (res) {
var json = res;
@@ -255,17 +264,8 @@
// 鍙互閫氳繃 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.billno = item.name;
this.getModel();
//this.$toast(item.name);
},
diff --git a/H5/Wwck.aspx b/H5/Wwck.aspx
index de103c3..fce221e 100644
--- a/H5/Wwck.aspx
+++ b/H5/Wwck.aspx
@@ -30,13 +30,14 @@
<van-cell-group>
<van-field
- ref ="selectKey"
+ ref ="billno"
value=""
label="鐢宠鍗曞彿"
clearable
placeholder="璇烽�夋嫨鐢宠鍗曞彿"
:right-icon-size="19"
- v-model="selectKey"
+ v-model="billno"
+ @keyup.enter.native ="getModel"
><template #button>
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
@@ -183,5 +184,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwck.js?<%=101 %>"></script>
+ <script src="Js/Wwck.js?<%=105321 %>"></script>
</asp:Content>
diff --git a/H5/Wwtl.aspx b/H5/Wwtl.aspx
index 5cc1bcf..50d1f10 100644
--- a/H5/Wwtl.aspx
+++ b/H5/Wwtl.aspx
@@ -67,24 +67,46 @@
</van-cell-group>
</div>
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tab title="寰呮壂鐗╂枡" class="mySolid font">
- <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.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.tld005}}</van-col>
- <van-col span="6">宸查鏁皗{value.tld006}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></van-tab>
+ <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="8">寰呭叆搴撴暟</van-col>
+ <%--<van-col span="4">鏉＄爜寮犳暟</van-col>--%>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.items" :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="8" class="blue-text">{{itm.dsQty}}</van-col>
+ <%--<van-col span="4">{{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="4">闇�姹傛暟</van-col>--%>
+ <van-col span="8">宸插叆搴撴暟</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in ItemTblDetail.ysitems" :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="4">{{itm.fQty}}</van-col>--%>
+ <van-col span="8" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
--
Gitblit v1.9.3