From 6078c3e72dd7acbf910a0f8bd8b8d17e7edf0302 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 05 七月 2021 16:19:37 +0800
Subject: [PATCH] 1.pda添加物料(非原材料)新增判断生产单号为空的情况

---
 src/main/webapp/static/js/locNormal/normalReport.js |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/locNormal/normalReport.js b/src/main/webapp/static/js/locNormal/normalReport.js
index 6e94e85..fd92248 100644
--- a/src/main/webapp/static/js/locNormal/normalReport.js
+++ b/src/main/webapp/static/js/locNormal/normalReport.js
@@ -5,16 +5,18 @@
 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;
 }
@@ -69,7 +71,7 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl + '/locNomal/getInListByDay',
         where: {
-            state: '1',
+            io_type: '1',
         },
         page: true,
         limit: 16,
@@ -117,6 +119,8 @@
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
         clearFormVal($('#search-box'));
+        $("#io_type").val("1");
+        form.render();
         tableReload(false);
     });
 

--
Gitblit v1.9.1