From e1749547c76a5d8bae94e47d38d4d75b481610c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 09 九月 2021 10:51:15 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pda/stockIn.html |   90 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 1294a6b..851bcd8 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
-    <title>鍏ュ簱</title>
+    <title>涓婃灦</title>
     <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../static/css/pda.css" media="all">
     <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -76,6 +76,13 @@
             display: none;
         }
 
+        #typeSelect {
+            padding: 10px 20px;
+        }
+        .layui-form-radio {
+            width: 100%;
+        }
+
     </style>
 </head>
 <body>
@@ -103,13 +110,23 @@
         <button id="pakin" type="button" class="layui-btn layui-btn-normal" onclick="pakIn()" 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;
     window.onload = function(){
         document.getElementById("code").focus();
     }
-
 
     layui.use(['table','laydate', 'form'], function() {
         var table = layui.table;
@@ -148,8 +165,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 +183,7 @@
 
     function findNode(el) {
         if (isEmpty(el.value)) {
+            $('#node-ok').hide();
             return;
         }
         $.ajax({
@@ -174,7 +196,6 @@
             success: function (res) {
                 if (res.code === 200) {
                     if (res.data != null) {
-                        $('#pakin').focus();
                         $('#node-ok').show();
                     } else {
                         $('#node-ok').hide();
@@ -182,7 +203,7 @@
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/pda";
                 } else {
-                    alert(res.msg)
+                    tips(res.msg, true);
                 }
             }
         })
@@ -199,6 +220,7 @@
             content: 'matQuery.html',
             success: function(layero, index){
                 $('.layui-layer-title').css('font-size', '16px');
+                $('.layui-layer.layui-layer-iframe').css('border-radius', '8px');
             },
             end: function () {
                 $('#mat-btn').focus();
@@ -231,41 +253,65 @@
     // 閲嶇疆
     function reset() {
         $('#code').val("");
+        $('#node').val("");
         matData = [];
         tableIns.reload({data: matData});
         $('#node-ok').hide();
-        $('#putSiteSelect').val("");
         layui.form.render('select');
     }
 
-    // 鍏ュ簱
-    function pakIn() {
-        var barcode = $('#code').val();
-        if (isEmpty(barcode)) {
+
+    function confirm() {
+        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);
+        layer.open({
+            type: 1,
+            title: '鍗曟嵁绫诲瀷',
+            shade: [0.3,'#000'],
+            area: ['70%'],
+            content: $('#typeSelect'),
+            success: function(layero, index){
+            }
+        });
+    }
+
+    // 涓婃灦
+    function pakIn() {
+        var docType = $('input:radio[name="docType"]:checked').val();
+        var zpallet = $('#code').val();
+        if (isEmpty(zpallet)) {
+            tips("鎵樼洏鏉$爜涓虹┖", true);
             return;
         }
+        var node = $('#node').val();
+        if (isEmpty(node)) {
+            tips("璐т綅涓虹┖", true);
+            return;
+        }
+        if (matData.length === 0) {
+            tips("璇锋彁鍙栫墿鏂�", true);
+            return;
+        }
+        layer.closeAll();
         $.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 +319,7 @@
             success: function (res) {
                 if (res.code === 200) {
                     reset();
-                    tips("鍏ュ簱鍚姩鎴愬姛")
+                    tips("涓婃灦鎴愬姛")
                 } else if (res.code === 403) {
                     top.location.href = baseUrl + "/pda";
                 } else {
@@ -283,6 +329,10 @@
         })
     }
 
+    function doPost() {
+
+    }
+
     /**
      * 鎻愮ず淇℃伅
      * @param msg 鎻愮ず鍐呭

--
Gitblit v1.9.1