From 8e504e7057ec0911547b9c935b2e5e5beef7842c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 01 四月 2022 15:21:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 1
src/main/webapp/static/js/pakStore/stockAdjust.js | 66 +++++++++++++++++----------------
src/main/webapp/views/pakStore/stockAdjust.html | 12 +++--
3 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 8292b5e..0556824 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -232,7 +232,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
-
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 27412cd..fc2db36 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -2,6 +2,7 @@
var initAnfmeVal = "-";
var matCodeData = [];
var currLocNo;
+var matCodeLayerIdx;
function getCol() {
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
@@ -13,12 +14,15 @@
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -48,7 +52,7 @@
return;
}
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛娣诲姞鏄庣粏");
return;
}
for (var i=0;i<matCodeData.length;i++){
@@ -98,7 +102,7 @@
matCodeData.splice(i, 1);
}
}
- tableIns.reload({data: matCodeData,done:function (res) {limit();}});
+ tableIns.reload({data: matCodeData});
break;
}
});
@@ -142,9 +146,7 @@
// 閲嶈浇琛ㄦ牸
function tableReload() {
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
+ tableIns.reload({data: matCodeData});
}
// 搴撲綅鎻愮ず妗�
@@ -158,7 +160,7 @@
$('.not-retrieve').hide();
currLocNo = locNo;
} else {
- layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿");
+ layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿", {icon: 2});
$('.not-retrieve').show();
$("#locMsg").html("");
$(".retrieve").hide();
@@ -188,31 +190,31 @@
layer.msg("鏁伴噺蹇呴』澶т簬闆�");
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
+ tableIns.reload({data: matCodeData});
}
-})
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�")
- inputTip($("#searchLocNo"));
- return;
- }
- matCodeLayerIdx = layer.open({
- type: 2,
- title: '鎻愬彇鐗╂枡',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
+ $(document).on('click','#mat-query', function () {
+ if (isEmpty(currLocNo)) {
+ layer.msg("璇峰厛妫�绱㈠簱浣�")
+ inputTip($("#searchLocNo"));
+ return;
}
- });
-}
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ matCodeLayerIdx = admin.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'matQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
+})
// 鎼滅储妗嗙┖鍊兼彁绀�
function inputTip(el) {
@@ -228,7 +230,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].matnr) {
+ if (data[i].matnr === matCodeData[j].matnr) {
pass = true;
break;
}
@@ -238,7 +240,7 @@
count: initCountVal,
anfme: initAnfmeVal,
removeBtn: true,
- matnr: data[i].matNo,
+ matnr: data[i].matnr,
maktx: data[i].matName,
lgnum: data[i].str2,
type: data[i].str5,
@@ -254,4 +256,4 @@
matCodeData.push.apply(matCodeData,applyData);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
-}
\ No newline at end of file
+}
diff --git a/src/main/webapp/views/pakStore/stockAdjust.html b/src/main/webapp/views/pakStore/stockAdjust.html
index 03b0b16..ff3780f 100644
--- a/src/main/webapp/views/pakStore/stockAdjust.html
+++ b/src/main/webapp/views/pakStore/stockAdjust.html
@@ -7,6 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
@@ -14,6 +15,7 @@
height: 100%;
padding: 10px;
background-color: #f1f1f1;
+ box-sizing: border-box;
}
body {
background-color: #fff;
@@ -88,12 +90,12 @@
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
<!-- 搴撲綅鎻愮ず -->
- <div style="display: inline-block; font-size: 16px">
- <div class="not-retrieve" style="color: red">
+ <div style="display: inline-block; font-size: 20px;font-weight: 300">
+ <div class="not-retrieve" style="color: #ff0000;font-family: '榛戜綋';">
璇峰厛妫�绱㈠簱浣�
</div>
- <div class="retrieve" style="display: none;color: blue">
- 褰撳墠妫�绱㈠簱浣�: <span id="locMsg"></span>
+ <div class="retrieve" style="display: none;color: #0097ff;font-family: '榛戜綋';">
+ 褰撳墠妫�绱㈠簱浣�: <span id="locMsg" style=""></span>
</div>
</div>
@@ -103,7 +105,7 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
- <button id="mat-query" class="function-btn" onclick="getMat()">鏂板搴撳瓨</button>
+ <button id="mat-query" class="function-btn">鏂板搴撳瓨</button>
</div>
<!-- 澶撮儴 -->
--
Gitblit v1.9.1