From 9fc2da5ed4400d616fcddb25a802454de1854fef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 12 十月 2022 13:05:27 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkCharge/wrkCharge.js | 78 +++++++++++++++++++++----
src/main/java/com/zy/asrs/controller/WrkChargeController.java | 15 +++++
src/main/webapp/views/wrkCharge/wrkCharge.html | 29 ++++++++-
3 files changed, 105 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkChargeController.java b/src/main/java/com/zy/asrs/controller/WrkChargeController.java
index 84f7003..a11c4da 100644
--- a/src/main/java/com/zy/asrs/controller/WrkChargeController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkChargeController.java
@@ -124,4 +124,19 @@
return R.ok();
}
+ @RequestMapping(value = "/wrkCharge/truncate/charge/auth")
+ @ManagerAuth
+ public R truncateCharge() {
+ wrkChargeService.delete(new EntityWrapper<WrkCharge>().eq("memo", "charge"));
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkCharge/truncate/demo/auth")
+ @ManagerAuth
+ public R truncateMemo() {
+ wrkChargeService.delete(new EntityWrapper<WrkCharge>().eq("memo", "demo"));
+ return R.ok();
+ }
+
+
}
diff --git a/src/main/webapp/static/js/wrkCharge/wrkCharge.js b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
index 7508e72..b1a7613 100644
--- a/src/main/webapp/static/js/wrkCharge/wrkCharge.js
+++ b/src/main/webapp/static/js/wrkCharge/wrkCharge.js
@@ -23,27 +23,27 @@
cols: [[
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'mk', align: 'center',title: '鏍囪'}
+ ,{align: 'center',title: '浠诲姟绫诲瀷', templet: '#memoTpl'}
+ // ,{field: 'mk', align: 'center',title: '鏍囪'}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
+ // ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
,{field: 'steNo$', align: 'center',title: '绌挎杞�'}
- ,{field: 'outMost', align: 'center',title: '宸烽亾鍙�'}
- ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
+ // ,{field: 'outMost', align: 'center',title: '宸烽亾鍙�'}
+ // ,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
+ // ,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
+ // ,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'emptyMk', align: 'center',title: '绌烘澘(checkBox)'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
+ // ,{field: 'emptyMk', align: 'center',title: '绌烘澘(checkBox)'}
+ // ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
+ // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�'}
+ // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -89,6 +89,56 @@
table.on('toolbar(wrkCharge)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
+ case 'clearCharge':
+ layer.confirm('纭畾閲嶇疆鍏呯數浠诲姟鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkCharge/truncate/charge/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ break;
+ case 'clearMemo':
+ layer.confirm('纭畾閲嶇疆婕旂ず浠诲姟鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/wrkCharge/truncate/demo/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ break;
case 'addData':
showEditModel();
break;
diff --git a/src/main/webapp/views/wrkCharge/wrkCharge.html b/src/main/webapp/views/wrkCharge/wrkCharge.html
index 5c0dfa8..726982c 100644
--- a/src/main/webapp/views/wrkCharge/wrkCharge.html
+++ b/src/main/webapp/views/wrkCharge/wrkCharge.html
@@ -19,7 +19,21 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="wrk_no" placeholder="浠诲姟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="ste_no" placeholder="绌挎杞�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="memo">
+ <option value="">閫夋嫨绫诲瀷</option>
+ <option value="charge">鍏呯數浠诲姟</option>
+ <option value="memo">婕旂ず浠诲姟</option>
+ </select>
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -47,16 +61,25 @@
</div>
</div>
+<script type="text/html" id="memoTpl">
+ {{# if(d.memo === "charge"){ }}
+ <span name="memo" class="layui-badge layui-badge-red" >鍏呯數浠诲姟</span>
+ {{# } }}
+ {{# if(d.memo === "memo"){ }}
+ <span name="memo" class="layui-badge layui-badge-red" >婕旂ず浠诲姟</span>
+ {{# } }}
+</script>
+
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-clear-charge" lay-event="clearCharge">閲嶇疆鍏呯數浠诲姟</button>
+ <button class="layui-btn layui-btn-sm " id="btn-clear-memo" lay-event="clearMemo">閲嶇疆婕旂ず浠诲姟</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
</script>
--
Gitblit v1.9.1