From f63064b50164522377c5881f97b0e630217e030c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:39:26 +0800
Subject: [PATCH] #
---
src/main/webapp/static/css/common.css | 8 +-
src/main/webapp/views/pakStore/pakStore.html | 7 +-
src/main/webapp/views/order/out.html | 2
src/main/webapp/static/js/pakStore/pakStore.js | 57 +++++-------------
src/main/webapp/views/pakStore/matQuery.html | 99 +++++++++++++-------------------
5 files changed, 67 insertions(+), 106 deletions(-)
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index db9f679..8e4fab9 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -98,9 +98,9 @@
.layui-table-box{
padding-bottom: 10px;
}
-.layui-table-body.layui-table-main{
- overflow: hidden;
-}
+/*.layui-table-body.layui-table-main{*/
+/* overflow: hidden;*/
+/*}*/
.layui-table-page{
border-width: 0;
}
@@ -222,4 +222,4 @@
/* 鍋氬搷搴斿紡甯冨眬鏃讹紝涓嶅缓璁敤鍥哄畾灏哄锛屽敖閲忕敤% */
@media only screen and (max-width: 800px) {
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 344d0e8..3b3e666 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -3,7 +3,7 @@
var matCodeData = [];
function getCol() {
var cols = [
- {fixed: 'left', field: 'count', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
{field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: blue;font-weight: bold'}
];
cols.push.apply(cols, matCols);
@@ -17,7 +17,6 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
admin = layui.admin;
@@ -30,7 +29,7 @@
toolbar: '#toolbar',
cols: [getCol()],
done: function (res, curr, count) {
- $('td[data-field=count] div').html(initCountVal);
+ $('td[data-field=anfme] div').html(initCountVal);
setMatCodeData(res.data);
limit();
getInBound();
@@ -41,22 +40,23 @@
table.on('edit(chooseData)', function (obj) {
let index = obj.tr.attr("data-index");
let data = matCodeData[index];
+ let modify = true;
if (obj.field === 'anfme'){
let vle = Number(obj.value);
if (isNaN(vle)) {
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- return false;
+ modify = false;
} else {
if (vle <= 0) {
layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- return false;
+ modify = false;
}
}
}
- data[obj.field] = obj.value;
+ if (modify) {
+ data[obj.field] = obj.value;
+ }
tableIns.reload({data: matCodeData});
-
- updateMatCodeData(obj.data.matNo, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -72,11 +72,11 @@
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
- if (isNaN(matCodeData[i].count)) {
+ if (isNaN(matCodeData[i].anfme)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
return;
}
- if (matCodeData[i].count === 0){
+ if (matCodeData[i].anfme === 0){
layer.msg("鏁伴噺涓嶈兘涓洪浂");
return;
}
@@ -115,14 +115,11 @@
switch (obj.event) {
case 'remove':
for (let i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matNo === data.matNo && matCodeData[i].batch === data.batch) {
matCodeData.splice(i, 1);
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- getInBound();
- }});
+ tableIns.reload({data: matCodeData});
break;
}
});
@@ -130,29 +127,8 @@
function setMatCodeData(data) {
matCodeData = data;
for (var i=0;i<matCodeData.length;i++){
- matCodeData[i]["count"] = initCountVal;
+ matCodeData[i]["anfme"] = initCountVal;
}
- }
-
- function updateMatCodeData(matNo, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
- matCodeData[i]["count"] = count;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
- }
- }
-
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- getInBound();
- }});
}
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
@@ -185,9 +161,10 @@
function getMat() {
matCodeLayerIdx = admin.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
shadeClose: true,
content: 'matQuery.html',
success: function(layero, index){
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 8f8369a..f329d6f 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -152,7 +152,7 @@
<!-- 鍑哄簱棰勮 -->
<script type="text/html" id="pakoutPreviewBox" style="display: none">
- <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
<span style="font-size: large; font-weight: bold">鍑哄簱棰勮</span>
</div>
<div class="layui-card">
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index ebe944e..69c9461 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -12,7 +12,7 @@
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
body {
- padding: 0 20px;
+ /*overflow: hidden;*/
}
.layui-table-box {
border-right: 1px solid #9F9F9F;
@@ -21,44 +21,47 @@
</style>
</head>
<body>
+<div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold">閫夋嫨鍟嗗搧</span>
+</div>
+<div class="layui-card" style="padding: 0 20px; overflow: scroll;">
+ <fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
+ <legend>鎼滅储鏍�</legend>
+ <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">
+ </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="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+ </div>
+ </fieldset>
-<!-- 鎼滅储鏍� -->
-<fieldset class="layui-elem-field site-demo-button" style="margin: 20px;">
- <legend>鎼滅储鏍�</legend>
- <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">
- </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="condition" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <!-- 寰呮坊鍔� -->
- <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
- </div>
+ <div class="layui-form">
+ <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
</div>
-</fieldset>
+</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn" id="btn-confirm" lay-event="confirm" style="">鎻愬彇</button>
</div>
</script>
-
-<div class="layui-form">
- <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
-</div>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -79,7 +82,7 @@
)
return cols;
}
- var pageCurr;
+
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).use(['table','laydate', 'form', 'admin'], function() {
@@ -126,12 +129,12 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(matCode)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- var data = checkStatus.data;
+ let checkStatus = table.checkStatus(obj.config.id);
+ let data = checkStatus.data;
switch(obj.event) {
case 'confirm':
if (data.length === 0){
- layer.msg("璇烽�夋嫨鏁版嵁");
+ layer.msg("璇烽�夋嫨鏁版嵁", {icon: 2});
return;
}
parent.addTableData(data);
@@ -141,13 +144,11 @@
// 鎼滅储鏍忔悳绱簨浠�
form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
+ tableReload();
});
// 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
- pageCurr = 1;
clearFormVal($('#search-box'));
tableReload();
});
@@ -159,31 +160,13 @@
});
})
- function tableReload(child) {
+ function tableReload() {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
matQueryTable.reload({
- where: searchData,
- page: {
- curr: pageCurr
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- tableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
- }
+ where: searchData
});
}
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 0319043..8fa2c5c 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -15,6 +15,7 @@
height: 100%;
padding: 10px;
background-color: #f1f1f1;
+ box-sizing: border-box;
}
body {
background-color: #fff;
@@ -27,7 +28,7 @@
}
.function-btn {
font-size: 16px;
- padding: 1px 1px 1px 1px;
+ padding: 1px 2px;
width: 100px;
height: 50px;
border-color: #2b425b;
@@ -37,7 +38,7 @@
border-style: solid;
transition: 0.4s;
cursor: pointer;
- letter-spacing: 3px;
+ letter-spacing: 1.5px;
}
.function-btn:hover {
background-color: #2b425b;
@@ -84,7 +85,7 @@
<body>
<!-- 鍔熻兘鍖� -->
<div class="function-area">
- <button id="mat-query" class="function-btn" onclick="getMat()">鏂板</button>
+ <button id="mat-query" class="function-btn" onclick="getMat()">鎻愬彇鍟嗗搧</button>
</div>
<hr>
--
Gitblit v1.9.1