From 1e26a7575d9969e728b0aa01466f490409cb173c Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期五, 18 十月 2024 18:41:30 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Pda/View/HouseDataSetting/stockCheck.html | 137 ++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 63 deletions(-)
diff --git a/Pda/View/HouseDataSetting/stockCheck.html b/Pda/View/HouseDataSetting/stockCheck.html
index 1ce8639..e849861 100644
--- a/Pda/View/HouseDataSetting/stockCheck.html
+++ b/Pda/View/HouseDataSetting/stockCheck.html
@@ -7,7 +7,7 @@
<!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=1, user-scalable=no" /> -->
<!-- <meta name="viewport" content="width=device-width, initial-scale=0.665" /> -->
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
- <title>Boxline PDA</title>
+ <title>搴撳瓨鐩樼偣</title>
<link rel="stylesheet" href="/layui/css/layui.css" />
<link rel="stylesheet" href="/css/style.css" />
@@ -158,16 +158,20 @@
.cut-line {
margin-top: 10px;
}
- .show{
+
+ .show {
display: block;
}
- .noshow{
+
+ .noshow {
display: none;
}
+
td {
word-break: break-all;
word-wrap: break-word;
}
+
.layui-form-switch {
margin-top: 0;
}
@@ -221,27 +225,27 @@
autocomplete="off" class="layui-input">
</div>
</div>
-
+
<div class="layout-tab-page">
- <div id="" class="layui-form-item layout-input" >
+ <div id="" class="layui-form-item layout-input">
<label class="layui-form-label">鏄惁鏁伴噺鐩樼偣锛�</label>
<div class="layui-input-block" style="position: absolute;top: 100;">
- <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="鏄瘄鍚�"
- lay-filter="IsZhengTuo" class="layui-input" >
+ <input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch"
+ lay-text="鏄瘄鍚�" lay-filter="IsZhengTuo" class="layui-input">
</div>
</div>
<div id="boxno1" class="layui-form-item layout-input" style="margin-top: 10px;">
<label class="layui-form-label">绠辩爜锛�</label>
<div class="layui-input-block">
<input id="boxNo" type="text" lay-verify="boxNo" placeholder="璇锋壂鎻忓绠辨潯鐮�"
- autocomplete="off" class="layui-input">
+ autocomplete="off" class="layui-input">
</div>
</div>
<div id="boxno3" class="layui-form-item layout-input noshow" style="margin-top: 10px;">
<label class="layui-form-label">鏀爜锛�</label>
<div class="layui-input-block">
<input id="boxNo3" type="text" lay-verify="boxNo3" placeholder="璇锋壂鎻忔敮鐮�"
- autocomplete="off" class="layui-input">
+ autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
@@ -286,13 +290,21 @@
</form>
</div>
- <div id="tableid" class="layout-tbl-paging">
+ <div id="tableid" class="layout-tbl-paging">
<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
<tr>
- <th style="width: 40%;"><p id="a">绠辩爜</p></th>
- <th style="width: 30%;"><p id="b">鏀爜</p></th>
- <th style="width: 15%;"><p id="c">绠卞唴鏁伴噺</p></th>
- <th style="width: 15%;"><p id="d">缁撴灉</p></th>
+ <th style="width: 40%;">
+ <p id="a">绠辩爜</p>
+ </th>
+ <th style="width: 30%;">
+ <p id="b">鏀爜</p>
+ </th>
+ <th style="width: 15%;">
+ <p id="c">绠卞唴鏁伴噺</p>
+ </th>
+ <th style="width: 15%;">
+ <p id="d">缁撴灉</p>
+ </th>
</tr>
<tr id="boxCell" style="display: none;">
<td name="boxNo"></td>
@@ -301,7 +313,7 @@
<td name="result"></td>
</tr>
</table>
-
+
</div>
</div>
</div>
@@ -315,7 +327,7 @@
layui.use(['form', 'jquery'], function () {
var form = layui.form
-
+
var tableData = null;
var canPickBox = true;
$("#palletNo").focus();
@@ -327,20 +339,20 @@
$("#a").html('');
$("#b").html('');
$("#c").html('');
-
+
if (obj.elem.checked) {
$('#boxno1').attr("style", "display:none")
$('#boxno3').attr("style", "display:none")
- isContinue="1";
+ isContinue = "1";
$("#a").html('鐗╂枡缂栫爜');
$("#b").html('鎵樼洏鏉＄爜');
$("#c").html('鎵樼洏鏁伴噺');
- } else {
+ } else {
$('#boxno1').attr("style", "display:block")
$('#boxno3').attr("style", "display:block")
- isContinue="0";
+ isContinue = "0";
$("#a").html('绠辩爜');
$("#b").html('鏀爜');
@@ -349,15 +361,15 @@
if ($("#Result").val() != "0") {
$('#boxno3').addClass("show");
$('#boxno3').removeClass("noshow");
- }else{
+ } else {
$('#boxno3').addClass("noshow");
$('#boxno3').removeClass("show");
}
- if($("#Result").val() == "2"){
+ if ($("#Result").val() == "2") {
$('#factNum').removeAttr("disabled");
}
- else{
- $('#factNum').attr("disabled","disabled");
+ else {
+ $('#factNum').attr("disabled", "disabled");
}
}
$('#boxNo').val("");
@@ -390,7 +402,7 @@
// checkPalletState()
// })
//褰撴墭鐩樻潯鐮佽緭鍏ュ簱鍥炶溅鏃�
- $("#palletNo").keydown(function(e) {
+ $("#palletNo").keydown(function (e) {
if (e.keyCode === 13) {
//妫�鏌ユ墭鐩樼姸鎬�
checkPalletState();
@@ -419,7 +431,7 @@
if (res.code == 0) { //鎴愬姛
updateBillList();
- updateGoodList();
+ updateGoodList();
GetOutInfo();
} else { //涓嶆垚鍔�
layer.msg("鏃犳晥鎵樼洏", {
@@ -430,9 +442,9 @@
});
}
-
+
//鏇存柊鐩樼偣鍗�
- function updateBillList() {
+ function updateBillList() {
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
@@ -441,7 +453,7 @@
PalletNo: $("#palletNo").val(),
};
synData(IP + "/PdaCr/GetStockCheckNoList", param, 'post', function (res) {
-
+
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
if (i == 0) {
@@ -452,7 +464,7 @@
+ res.data[i] + '</option>');
}
}
- form.render('select');
+ form.render('select');
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -463,7 +475,7 @@
}
//鍒濆鍖栨覆鏌撶墿鏂�
function updateGoodList() {
-
+
$("#skuLotNo").empty()
$("#skuLotNo").append('<option value =>' + '</option>');
form.render('select');
@@ -475,16 +487,16 @@
synData(IP + "/PdaCr/GetStockCheckDetailList", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- var vl = res.data[i].SkuNo+'-'+ res.data[i].LotNo;
- var vl2 = res.data[i].SkuName+'-'+ res.data[i].LotNo;
+ var vl = res.data[i].SkuNo + '-' + res.data[i].LotNo;
+ var vl2 = res.data[i].SkuName + '-' + res.data[i].LotNo;
if (i == 0) {
- $("#skuLotNo").append('<option value =' + vl + ' selected>'+ vl2 + '</option>');
+ $("#skuLotNo").append('<option value =' + vl + ' selected>' + vl2 + '</option>');
} else {
- $("#skuLotNo").append('<option value =' + vl + '>'+ vl2 + '</option>');
+ $("#skuLotNo").append('<option value =' + vl + '>' + vl2 + '</option>');
}
}
form.render('select');
-
+
} else { //涓嶆垚鍔�
// layer.msg(res.msg, {
// icon: 2,
@@ -540,14 +552,14 @@
return
}
if ($("#Result").val() == "2" && isContinue == "0") {
- if ($("#boxNo").val() == "" ||$("#boxNo3").val() == "") {
+ if ($("#boxNo").val() == "" || $("#boxNo3").val() == "") {
layer.msg("璇锋壂鎻忓绠辨潯鐮佸拰鏀爜", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
return;
- }
- if($("#factNum").val()<=0){
+ }
+ if ($("#factNum").val() <= 0) {
layer.msg("鐩樼泩鏃舵暟閲忎笉鑳戒负绌轰笖闇�澶т簬0", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -555,9 +567,9 @@
return;
}
}
-
+
if (canPickBox == true) {
- canPickBox = false;
+ canPickBox = false;
var param = {
"CrNo": $("#bar").val(),
"CrDetail": $("#skuLotNo").val(),
@@ -569,7 +581,7 @@
"isContinue": isContinue,
}
sendData(IP + "/PdaCr/CrSetCheck", param, 'post', function (res) {
-
+
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
@@ -600,21 +612,21 @@
}
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
-
+
//閫変腑缁撴灉涓嬫媺浜嬩欢
form.on('select(Result)', function (data) {
if (data.value != "0") {
$('#boxno3').addClass("show");
$('#boxno3').removeClass("noshow");
- }else{
+ } else {
$('#boxno3').addClass("noshow");
$('#boxno3').removeClass("show");
}
- if(data.value == "2" || isContinue == "1"){
+ if (data.value == "2" || isContinue == "1") {
$('#factNum').removeAttr("disabled");
}
- else if(isContinue != "1"){
- $('#factNum').attr("disabled","disabled");
+ else if (isContinue != "1") {
+ $('#factNum').attr("disabled", "disabled");
}
$('#boxNo3').val("");
});
@@ -623,7 +635,7 @@
let data = tableData
//鍏堟竻绌轰竴涓嬬瀛愬垪琛�
let trs = $("#tableBoxList tr")
- let len = trs.length ;
+ let len = trs.length;
for (i = len - 1; i >= 2; i--) {
trs[i].remove();
}
@@ -646,29 +658,28 @@
idx++;
tr.attr('index', idx)
//鍒ゆ柇鏄惁涓烘暟閲�
- if(isContinue == "1")
- {
+ if (isContinue == "1") {
tr.find("td[name='boxNo']").html(list[i].SkuNo);
tr.find("td[name='boxNo3']").html(list[i].PalletNo);
}
- else{
+ else {
tr.find("td[name='boxNo']").html(list[i].BoxNo);
tr.find("td[name='boxNo3']").html(list[i].BoxNo3);
}
tr.find("td[name='qty']").html(list[i].Qty);
-
- var CheckResultStr='';
- if(list[i].CheckResult=='0'){
- CheckResultStr='姝ｅ父';
- } else if(list[i].CheckResult=='1'){
- CheckResultStr='鐩樹簭';
- }else if(list[i].CheckResult=='2'){
- CheckResultStr='鐩樼泩';
- }else if(list[i].CheckResult=='3'){
- CheckResultStr='瀹炵墿涓嶇';
- }else if(list[i].CheckResult=='4'){
- CheckResultStr='鏁伴噺鐩樼偣';
+
+ var CheckResultStr = '';
+ if (list[i].CheckResult == '0') {
+ CheckResultStr = '姝ｅ父';
+ } else if (list[i].CheckResult == '1') {
+ CheckResultStr = '鐩樹簭';
+ } else if (list[i].CheckResult == '2') {
+ CheckResultStr = '鐩樼泩';
+ } else if (list[i].CheckResult == '3') {
+ CheckResultStr = '瀹炵墿涓嶇';
+ } else if (list[i].CheckResult == '4') {
+ CheckResultStr = '鏁伴噺鐩樼偣';
}
tr.find("td[name='result']").html(CheckResultStr);
--
Gitblit v1.8.0