From 7ebe16b9abbee8e884db27d2ec360f17455b14f2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 09:03:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/pakStore.js |  181 +++++++++++++++++++++++++++++++--------------
 1 files changed, 124 insertions(+), 57 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index a5b3b4f..66f396f 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,6 +1,17 @@
 
 var initCountVal = 0;
 var matCodeData = [];
+function getCol() {
+    var cols = [
+        {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭~)', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+    ];
+    cols.push.apply(cols, matCols);
+    cols.push(
+        {field: 'memo', title:'澶囨敞', align: 'center'},
+        {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        )
+    return cols;
+}
 
 layui.use(['table','laydate', 'form'], function() {
     var table = layui.table;
@@ -9,8 +20,6 @@
     var layDate = layui.laydate;
     var form = layui.form;
 
-
-
     tableIns = table.render({
         elem: '#chooseData',
         data: [],
@@ -18,35 +27,18 @@
         limit: 500,
         cellMinWidth: 50,
         toolbar: '#toolbar',
-        cols: [[
-            {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: '鐗╂枡瑙勬牸'},
-            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
-        ]],
+        cols: [getCol()],
         done: function (res, curr, count) {
             $('td[data-field=count] div').html(initCountVal);
             setMatCodeData(res.data);
             limit();
+            getInBound();
         }
     });
 
-
-
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        if (!isNaN(obj.value)) {
-            updateMatCodeData(obj.data.matNo, Number(obj.value));
-            tableIns.reload({data: matCodeData,done:function (res) {
-                    limit();
-                    // 瑕嗙洊render鏂规硶鐨刣one
-                }});
-        } else {
-            layer.msg("璇疯緭鍏ユ暟瀛�");
-        }
+        updateMatCodeData(obj.data.matNo, Number(obj.value));
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -55,12 +47,12 @@
         var data = checkStatus.data;
         switch(obj.event) {
             case 'comb':
-                // 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+                // 鍒ゆ柇鏄惁瀛樺湪浜у搧
                 if (matCodeData.length === 0) {
-                    layer.msg("璇峰厛娣诲姞鐗╂枡");
+                    layer.msg("璇峰厛娣诲姞浜у搧");
                     return;
                 }
-                // 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
+                // 鍒ゆ柇浜у搧鏁伴噺鏄惁瀛樺湪寮傚父
                 for (var i=0;i<matCodeData.length;i++){
                     if (isNaN(matCodeData[i].count)) {
                         layer.msg("璇疯緭鍏ユ暟瀛�");
@@ -71,14 +63,26 @@
                         return;
                     }
                 }
-                layer.open({
-                    type: 1,
-                    title: '閫夋嫨鍏ュ簱绔�',
-                    maxmin: true,
-                    shadeClose: true,
-                    content: $('#combDiv'),
-                    success: function (layero, index) {
-
+                $.ajax({
+                    url: baseUrl+"/full/store/put/start",
+                    headers: {'token': localStorage.getItem('token')},
+                    data: JSON.stringify({
+                        devpNo: Number($('#putSiteSelect').val()),
+                        list: matCodeData
+                    }),
+                    contentType:'application/json;charset=UTF-8',
+                    method: 'POST',
+                    async: false,
+                    success: function (res) {
+                        if (res.code === 200){
+                            layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+                            matCodeData = [];
+                            tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+                        } else if (res.code === 403){
+                            top.location.href = baseUrl+"/";
+                        }else {
+                            layer.msg(res.msg)
+                        }
                     }
                 })
                 break;
@@ -88,8 +92,8 @@
     // 鐩戝惉琛屽伐鍏蜂簨浠�
     table.on('tool(chooseData)', function(obj){
         var data = obj.data;
+
         switch (obj.event) {
-            // 璇︽儏
             case 'remove':
                 for (var i = matCodeData.length - 1; i >= 0; i--) {
                     if (matCodeData[i].matNo === data.matNo) {
@@ -98,8 +102,39 @@
                 }
                 tableIns.reload({data: matCodeData,done:function (res) {
                         limit();
+                        getInBound();
                         // 瑕嗙洊render鏂规硶鐨刣one
                     }});
+                break;
+            case 'memo':
+               var memoLayer = layer.open({
+                    type: 2,
+                    title: '澶囨敞',
+                    maxmin: true,
+                    area: ['400px', '215px'],
+                    shadeClose: false,
+                    content: 'matMemo.html',
+                    btn: ['淇濆瓨', '鍙栨秷'],
+                    style: 'text-algin: center',
+                    yes:  function(index, layero){
+                        var memo = layer.getChildFrame('body', index).find("#memo")[0].value;
+                        matCodeData.map(function (item) {
+                            if (item.matNo === data.matNo) {
+                                item.memo = memo;
+                            }
+                        });
+                        // 閲嶇疆琛ㄦ牸鏁版嵁
+                        tableIns.reload({data: matCodeData,done:function (res) {
+                            limit();
+                            getInBound();
+                            layer.close(memoLayer);
+                        }});
+                    },
+                    success: function(layero, index){
+                        var iframeWin = window[layero.find('iframe')[0]['name']];//寰楀埌iframe椤电殑绐楀彛瀵硅薄
+                        iframeWin.setMatMemo(data.memo);
+                    }
+                });
                 break;
         }
     });
@@ -112,47 +147,58 @@
     }
 
     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();
+                getInBound();
+                // 瑕嗙洊render鏂规硶鐨刣one
+            }});
     }
 
-    // 琛ㄥ崟 --- 鍚姩鍏ュ簱
-    form.on('submit(combDo)', function (data) {
+    // 鑾峰彇鍙敤鍏ュ簱绔欑偣
+    function getInBound() {
         $.ajax({
-            url: baseUrl+"/full/store/start",
+            url: baseUrl + "/available/put/site",
             headers: {'token': localStorage.getItem('token')},
-            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);
-                    matCodeData = [];
-                    tableIns.reload({data: matCodeData,done:function (res) { limit();}});
-                } else if (res.code === 403){
-                    top.location.href = baseUrl+"/";
-                }else {
+                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)
                 }
             }
         })
-    });
+    }
+
+
 });
 
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
 var matCodeLayerIdx;
 function getMat() {
     matCodeLayerIdx = layer.open({
         type: 2,
-        title: '鎻愬彇鐗╂枡',
+        title: '鎻愬彇浜у搧',
         maxmin: true,
         area: [top.detailWidth, top.detailHeight],
         shadeClose: true,
@@ -161,3 +207,24 @@
         }
     });
 }
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    for (var i=0;i<data.length;i++){
+        let pass = false;
+        for (var j=0;j<matCodeData.length;j++){
+            if (data[i].matNo === matCodeData[j].matNo) {
+                pass = true;
+                break;
+            }
+        }
+        if (pass) {
+            data.splice(i--, 1);
+        } else {
+            data[i]["count"] = initCountVal;
+        }
+    }
+    matCodeData.push.apply(matCodeData, data);
+    tableIns.reload({data: matCodeData});
+    layer.close(matCodeLayerIdx);
+}
\ No newline at end of file

--
Gitblit v1.9.1