From c0e86ef8780e87a7a939edb3d7f6adc88d66fdf7 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 08 七月 2021 10:08:48 +0800
Subject: [PATCH] 1.立库出库erp更新不进行判断成品和原材料

---
 src/main/webapp/static/js/locNormal/normalReport.js |   83 +++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 6e94e85..29136ba 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -5,55 +5,21 @@
 function getCol() {
     var cols = [];
     cols.push(
-        {field: 'appeTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
-        , {field: 'warehouse', align: 'center', title: '搴撳尯'}
-        , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'}
+        {field: 'createTime$', align: 'center', title: '鍑哄叆搴撴椂闂�', width: 180}
+        , {field: 'updateTime$', align: 'center', title: '淇敼鏃堕棿', width: 180, hide: true}
+        , {field: 'warehouse', align: 'center', title: '搴撳尯', width: 100}
+        , {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜', width: 140}
         , {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', width: 400}
-        , {field: 'lgnum', align: 'center', title: '瑙勬牸'}
-        , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆'}
-        , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'}
-        , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿'}
-        , {field: 'altme', align: 'center', title: '鍗曚綅', hide: true}
-        , {field: 'anfme', align: 'center', title: '鏁伴噺'}
+        , {field: 'anfme', align: 'center', title: '鏁伴噺', width: 120}
+        , {field: 'lgnum', align: 'center', title: '瑙勬牸', width: 120}
+        , {field: 'type', align: 'center', title: '鐗╂枡绫诲埆', width: 120}
+        , {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿', width: 140}
+        , {field: 'supplier', align: 'center', title: '閫氱煡鍗曞彿', width: 140}
+        , {field: 'memo', align: 'center', title: '澶囨敞'}
     )
     return cols;
 }
 
-// 鑾峰彇浠撳簱涓嬫媺
-$.ajax({
-    url: baseUrl + "/locArea/queryAll/auth",
-    headers: {'token': localStorage.getItem('token')},
-    // data: top.reObject(data),
-    method: 'POST',
-    success: function (res) {
-        if (res.data && res.data.length > 0) {
-            locArea = res.data;
-        }
-    },
-});
-
-// 搴撳尯涓嬫媺
-// 鑾峰彇浠撳簱涓嬫媺
-$.ajax({
-    url: baseUrl + "/locArea/queryAll/auth",
-    headers: {'token': localStorage.getItem('token')},
-    method: 'POST',
-    success: function (res) {
-        if (res.code === 200) {
-            var html = "";
-            if (res.data && res.data.length > 0) {
-                html += res.data.map(function (item) {
-                    return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
-                });
-            }
-            $('#putSiteSelect').append(html);
-        } else if (res.code === 403) {
-            top.location.href = baseUrl + "/";
-        } else {
-            layer.msg(res.msg)
-        }
-    }
-})
 
 layui.use(['table', 'laydate', 'form', 'upload'], function () {
     var table = layui.table;
@@ -63,13 +29,38 @@
     var form = layui.form;
     var upload = layui.upload;
 
+    // 搴撳尯涓嬫媺
+    // 鑾峰彇浠撳簱涓嬫媺
+    $.ajax({
+        url: baseUrl + "/locArea/query/allArea",
+        headers: {'token': localStorage.getItem('token')},
+        method: 'POST',
+        success: function (res) {
+            if (res.code === 200) {
+                var html = "";
+                if (res.data && res.data.length > 0) {
+                    locArea = res.data;
+                    html += res.data.map(function (item) {
+                        return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
+                    });
+                }
+                $('#putSiteSelect').append(html);
+                layui.form.render('select');
+            } else if (res.code === 403) {
+                top.location.href = baseUrl + "/";
+            } else {
+                layer.msg(res.msg)
+            }
+        }
+    });
+
     // 鏁版嵁娓叉煋
     tableIns = table.render({
         elem: '#locNormal',
         headers: {token: localStorage.getItem('token')},
         url: baseUrl + '/locNomal/getInListByDay',
         where: {
-            state: '1',
+            io_type: '1',
         },
         page: true,
         limit: 16,
@@ -117,6 +108,8 @@
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
         clearFormVal($('#search-box'));
+        $("#io_type").val("1");
+        form.render();
         tableReload(false);
     });
 

--
Gitblit v1.9.1