From 8c6e292c508312eca0aef4c203e5857c4fc3094c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 07 九月 2024 09:18:39 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Pda/View/SoSetting/SampleOut2.html | 148 ++++++++++++++++++++++++------------------------
1 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut2.html b/Pda/View/SoSetting/SampleOut2.html
index d6489db..07807e5 100644
--- a/Pda/View/SoSetting/SampleOut2.html
+++ b/Pda/View/SoSetting/SampleOut2.html
@@ -157,7 +157,7 @@
<table border="" cellspacing="" cellpadding="">
<tr>
<td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
- <td class="title-text">鍙栨牱鍑哄簱</td>
+ <td class="title-text">鍙栨牱鎷ｈ揣</td>
<td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
</tr>
</table>
@@ -193,32 +193,32 @@
<img src="/assets/down_arraw.png">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="tbl-box-sim-info" cellspacing="" cellpadding="">
<tr>
- <td colspan="3">
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鐗╂枡锛�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="sku" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="sku" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
- <td colspan="3">
+ </tr>
+ <tr>
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鎵规鍙�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="lotNo" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="lotNo" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
@@ -239,11 +239,11 @@
</td>
</tr>
-
+
</table>
</div>
</div>
-
+
<div id="layout-pallet" class="layui-form-item layout-input">
<label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -280,11 +280,11 @@
<td>
<div class="layui-form-item layout-input" style="margin-top: 6px;">
<label class="layui-form-label lableWidth">鎷ｈ揣鏁伴噺锛�</label>
- <div class="layui-input-block">
+ <div class="layui-input-block">
<input id="pickQty1" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
autocomplete="off" class="layui-input"
oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
</td>
@@ -313,7 +313,7 @@
</form>
</div>
-
+
</div>
<!-- 鏃犵爜 -->
<div id="content2">
@@ -330,31 +330,31 @@
<img src="/assets/down_arraw.png">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="tbl-box-sim-info" cellspacing="" cellpadding="">
<tr>
- <td colspan="3">
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鐗╂枡锛�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="sku2" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="sku2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
- <tr>
- <td colspan="3">
+ </tr>
+ <tr>
+ <td colspan="3">
<div class="layui-form-item">
<label class="layui-form-label" style="width: 20%;">鎵规鍙�</label>
<div class="layui-input-block" style="width: 80%;margin-left:20%;">
- <input id="lotNo2" type="text" lay-verify="" disabled
- placeholder="" class="layui-input">
+ <input id="lotNo2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
</div>
</div>
</td>
- </tr>
+ </tr>
<tr>
<td>
<div class="layui-form-item">
@@ -376,11 +376,11 @@
</td>
</tr>
-
+
</table>
</div>
</div>
-
+
<div id="layout-pallet" class="layui-form-item layout-input">
<label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -388,7 +388,7 @@
autocomplete="off" class="layui-input" style="height:24px">
</div>
</div>
-
+
<div id="" class="layout-tab-page">
<table class="layout-tab-content">
@@ -402,7 +402,7 @@
autocomplete="off" class="layui-input"
style="padding-left:0.1rem;"
oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')"
- onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/,'$1$2.$3')">
</div>
</div>
<div id="" class="local-ok">
@@ -441,7 +441,7 @@
/* 鏍囩鍒囨崲浠ｇ爜 */
var xianshiyemian = 0;
-
+
$('#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;"); //榛樿棰滆壊
$('#content2').hide();
@@ -469,14 +469,14 @@
});
});
-
+
var canPickBox = true
$("#palletNo").focus();//鍏夋爣榛樿閫変腑
-
+
function clear2() {
$("#sku").val("")//鐗╂枡
- $("#lotNo").val("") //鎵规
+ $("#lotNo").val("") //鎵规
}
function clear3() {
$("#planQty").val(""); //璁″垝鏁伴噺
@@ -497,8 +497,8 @@
}
checkPalletState()
})
- updateBillList();
-
+ updateBillList();
+
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState() {
@@ -516,7 +516,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
}
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -535,7 +535,7 @@
//涓嬫媺璇烽獙鍗曟嵁閫変腑鍚庝簨浠�
form.on('select(getbar)', function (data) {
-
+
if ($('#bar').val() == "") {
clear2();
clear3();
@@ -543,17 +543,17 @@
}
updateInspectionInfo();
});
-
+
//鍒濆鍖栨覆鏌� 璇烽獙鍗�
function updateBillList() {
- var bar = $("#bar").val();
+ var bar = $("#bar").val();
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
-
+
for (var i = 0; i < res.data.length; i++) {
if (bar == res.data[i]) {
$("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -575,16 +575,16 @@
//鍒濆鍖栨覆鏌� 璇烽獙鍗曠殑淇℃伅 鐗╂枡-鎵规銆佹暟閲忕瓑
function updateInspectionInfo() {
clear2();
- clear3();
+ clear3();
var param = {
qcNo: $("#bar").val(),
};
synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- $("#sku").val(res.data.Sku)
- $("#lotNo").val(res.data.LotNo)
- $("#planQty").val(res.data.Qty)
+ console.log(res.data);
+ $("#sku").val(res.data.Sku)
+ $("#lotNo").val(res.data.LotNo)
+ $("#planQty").val(res.data.Qty)
$("#finishQty").val(res.data.SamplingQty)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -597,7 +597,7 @@
//鍗曟嫞璐э紙纭鎸夐挳锛�
form.on('submit(formPickScatter)', function (data) {
-
+
if (canPickBox == false) {
layer.msg("璇锋眰鏈畬鎴愶紝涓嶈閲嶅璇锋眰", {
@@ -606,7 +606,7 @@
});
return;
}
-
+
if ($('#bar').val() == "") {
layer.msg("璇烽�夋嫨璇烽獙鍗�", {
icon: 2,
@@ -619,14 +619,14 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
-
+
if ($('#boxNo').val() == "") {
layer.msg("璇疯緭鍏ョ鐮�", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
- }
-
+ }
+
reqPickScatter()
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
@@ -641,7 +641,7 @@
"BoxNo": $('#boxNo').val(),
"BoxNo3": $('#boxNo3').val(),
"PickQty": $('#pickQty1').val(),
-
+
}
sendData(IP + "/PdaSo/SampleSetPick", param, 'post', function (res) {
@@ -651,14 +651,14 @@
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
-
+
canPickBox = true//鍥炶皟
// $("#boxNo").val('');
$("#boxNo3").val('');
$("#pickQty1").val('');
updateInspectionInfo();
-
-
+
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -693,7 +693,7 @@
function clear22() {
//鐗╂枡鎵规
$("#sku2").val("")//鐗╂枡
- $("#lotNo2").val("") //鎵规
+ $("#lotNo2").val("") //鎵规
}
function clear23() {
$("#planQty2").val(""); //璁″垝鏁伴噺
@@ -710,7 +710,7 @@
}
checkPalletState2()
})
-
+
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState2() {
var param = {
@@ -727,7 +727,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () { });
}
-
+
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -743,11 +743,11 @@
}
});
}
-
-
+
+
//涓嬫媺璇烽獙鍗曟嵁閫変腑鍚庝簨浠�
form.on('select(getbar2)', function (data) {
-
+
if ($('#bar2').val() == "") {
clear22();
clear23();
@@ -755,8 +755,8 @@
}
updateInspectionInfo2();
});
-
-
+
+
//鍒濆鍖栨覆鏌� 璇烽獙鍗�
function updateBillList2() {
$("#bar2").empty()
@@ -765,7 +765,7 @@
synData(IP + "/PdaSo/GetInspectionNo", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
-
+
for (var i = 0; i < res.data.length; i++) {
if (bar == res.data[i]) {
$("#bar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
@@ -787,16 +787,16 @@
//鍒濆鍖栨覆鏌� 鐗╂枡-鎵规
function updateInspectionInfo2() {
clear22();
- clear23();
+ clear23();
var param = {
qcNo: $("#bar2").val(),
};
synData(IP + "/PdaSo/GetInspectionRequestInfo", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- $("#sku2").val(res.data.Sku)
- $("#lotNo2").val(res.data.LotNo)
- $("#planQty2").val(res.data.Qty)
+ console.log(res.data);
+ $("#sku2").val(res.data.Sku)
+ $("#lotNo2").val(res.data.LotNo)
+ $("#planQty2").val(res.data.Qty)
$("#finishQty2").val(res.data.SamplingQty)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -823,7 +823,7 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
-
+
if ($('#palletNo2').val() == "") {
layer.msg("璇疯緭鍏ユ墭鐩樼爜", {
icon: 2,
@@ -838,8 +838,8 @@
});
return;
}
-
-
+
+
reqPickScatter2()
@@ -865,7 +865,7 @@
}, function () {
canPickBox = true//鍥炶皟
-
+
$("#pickQty2").val('');
updateInspectionInfo2();
});
--
Gitblit v1.8.0