From 4b4fd147ad9ca0ffaae202df9ecb093778cb82e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 22 六月 2020 08:45:35 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/locDetl/locDetl.js      |   17 ++++----
 src/main/webapp/static/js/resource/resource.js    |    2 
 src/main/webapp/views/locDetl/locDetl_detail.html |   28 +++++++-------
 src/main/webapp/views/pakStore/locDetlQuery.html  |   18 ++++----
 src/main/webapp/static/js/pakStore/stockOut.js    |   14 +++---
 5 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 3f7e484..27fb1c1 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -14,7 +14,6 @@
         page: true,
         limit: 16,
         limits: [16, 30, 50, 100, 200, 500],
-        skin: 'line',
         even: true,
         toolbar: '#toolbar',
         cellMinWidth: 50,
@@ -23,16 +22,16 @@
 //            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
             ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-            ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
-            ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+            // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
+            // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
             // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-            ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪', width:150}
-            ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-            ,{field: 'anfme', align: 'center',title: '鏁伴噺', width:80}
-            ,{field: 'altme', align: 'center',title: '鍗曚綅', width:80}
+            // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
+            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+            // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+            ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+            ,{field: 'altme', align: 'center',title: '鍗曚綅'}
             ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-            ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+            // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
             // ,{field: 'memo', align: 'center',title: '澶囨敞'}
 
             // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index dc7c6d1..ea7f599 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -19,15 +19,15 @@
             ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
             ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
             ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-            ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
-            ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+            // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
+            // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
             // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-            ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
-            ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪', width:150}
-            ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-            ,{field: 'altme', align: 'center',title: '鍗曚綅', width:80}
+            // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
+            ,{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'}
+            // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
         ]],
         done: function(res, curr, count) {
diff --git a/src/main/webapp/static/js/resource/resource.js b/src/main/webapp/static/js/resource/resource.js
index df9ecf4..5b5610d 100644
--- a/src/main/webapp/static/js/resource/resource.js
+++ b/src/main/webapp/static/js/resource/resource.js
@@ -21,7 +21,7 @@
             ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
             ,{field: 'code', align: 'center',title: '鑿滃崟缂栫爜'}
             ,{field: 'name', align: 'center',title: '鑿滃崟鍚嶇О'}
-            ,{field: 'resourceName', align: 'center',title: '鐖剁骇鑿滃崟',event: 'Resource', style: 'text-decoration: underline;cursor:pointer'}
+            ,{field: 'resourceName', align: 'center',title: '鐖剁骇鑿滃崟'}
             ,{field: 'level$', align: 'center',title: '鑿滃崟绛夌骇'}
             ,{field: 'sort', align: 'center',title: '鎺掑簭'}
             // ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/views/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index 2b10b71..7684ede 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -41,28 +41,28 @@
                 <input id="matnr" class="layui-input" type="text" onkeyup="check(this.id, 'locDetl')" lay-verify="required" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label"><span class="not-null">*</span>浠� 搴� 鍙凤細</label>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">浠� 搴� 鍙凤細</label>
             <div class="layui-input-inline">
-                <input id="lgnum" class="layui-input" type="text" lay-verify="required" >
+                <input id="lgnum" class="layui-input" type="text" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>杞偍璇锋眰缂栧彿锛�</label>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label" style="font-size: x-small">杞偍璇锋眰缂栧彿锛�</label>
             <div class="layui-input-inline">
-                <input id="tbnum" class="layui-input" type="text" lay-verify="required|number" >
+                <input id="tbnum" class="layui-input" type="text" lay-verify="number" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label"><span class="not-null">*</span>琛� 椤� 鐩細</label>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label">琛� 椤� 鐩細</label>
             <div class="layui-input-inline">
-                <input id="tbpos" class="layui-input" type="text" lay-verify="required|number" >
+                <input id="tbpos" class="layui-input" type="text" lay-verify="number" >
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
-            <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>鐗╂枡鏍囩ID锛�</label>
+        <div class="layui-inline"  style="width:31%;display: none">
+            <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
             <div class="layui-input-inline">
-                <input id="zmatid" class="layui-input" type="text" lay-verify="required" >
+                <input id="zmatid" class="layui-input" type="text" >
             </div>
         </div>
         <div class="layui-inline"  style="width:31%;">
@@ -71,7 +71,7 @@
                 <input id="maktx" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
+        <div class="layui-inline"  style="width:31%;display: none">
             <label class="layui-form-label">宸ャ��銆�鍘傦細</label>
             <div class="layui-input-inline">
                 <input id="werks" class="layui-input" type="text">
@@ -95,7 +95,7 @@
                 <input id="zpallet" class="layui-input" type="text">
             </div>
         </div>
-        <div class="layui-inline"  style="width:31%;">
+        <div class="layui-inline"  style="width:31%;display: none">
             <label class="layui-form-label">鐢ㄦ埛ID锛�</label>
             <div class="layui-input-inline">
                 <input id="bname" class="layui-input" type="text">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 7aa9f1e..efe43ab 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,7 +51,7 @@
         </div>
         <div class="layui-inline">
             <div class="layui-input-inline">
-                <input class="layui-input" type="text" name="matnr" placeholder="绠卞彿/鎵瑰彿"  autocomplete="off">
+                <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�"  autocomplete="off">
             </div>
         </div>
         <div class="layui-inline">
@@ -107,16 +107,16 @@
                 {type: 'checkbox'}
                 ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
                 ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
-                ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
-                ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
+                // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80}
+                // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
                 // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
-                ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
-                ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪', width:150}
-                ,{field: 'werks', align: 'center',title: '宸ュ巶'}
-                ,{field: 'anfme', align: 'center',title: '鏁伴噺', width:80}
-                ,{field: 'altme', align: 'center',title: '鍗曚綅', width:80}
+                // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200}
+                ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+                // ,{field: 'werks', align: 'center',title: '宸ュ巶'}
+                ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+                ,{field: 'altme', align: 'center',title: '鍗曚綅'}
                 ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
-                ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
+                // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
                 // ,{field: 'memo', align: 'center',title: '澶囨敞'}
 
             ]],

--
Gitblit v1.9.1