From df142079833e357624e64bd327e40e1f5f2e8fa9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 三月 2021 17:01:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/check/check.html | 39 +++++++------------
src/main/webapp/static/js/check/check.js | 16 ++++----
src/main/webapp/views/pda/stockCheck.html | 10 +++-
3 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/check/check.js b/src/main/webapp/static/js/check/check.js
index faab0f6..74c4273 100644
--- a/src/main/webapp/static/js/check/check.js
+++ b/src/main/webapp/static/js/check/check.js
@@ -28,19 +28,19 @@
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷'}
- ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'oriQty', align: 'center',title: '璐﹂潰鏁伴噺'}
- ,{field: 'cekQty', align: 'center',title: '瀹炵洏鏁伴噺'}
- ,{field: 'settle$', align: 'center',title: '鐩堜簭'}
+ ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷', hide: true}
+ ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'oriQty', align: 'center',title: '璐﹂潰鏁伴噺 (鍘�)', style: 'font-weight: bolder'}
+ ,{field: 'cekQty', align: 'center',title: '瀹炵洏鏁伴噺 (鐜�)', style: 'font-weight: bolder; color: blue'}
+ ,{field: 'settle$', align: 'center',title: '鐩堜簭', templet: '#checkTpl', width: 100}
,{field: 'status$', align: 'center',title: '鐘舵��', hide: true}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
+ ,{field: 'createTime$', align: 'center',title: '鐩樼偣鏃堕棿'}
+ ,{field: 'createBy$', align: 'center',title: '鐩樼偣浜哄憳'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/check/check.html b/src/main/webapp/views/check/check.html
index b65ed03..03393ab 100644
--- a/src/main/webapp/views/check/check.html
+++ b/src/main/webapp/views/check/check.html
@@ -15,11 +15,6 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="nodeId" class="layui-input" name="node_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
<input id="nodeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩樼偣璐т綅" onfocus=this.blur()>
@@ -31,28 +26,15 @@
</div>
</div>
<div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="createBy" class="layui-input" name="create_by" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="娣诲姞浜哄憳" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
- <div class="layui-input-inline cool-auto-complete">
- <input id="updateBy" class="layui-input" name="update_by" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="淇敼浜哄憳" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
-
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -66,7 +48,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
@@ -74,7 +56,16 @@
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!-- <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
+</script>
+<script type="text/html" id="checkTpl">
+ <span name="settle"
+ {{# if( d.settle === 1){ }}
+ class="layui-badge layui-badge-green"
+ {{# } else if(d.settle === 2){ }}
+ class="layui-badge layui-badge-red"
+ {{# } }}
+ >{{d.settle$}}</span>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 525e933..8107089 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -299,9 +299,13 @@
tips("璐т綅涓嶈兘涓虹┖", true);
return;
}
- if (locDetlData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
+ if (locDetlData.length > 0) {
+ for (var i = 0; i<locDetlData.length; i++) {
+ if (locDetlData[i].count === null || locDetlData[i].count === 0) {
+ tips(locDetlData[i].matnr + "鍟嗗搧鏁伴噺閿欒", true);
+ return;
+ }
+ }
}
$.ajax({
url: baseUrl+"/work/stock/check",
--
Gitblit v1.9.1