From 70ddea1608c8402a429baf69ed03028dae9c8f87 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期一, 22 九月 2025 15:10:22 +0800
Subject: [PATCH] 1.受托退料:优化，添加成功声音、拆分后打印、退料后刷新库位列表。2.受托入库：列表查询与选择改为存储过程，添加成功声音
---
H5/Js/Sttl.js | 17 ++++++--
H5/Js/Strk.js | 16 +++++++-
H5/Strk.aspx | 63 ++++++++++++++++++++++---------
H5/Sttl.aspx | 6 +-
4 files changed, 75 insertions(+), 27 deletions(-)
diff --git a/H5/Js/Strk.js b/H5/Js/Strk.js
index bc01d1b..05fa2c4 100644
--- a/H5/Js/Strk.js
+++ b/H5/Js/Strk.js
@@ -17,7 +17,12 @@
depot: {},
show: false,
actions: [],
- ItemTblDetail:[]
+ ItemBlDetail: [], // 寰呮壂
+ ItemYsDetail: [], // 宸叉壂
+ ItemTblDetail: [],
+ ItemDetail: [],
+ ItemBarKw: [],
+ currentIndex: -1,
}
},
mounted() {
@@ -43,6 +48,7 @@
if (json.status == 0) {
if (json.data.tbBillList.length <= 0) {
that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.show = false;
} else {
that.actions = json.data.tbBillList.map(item => {
return { name: item }
@@ -58,6 +64,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
+ that.show = false;
});
},
//onClick(index, title) {
@@ -70,6 +77,8 @@
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
this.show = false;
this.billNo = item.name;
+ // 娓呯┖搴撲綅鍒楄〃
+ this.ItemBarKw = [];
this.getMesItemDetailByBillNo();
//this.$toast(item.name);
},
@@ -82,7 +91,9 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemTblDetail = json.data.tbBillList;
+ var tbBillList = json.data.tbBillList || {};
+ that.ItemBlDetail = tbBillList.blDetails || []; // 寰呮壂
+ that.ItemYsDetail = tbBillList.ysDetails || []; // 宸叉壂
that.$refs.sectionCode.focus();
}
else {
@@ -165,6 +176,7 @@
that.itemNo = json.data.tbBillList.itemNo;
that.sms = json.data.tbBillList.num;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$toast.success("鎵弿鎴愬姛");
that.$refs.barcode.focus();
that.barcode = null;
that.getMesItemDetailByBillNo();
diff --git a/H5/Js/Sttl.js b/H5/Js/Sttl.js
index 12abbc2..ace746b 100644
--- a/H5/Js/Sttl.js
+++ b/H5/Js/Sttl.js
@@ -14,11 +14,12 @@
selectType: "",
daa001: "",
barcode: "",
- ItemBlDetail:[],
modeInfo: [],
active: 0,
show: false,
actions: [],
+ ItemBlDetail: [], // 寰呮壂
+ ItemYsDetail: [], // 宸叉壂
ItemTblDetail: [],
ItemDetail: [],
ItemBarKw: [],
@@ -51,6 +52,7 @@
console.log('褰撳墠閫変腑椤�:', this.selItem); // 璋冭瘯鐢�
this.GetBarKwByItem();
+ //this.active = 1; //鑷姩鍒囨崲鍒板簱浣嶅垪琛╰ab
},
GetBarKwByItem() {
@@ -118,7 +120,7 @@
//onClick(index, title) {
// this.$toast(`${index} ${title}`);
// this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
+ //that.$playSound('success');
//},
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
@@ -142,8 +144,10 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList;
- //that.daa001 = json.data.tbBillList.item1;
+ //that.ItemBlDetail = json.data.tbBillList;
+ var tbBillList = json.data.tbBillList || {};
+ that.ItemBlDetail = tbBillList.blDetails || []; // 寰呮壂
+ that.ItemYsDetail = tbBillList.ysDetails || []; // 宸叉壂
that.$refs.barcode.focus();
}
else {
@@ -213,11 +217,13 @@
that.num = null;
//that.ItemBlDetail = json.data.tbBillList.item2
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
that.GetMesItemDetailByBillNo();
that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
+ that.GetBarKwByItem(); // 閫�鏂欏悗鍒锋柊搴撲綅
} else if (json.status == 2) {
@@ -301,11 +307,14 @@
if (json.status == 0) {
that.ItemBlDetail = json.data.pendingList;
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
+ that.sendPrintMessage(json.data.tbBillList);//鎵撳嵃
that.$refs.barcode.focus();
that.barcode = "";
that.num = "";
that.splitNum = "";
that.GetMesItemDetailByBillNo();
+ that.GetBarKwByItem();// 閫�鏂欏悗鍒锋柊搴撲綅
}
else {
that.$toast.fail(json.message);
diff --git a/H5/Strk.aspx b/H5/Strk.aspx
index 2688d7a..d9f34e0 100644
--- a/H5/Strk.aspx
+++ b/H5/Strk.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="杩斿洖"
@@ -68,24 +73,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-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" 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="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.fQty}}</van-col>
- <van-col span="6">{{value.sQty || 0}}</van-col>
- </van-row>
-</van-tab>
- <van-tab title="宸查��鏄庣粏"></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 ItemYsDetail" :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>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -96,6 +123,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Strk.js?<%=17 %>"></script>
+ <script src="Js/Strk.js?<%=1764 %>"></script>
</asp:Content>
diff --git a/H5/Sttl.aspx b/H5/Sttl.aspx
index 0c8d1b3..630b6c1 100644
--- a/H5/Sttl.aspx
+++ b/H5/Sttl.aspx
@@ -68,7 +68,7 @@
</div>
- <van-tabs color="#000" title-active-color="#0283EF">
+ <van-tabs v-model="active" van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="寰呮壂鐗╂枡" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
@@ -117,7 +117,7 @@
<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-row v-for="(itm,index) in ItemYsDetail" :key="index">
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.itemNo}}</div>
<div>{{itm.itemName}}</div>
@@ -140,5 +140,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sttl.js?<%=1294 %>"></script>
+ <script src="Js/Sttl.js?<%=1307 %>"></script>
</asp:Content>
--
Gitblit v1.9.3