From 1650f3fe1467d21074b597042861c46f3a8c4447 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 01 四月 2025 10:11:24 +0800
Subject: [PATCH] 问题修改
---
Pda/View/SoSetting/SampleOut.html | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index 0daa6f8..98b1cd4 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -169,12 +169,13 @@
</ul>
</div>
- <ul>
+ <!-- <ul>
<li id="option1">鏍囩</li>
<li id="option2">鏁伴噺</li>
- </ul>
-
- <br />
+ </ul> -->
+ <button id="option1" class="layout-btn" type="button">鏍囩</button>
+ <button id="option2" class="layout-btn" type="button">鏁伴噺</button>
+ <br /><br />
<!-- 鏈夌爜 -->
<div id="content1">
@@ -287,8 +288,8 @@
<div class="layui-form-item layout-input" style="margin-top: 6px;">
<label class="layui-form-label lableWidth">鎷ｈ揣鏁伴噺锛�</label>
<div class="layui-input-block">
- <input id="pickQty1" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off"
- class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ <input id="pickQty1" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off"
+ class="layui-input" >
</div>
</div>
</td>
@@ -481,9 +482,9 @@
<label class="layui-form-label lableWidth" >鎷ｈ揣鏁伴噺锛�</label>
<div id="" class="local-input">
<div class="layui-input-block">
- <input id="pickQty2" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
+ <input id="pickQty2" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
- oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ >
</div>
</div>
<div id="" class="local-ok">
@@ -560,18 +561,18 @@
$('#kuneiQty').hide();
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
$('#content2').hide();
$(document).ready(function () {
$('#option1').click(function () {
- // qingkong();
+ // qingkong();aqua
xianshiyemian = 0;
$('#content1').show();
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
$('#content2').hide();
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
$("#palletNo").focus();//鍏夋爣榛樿閫変腑
});
@@ -579,10 +580,10 @@
// qingkong();
xianshiyemian = 1;
$('#content1').hide();
- $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
+ $('#option1').attr("style", "background-color: #999;width: 50%;float: left;text-align: center;"); //榛樿棰滆壊
$('#content2').show();
- $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: red;width: 50%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
$("#palletNo2").focus();//鍏夋爣榛樿閫変腑
});
});
@@ -986,7 +987,7 @@
});
return;
}
- if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
+ if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseFloat($('#pickQty').val())){
layer.msg("鎷ｈ揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1043,6 +1044,26 @@
//纭鎷ｈ揣
function reqPickScatter() {
canPickBox = false//鍥炶皟
+ if($('#pickQty1').val()!= "" && $('#pickQty1').val()!= undefined){
+ console.log("111111111111111111"+$('#pickQty1').val());
+
+ //const reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+
+ // if (!reg.test($('#pickQty1').val())) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return -1;
+ // }
+ if (!($('#pickQty1').val()>0)) {
+ layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+ }
var param = {
"SoNo": $("#bar").val(),
"SoDetailId": $("#skuLotNo").val(),
@@ -1315,7 +1336,7 @@
$('#kuneilabel2').show();
$('#kuqianlabel2').hide();
updateBillList2();
- // console.log($('#bar2').val())
+ console.log($('#bar2').val())
if ($('#bar2').val() == "") {
console.log(1)
clear21();
@@ -1333,7 +1354,7 @@
$('#kuqianlabel2').show();
$('#kuneilabel2').hide();
updateAsnBillList2();
- GetBoxInfo();
+ GetDataInfo();
sampleType = "1";
}
@@ -1555,8 +1576,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseFloat($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
if (pickQty <= 0) {
layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
icon: 2,
@@ -1572,8 +1593,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseFloat($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
if (pickQty <= 0) {
layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
icon: 2,
@@ -1608,6 +1629,23 @@
//纭鎷ｈ揣
function reqPickScatter2() {
canPickBox = false//鍥炶皟
+ if($('#pickQty2').val()!= "" && $('#pickQty2').val()!= undefined){
+ // var reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+ // if (!reg.test($("#pickQty2").val())) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return -1;
+ // }
+ if (!($('#pickQty2').val()>0)) {
+ layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+ }
var param = {
"SoNo": $("#bar2").val(),
"SoDetailId": $("#skuLotNo2").val(),
--
Gitblit v1.8.0