From 683cd2050f9c387f58dbcfcbbb4daec620c62a24 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 13:43:12 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/pakStore.js |   75 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index c652138..db45c39 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -9,6 +9,26 @@
     var layDate = layui.laydate;
     var form = layui.form;
 
+    // 鑾峰彇鍙敤鍏ュ簱绔欑偣
+    $.ajax({
+        url: baseUrl+"/available/put/site",
+        headers: {'token': localStorage.getItem('token')},
+        method: 'POST',
+        success: function (res) {
+            if (res.code === 200){
+                var tpl = $("#putSiteSelectTemplate").html();
+                var template = Handlebars.compile(tpl);
+                var html = template(res);
+                $('#putSiteSelect').append(html);
+                form.render('select');
+            } else if (res.code === 403){
+                top.location.href = baseUrl+"/";
+            }else {
+                layer.msg(res.msg)
+            }
+        }
+    })
+
     tableIns = table.render({
         elem: '#chooseData',
         data: [],
@@ -17,30 +37,24 @@
         cellMinWidth: 50,
         toolbar: '#toolbar',
         cols: [[
-            {fixed: 'left', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80},
-            {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭~)', align: 'center', edit:'text', width: 120,  style:'color: blue;'},
+            {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭~)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
             {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
             {field: 'barcode', align: 'center', title: '鏉$爜'},
             {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
             {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'}
+            {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
+            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
         ]],
         done: function (res, curr, count) {
             $('td[data-field=count] div').html(initCountVal);
             setMatCodeData(res.data);
+            limit();
         }
     });
 
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        if (!isNaN(obj.value)) {
-            updateMatCodeData(obj.data.matNo, Number(obj.value));
-            tableIns.reload({data: matCodeData,done:function (res) {
-                    // 瑕嗙洊render鏂规硶鐨刣one
-                }});
-        } else {
-            layer.msg("璇疯緭鍏ユ暟瀛�");
-        }
+        updateMatCodeData(obj.data.matNo, Number(obj.value));
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -56,6 +70,10 @@
                 }
                 // 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
                 for (var i=0;i<matCodeData.length;i++){
+                    if (isNaN(matCodeData[i].count)) {
+                        layer.msg("璇疯緭鍏ユ暟瀛�");
+                        return;
+                    }
                     if (matCodeData[i].count === 0){
                         layer.msg("鏁伴噺涓嶈兘涓洪浂");
                         return;
@@ -87,6 +105,7 @@
                     }
                 }
                 tableIns.reload({data: matCodeData,done:function (res) {
+                        limit();
                         // 瑕嗙洊render鏂规硶鐨刣one
                     }});
                 break;
@@ -101,27 +120,44 @@
     }
 
     function updateMatCodeData(matNo, count) {
-        for (var i=0;i<matCodeData.length;i++){
-            if (matCodeData[i]["matNo"] === matNo){
-                matCodeData[i]["count"] = count;
+        if (isNaN(count)) {
+            layer.msg("璇疯緭鍏ユ暟瀛�");
+        } else {
+            if (count > 0) {
+                for (var i=0;i<matCodeData.length;i++){
+                    if (matCodeData[i]["matNo"] === matNo){
+                        matCodeData[i]["count"] = count;
+                    }
+                }
+            } else {
+                layer.msg("鏁伴噺蹇呴』澶т簬闆�");
             }
         }
+
+        tableIns.reload({data: matCodeData,done:function (res) {
+                limit();
+                // 瑕嗙洊render鏂规硶鐨刣one
+            }});
     }
 
-    // 琛ㄥ崟
+    // 琛ㄥ崟 --- 鍚姩鍏ュ簱
     form.on('submit(combDo)', function (data) {
         $.ajax({
-            url: baseUrl+"/put/site/start",
+            url: baseUrl+"/full/store/put/start",
             headers: {'token': localStorage.getItem('token')},
-            data: null,
+            data: JSON.stringify({
+                devpNo: $('#putSiteSelect').val(),
+                list: matCodeData
+            }),
+            contentType:'application/json;charset=UTF-8',
             method: 'POST',
             async: false,
             success: function (res) {
                 if (res.code === 200){
                     layer.closeAll();
-                    layer.msg(res.msg);
+                    layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
                     matCodeData = [];
-                    tableIns.reload({data: matCodeData,done:function (res) {}});
+                    tableIns.reload({data: matCodeData,done:function (res) { limit();}});
                 } else if (res.code === 403){
                     top.location.href = baseUrl+"/";
                 }else {
@@ -135,7 +171,6 @@
 // 鎻愬彇鐗╂枡
 var matCodeLayerIdx;
 function getMat() {
-    // tableIns.reload({data: []});
     matCodeLayerIdx = layer.open({
         type: 2,
         title: '鎻愬彇鐗╂枡',

--
Gitblit v1.9.1