From 64f12d06f306b0e68c7792df0eebc093c9f40e2f Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 20 三月 2021 08:18:50 +0800
Subject: [PATCH] 1.0.3 erp出库-发货通知
---
src/main/webapp/static/js/pakStore/outStock.js | 6 +++---
src/main/webapp/views/pakStore/outStock.html | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/outStock.js b/src/main/webapp/static/js/pakStore/outStock.js
index 7fa2667..556ff58 100644
--- a/src/main/webapp/static/js/pakStore/outStock.js
+++ b/src/main/webapp/static/js/pakStore/outStock.js
@@ -1,4 +1,5 @@
var pageCurr;
+var tableMerge;
function getCol() {
var cols = [];
@@ -24,7 +25,7 @@
var layDate = layui.laydate;
var form = layui.form;
var upload = layui.upload;
- var tableMerge = layui.tableMerge
+ tableMerge = layui.tableMerge
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -111,8 +112,7 @@
pageCurr -= 1;
}
limit(child);
- // 褰撳墠鍒嗛〉鏁版嵁瀛樺偍
- locNormalList = res.data;
+ tableMerge.render(this);
}
});
}
diff --git a/src/main/webapp/views/pakStore/outStock.html b/src/main/webapp/views/pakStore/outStock.html
index 8e727b8..9d040ee 100644
--- a/src/main/webapp/views/pakStore/outStock.html
+++ b/src/main/webapp/views/pakStore/outStock.html
@@ -41,7 +41,7 @@
<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="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1