From 1505aa1885a4af013982cfa6f6fa0fdd3bcb32c4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 16:57:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/pakStore/stockAdjust.js |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 572703f..b4df94a 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -1,6 +1,5 @@
 var initCountVal = 0;
 var initAnfmeVal = "-";
-var removeBtn = true;
 var matCodeData = [];
 var currLocNo;
 layui.use(['table','laydate', 'form'], function() {
@@ -18,13 +17,20 @@
         cellMinWidth: 50,
         toolbar: '#toolbar',
         cols: [[
-            {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
-            {field: 'anfme', align: 'center',title: '鏁伴噺'},
-            {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
-            {field: 'barcode', align: 'center', title: '鏉$爜'},
-            {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
-            {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
-            {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
+            {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
+            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+            ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+            ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+            ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
+            ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+            // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
+            ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
+            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+            ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+            ,{field: 'altme', align: 'center',title: '鍗曚綅'}
+            ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+            ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
         ]],
         done: function (res, curr, count) {
             limit();
@@ -33,7 +39,7 @@
 
     // 椤甸潰淇敼
     table.on('edit(chooseData)', function (obj) {
-        updateMatCodeData(obj.data.matNo, Number(obj.value));
+        updateMatCodeData(obj.data.matnr, Number(obj.value));
     });
 
     // 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -92,7 +98,7 @@
         switch (obj.event) {
             case 'remove':
                 for (var i = matCodeData.length - 1; i >= 0; i--) {
-                    if (matCodeData[i].matNo === data.matNo) {
+                    if (matCodeData[i].matnr === data.matnr) {
                         matCodeData.splice(i, 1);
                     }
                 }
@@ -113,15 +119,9 @@
             matCodeData = [];
             let data = res.data.records;
             for (var i = 0; i<data.length; i++) {
-                matCodeData.push({
-                    count: data[i].anfme,
-                    anfme: data[i].anfme,
-                    matNo: data[i].matnr,
-                    matName: data[i].maktx,
-                    barcode: data[i].zpallet,
-                    str1: data[i].altme,
-                    removeBtn: false
-                })
+                data[i]["count"] = data[i].anfme;
+                data[i]["removeBtn"] = false;
+                matCodeData.push(data[i]);
             }
             locTips(true, locNo);
             tableReload();
@@ -174,13 +174,13 @@
         }
     }
 
-    function updateMatCodeData(matNo, count) {
+    function updateMatCodeData(matnr, count) {
         if (isNaN(count)) {
             layer.msg("璇疯緭鍏ユ暟瀛�");
         } else {
             if (count >= 0) {
                 for (var i=0;i<matCodeData.length;i++){
-                    if (matCodeData[i]["matNo"] === matNo){
+                    if (matCodeData[i]["matnr"] === matnr){
                         matCodeData[i]["count"] = count;
                     }
                 }
@@ -221,3 +221,19 @@
         el.css("border-color", "#b8b8b8");
     }, 1000);
 }
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+    let applyData = [];
+    for (var i=0;i<data.length;i++){
+        applyData.push({
+            count: initCountVal,
+            anfme: initAnfmeVal,
+            removeBtn: true,
+            matnr: data[i].matNo
+        })
+    }
+    matCodeData.push.apply(matCodeData,applyData);
+    tableIns.reload({data: matCodeData});
+    layer.close(matCodeLayerIdx);
+}
\ No newline at end of file

--
Gitblit v1.9.1