From 8cfa02d7336c30a1c83e0e831ca1e6aeca10157d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 23 三月 2022 09:51:32 +0800
Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】
---
src/main/java/com/zy/asrs/controller/OrderController.java | 14 +++++++++++++-
src/main/webapp/static/js/order/order.js | 18 ++++++++++--------
src/main/webapp/views/order/order.html | 11 +++++++----
3 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 63d2585..8f4ba73 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -26,7 +26,19 @@
@Autowired
private OrderService orderService;
-
+ @RequestMapping(value = "/order/head/page/auth")
+ @ManagerAuth
+ public R head(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
+ }
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 48e11b9..c2ac07a 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -12,17 +12,19 @@
// 娓叉煋琛ㄦ牸
var insTb = table.render({
- elem: '#waitMatin',
- url: baseUrl+'/waitMatin/head/page/auth',
+ elem: '#order',
+ url: baseUrl+'/order/head/page/auth',
headers: {token: localStorage.getItem('token')},
page: true,
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'billNo', title: '鍗曟嵁缂栧彿', sort: true},
- {field: 'billType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
+ {field: 'orderNo', title: '鍗曟嵁缂栧彿', sort: true},
+ {field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
- {field: 'appeTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+ {field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
+ {field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
+ {field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', minWidth: 130, width: 130}
]],
request: {
@@ -48,17 +50,17 @@
});
// 鎼滅储
- form.on('submit(waitMatinSearch)', function (data) {
+ form.on('submit(tbSearch)', function (data) {
insTb.reload({where: data.field, page: {curr: 1}});
});
// 娣诲姞
- $("#waitMatinAddBtn").click(function () {
+ $("#orderAddBtn").click(function () {
showEditModel();
});
// 宸ュ叿鏉＄偣鍑讳簨浠�
- table.on('tool(waitMatin)', function (obj) {
+ table.on('tool(order)', function (obj) {
var data = obj.data;
var layEvent = obj.event;
if (layEvent === 'edit') {
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 1c79663..1e90103 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -47,15 +47,15 @@
</div>
</div>
<div class="layui-inline">
- <button class="layui-btn icon-btn" lay-filter="waitMatinSearch" lay-submit>
+ <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
- <button id="waitMatinAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞
+ <button id="orderAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞
</button>
</div>
</div>
</div>
- <table id="waitMatin" lay-filter="waitMatin"></table>
+ <table id="order" lay-filter="order"></table>
</div>
</div>
<div class="layui-card">
@@ -77,6 +77,9 @@
<i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
</a>
</span>
+</script>
+<script type="text/html" id="settleTpl">
+ <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
@@ -144,7 +147,7 @@
<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/waitMatin/waitMatin.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script>
</body>
</html>
--
Gitblit v1.9.1