From 8f1fa732500e18863a7f79a054c241c68b192147 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 三月 2021 17:08:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/ioWorks/matQuery.html | 28 ++++---------
src/main/webapp/static/js/ioWorks/stockIn.js | 38 +++----------------
src/main/webapp/views/ioWorks/stockOut.html | 7 ---
3 files changed, 16 insertions(+), 57 deletions(-)
diff --git a/src/main/webapp/static/js/ioWorks/stockIn.js b/src/main/webapp/static/js/ioWorks/stockIn.js
index d40dd18..674e01b 100644
--- a/src/main/webapp/static/js/ioWorks/stockIn.js
+++ b/src/main/webapp/static/js/ioWorks/stockIn.js
@@ -29,13 +29,12 @@
$('td[data-field=count] div').html(initCountVal);
setMatCodeData(res.data);
limit();
- getInBound();
}
});
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -74,7 +73,7 @@
if (res.code === 200){
layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+ tableIns.reload({data: matCodeData,done:function (res) { limit();}});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -92,13 +91,12 @@
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);
}
}
tableIns.reload({data: matCodeData,done:function (res) {
limit();
- getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
}});
break;
@@ -112,13 +110,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;
}
}
@@ -129,33 +127,9 @@
tableIns.reload({data: matCodeData,done:function (res) {
limit();
- getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
}});
}
-
- // 鑾峰彇鍙敤鍏ュ簱绔欑偣
- function getInBound() {
- $.ajax({
- url: baseUrl + "/available/put/site",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- var tpl = $("#putSiteSelectTemplate").html();
- var template = Handlebars.compile(tpl);
- var html = template(res);
- $('#putSiteSelect').append(html);
- form.render('select');
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- }
-
});
@@ -179,7 +153,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matNo) {
+ if (data[i].matnr === matCodeData[j].matnr) {
pass = true;
break;
}
diff --git a/src/main/webapp/views/ioWorks/matQuery.html b/src/main/webapp/views/ioWorks/matQuery.html
index 3465138..c3d31d7 100644
--- a/src/main/webapp/views/ioWorks/matQuery.html
+++ b/src/main/webapp/views/ioWorks/matQuery.html
@@ -27,28 +27,18 @@
<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="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="str2" placeholder="鐗╂枡绫诲埆" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="str3" placeholder="瑙勬牸鍨嬪彿" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input layui-laydate-range" name="update_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
</div>
</div>
<!-- 寰呮坊鍔� -->
@@ -83,8 +73,8 @@
];
cols.push.apply(cols, matCols);
cols.push(
- {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true},
- {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ {field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true},
+ {field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
)
return cols;
}
diff --git a/src/main/webapp/views/ioWorks/stockOut.html b/src/main/webapp/views/ioWorks/stockOut.html
index 0e2dbb2..3e712c9 100644
--- a/src/main/webapp/views/ioWorks/stockOut.html
+++ b/src/main/webapp/views/ioWorks/stockOut.html
@@ -93,12 +93,7 @@
<script type="text/html" id="toolbar">
<div class="layui-form">
<div class="layui-btn-container">
- <!-- 1.閫夋嫨鍑哄簱鍙� -->
-<!-- <span id="staNoSpan">鍑哄簱鍙ｏ細</span>-->
-<!-- <select id="staNoSelect" lay-verify="required">-->
-<!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
-<!-- </select>-->
- <!-- 2.鍚姩鍑哄簱 -->
+ <!-- 鍚姩鍑哄簱 -->
<button class="layui-btn layui-btn-lg layui-btn-normal" id="btn-outbound" lay-event="outbound">纭鍑哄簱</button>
</div>
</div>
--
Gitblit v1.9.1