From 2b7d6339d1ff61ab767340fdc4ef59603dc9e6e5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 09:07:45 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 7 ++-
src/main/webapp/views/pakStore/locCheckOut.html | 2 +
src/main/webapp/views/pakStore/pakStore.html | 2
src/main/webapp/views/pakStore/stockOut.html | 2
src/main/webapp/static/js/pakStore/pakStore.js | 34 ++++++++--------
src/main/webapp/static/js/pakStore/stockOut.js | 38 +++++++++---------
6 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index e3e95c4..bce5470 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -8,12 +8,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',
@@ -175,4 +178,4 @@
locDetlData.push.apply(locDetlData, data);
tableIns.reload({data: locDetlData});
layer.close(locDetlLayerIdx);
-}
\ 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 9a189f5..cdfcffd 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,4 +1,4 @@
-var admin;
+var matCodeLayerIdx;
var initCountVal = 0;
var matCodeData = [];
function getCol() {
@@ -18,7 +18,7 @@
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- admin = layui.admin;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -146,24 +146,24 @@
})
}
+ // 鎻愬彇鐗╂枡
+ $(document).on('click','#mat-query', function () {
+ matCodeLayerIdx = admin.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'matQuery.html',
+ success: function(layero, index){
+ }
+ });
+ })
});
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- matCodeLayerIdx = admin.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
- }
- });
-}
+
// 鎵爜
function focusMat(el) {
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index af9afd9..dc21d99 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -1,4 +1,4 @@
-var admin;
+var locDetlLayerIdx;
var locDetlData = [];
function getCol() {
var cols = [
@@ -14,12 +14,12 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['admin', 'table','laydate', 'form'], function() {
+}).use(['table','laydate', 'form', 'admin'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- admin = layui.admin;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -134,23 +134,23 @@
}
})
}
+
+
+ $(document).on('click','#mat-query', function () {
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'locDetlQuery.html',
+ success: function(layero, index){
+ }
+ });
+ })
+
})
-
-
-var locDetlLayerIdx;
-function getLocDetl() {
- locDetlLayerIdx = layer.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'locDetlQuery.html',
- success: function(layero, index){
- }
- });
-}
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
diff --git a/src/main/webapp/views/pakStore/locCheckOut.html b/src/main/webapp/views/pakStore/locCheckOut.html
index 88a4ace..4e04c5c 100644
--- a/src/main/webapp/views/pakStore/locCheckOut.html
+++ b/src/main/webapp/views/pakStore/locCheckOut.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;
diff --git a/src/main/webapp/views/pakStore/pakStore.html b/src/main/webapp/views/pakStore/pakStore.html
index 8fa2c5c..820bbee 100644
--- a/src/main/webapp/views/pakStore/pakStore.html
+++ b/src/main/webapp/views/pakStore/pakStore.html
@@ -85,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">鎻愬彇鍟嗗搧</button>
</div>
<hr>
diff --git a/src/main/webapp/views/pakStore/stockOut.html b/src/main/webapp/views/pakStore/stockOut.html
index ce6a1f7..3e02f19 100644
--- a/src/main/webapp/views/pakStore/stockOut.html
+++ b/src/main/webapp/views/pakStore/stockOut.html
@@ -83,7 +83,7 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
- <button id="mat-query" class="function-btn" onclick="getLocDetl()">鎻愬彇搴撳瓨</button>
+ <button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
</div>
<hr>
--
Gitblit v1.9.1