From 79220444c7fae6e507a6df13b2c8be1578343b7d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 31 三月 2022 10:35:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pakStore/locCheckOut.html | 7 -------
src/main/webapp/views/pakStore/locMove.html | 4 +++-
src/main/webapp/static/js/pakStore/locMove.js | 16 ++++++----------
src/main/webapp/views/pakStore/emptyIn.html | 2 ++
src/main/webapp/views/pakStore/emptyOut.html | 2 ++
5 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 8625246..18bb214 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -2,16 +2,19 @@
var tableIns;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
];
cols.push.apply(cols, detlCols);
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function() {
var table = layui.table;
var $ = layui.jquery;
var form = layui.form;
+ var tableMerge = layui.tableMerge;
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -41,20 +44,13 @@
statusCode: 200
},
done: function(res, curr, count) {
+ tableMerge.render(this);
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
pageCurr=curr;
limit();
clearSelect();
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
diff --git a/src/main/webapp/views/pakStore/emptyIn.html b/src/main/webapp/views/pakStore/emptyIn.html
index a240a67..8e04707 100644
--- a/src/main/webapp/views/pakStore/emptyIn.html
+++ b/src/main/webapp/views/pakStore/emptyIn.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/emptyOut.html b/src/main/webapp/views/pakStore/emptyOut.html
index b3d986f..234d821 100644
--- a/src/main/webapp/views/pakStore/emptyOut.html
+++ b/src/main/webapp/views/pakStore/emptyOut.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/locCheckOut.html b/src/main/webapp/views/pakStore/locCheckOut.html
index b727b61..393dfba 100644
--- a/src/main/webapp/views/pakStore/locCheckOut.html
+++ b/src/main/webapp/views/pakStore/locCheckOut.html
@@ -114,13 +114,6 @@
<table class="layui-table" id="chooseData" lay-filter="chooseData"></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>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/stockOut.js" charset="utf-8"></script>
-
<script type="text/template" id="takeSiteSelectTemplate">
{{#each data}}
<option value="{{this}}">{{this}}</option>
diff --git a/src/main/webapp/views/pakStore/locMove.html b/src/main/webapp/views/pakStore/locMove.html
index b61abfa..caa24b6 100644
--- a/src/main/webapp/views/pakStore/locMove.html
+++ b/src/main/webapp/views/pakStore/locMove.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;
@@ -125,4 +127,4 @@
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1