From 0d334766bcd06f6ce8678caed5747600f74b4d21 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 14:20:37 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockIn.html | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 1294a6b..b747d88 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -76,6 +76,13 @@
display: none;
}
+ #typeSelect {
+ padding: 10px 20px;
+ }
+ .layui-form-radio {
+ width: 100%;
+ }
+
</style>
</head>
<body>
@@ -100,9 +107,20 @@
<footer>
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" style="margin-left: 15px">涓婃灦</button>
+ <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="confirm()" style="margin-left: 15px">涓婃灦</button>
</div>
</footer>
+
+<div id="typeSelect" style="display: none">
+ <form class="layui-form">
+ <input type="radio" name="docType" value="34" title="閲囪喘鍗�" checked="">
+ <input type="radio" name="docType" value="45" title="閿�鍞��璐у崟">
+ <hr>
+ <div style="text-align: center">
+ <button class="layui-btn layui-btn-normal" onclick="pakIn()">纭畾</button>
+ </div>
+ </form>
+</div>
</body>
<script>
var tableIns;
@@ -148,8 +166,12 @@
success: function (res) {
if (res.code === 200) {
if (res.data.length > 0) {
+ matData = res.data;
tableIns.reload({data: res.data});
$('#node').focus();
+ } else {
+ matData = [];
+ tableIns.reload({data: res.data});
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -162,6 +184,7 @@
function findNode(el) {
if (isEmpty(el.value)) {
+ $('#node-ok').hide();
return;
}
$.ajax({
@@ -174,7 +197,7 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#pakin').focus();
+ // $('#pakin').focus();
$('#node-ok').show();
} else {
$('#node-ok').hide();
@@ -231,41 +254,50 @@
// 閲嶇疆
function reset() {
$('#code').val("");
+ $('#node').val("");
matData = [];
tableIns.reload({data: matData});
$('#node-ok').hide();
- $('#putSiteSelect').val("");
layui.form.render('select');
}
- // 鍏ュ簱
+
+ function confirm() {
+ layer.open({
+ type: 1,
+ title: '鍗曟嵁绫诲瀷',
+ shade: [0.3,'#000'],
+ area: ['70%'],
+ content: $('#typeSelect'),
+ success: function(layero, index){
+ }
+ });
+ }
+
+ // 涓婃灦
function pakIn() {
- var barcode = $('#code').val();
- if (isEmpty(barcode)) {
+ var docType = $('input:radio[name="docType"]:checked').val();
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
tips("鎵樼洏鏉＄爜涓虹┖", true);
return;
}
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
+ var node = $('#node').val();
+ if (isEmpty(node)) {
+ tips("璐т綅涓虹┖", true);
return;
}
if (matData.length === 0) {
tips("璇锋彁鍙栫墿鏂�", true);
return;
}
- // var site = $('input:radio[name="site"]:checked').next("span").html();
- var site = $('#putSiteSelect').val();
- if (null === site || undefined === site || site === "") {
- tips("璇烽�夋嫨鍏ュ簱鍙�", true);
- return;
- }
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/work/stock/in",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- barcode: barcode,
- devpNo: site,
- list: matData
+ nodeId: node,
+ zpallet: zpallet,
+ docType: docType
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -273,7 +305,7 @@
success: function (res) {
if (res.code === 200) {
reset();
- tips("鍏ュ簱鍚姩鎴愬姛")
+ tips("涓婃灦鎴愬姛")
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
} else {
--
Gitblit v1.9.1