From 34f6a33873b3848aa6740d0cfbf86bd9432ead54 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 18 九月 2025 09:22:21 +0800
Subject: [PATCH] 受托退料：前端界面规范，列表与明细转为存储过程，添加组织隔离、拆分、库位列表、已扫待扫
---
H5/Js/Sttl.js | 81 ++++++++++++++++++++++++--
H5/Sttl.aspx | 91 ++++++++++++++++++++++-------
2 files changed, 141 insertions(+), 31 deletions(-)
diff --git a/H5/Js/Sttl.js b/H5/Js/Sttl.js
index c8117c2..12abbc2 100644
--- a/H5/Js/Sttl.js
+++ b/H5/Js/Sttl.js
@@ -19,6 +19,10 @@
active: 0,
show: false,
actions: [],
+ ItemTblDetail: [],
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -29,6 +33,55 @@
};
},
methods: {
+ 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() {
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetBarKwByItemCK', {
+ itemId: that.selItem.itemid,
+ userName: that.userInfo.loginAccount,
+ type: 'STCK',//鍙楁墭閫�鏂�/鍙楁墭鍑哄簱
+ billNo: that.billNo
+ }, 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 = [];
+ });
+ },
getInfo() {
this.show = true;
@@ -73,6 +126,8 @@
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.GetMesItemDetailByBillNo();
//this.$toast(item.name);
@@ -146,6 +201,7 @@
userName: that.userInfo.loginAccount,
barcode: that.barcode,
daa001: that.billNo,
+ billNo: that.billNo,
//type: selectType
}, false)
.then(function (res) {
@@ -165,9 +221,17 @@
} else if (json.status == 2) {
+ //浣跨敤tbBillList
+ //that.$refs.splitNum.focus();
+ //that.splitNum = json.data.cfNum;
+ //that.num = json.data.num;
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);
@@ -212,11 +276,11 @@
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("鍙戣揣鏁伴噺涓嶈兘涓虹┖");
@@ -227,7 +291,8 @@
that.AxiosHttp("post", 'MesSttl/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/Sttl.aspx b/H5/Sttl.aspx
index 2221603..0c8d1b3 100644
--- a/H5/Sttl.aspx
+++ b/H5/Sttl.aspx
@@ -8,6 +8,11 @@
</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="杩斿洖"
@@ -62,30 +67,70 @@
</van-cell-group>
</div>
- <div class="van-tab-left">
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-<%-- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.itemNo}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>--%>
+
+ <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="value in ItemBlDetail" 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.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
-</van-row>
- </van-tab>
+ <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 ItemBlDetail" :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="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 ItemBlDetail" :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="3">{{itm.fQty}}</van-col>
+ <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+ </van-row>
+ </van-tab>
</van-tabs>
- </div>
+
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -95,5 +140,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sttl.js?<%=127 %>"></script>
+ <script src="Js/Sttl.js?<%=1294 %>"></script>
</asp:Content>
--
Gitblit v1.9.3