From bcd0612507f2ec76fd722d3fb46c286f9c50e6cd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 三月 2025 15:42:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasShuttleController.java | 15 +++++++
src/main/webapp/static/js/basShuttle/basShuttle.js | 40 +++++++++++++++++++-
src/main/webapp/views/admin/basShuttle/basShuttle.html | 27 ++++++++++---
3 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleController.java b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
index 88a5cc9..3bbbaa9 100644
--- a/src/main/java/com/zy/asrs/controller/BasShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/BasShuttleController.java
@@ -124,4 +124,19 @@
return R.ok();
}
+ @RequestMapping(value = "/basShuttle/updateCharge")
+ @ManagerAuth
+ public R updateCharge(BasShuttle basShuttle){
+ if (Cools.isEmpty(basShuttle) || null==basShuttle.getChargeLine()){
+ return R.error();
+ }
+
+ List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>());
+ for (BasShuttle shuttle : basShuttles) {
+ shuttle.setChargeLine(basShuttle.getChargeLine());
+ basShuttleService.updateById(shuttle);
+ }
+ return R.ok();
+ }
+
}
diff --git a/src/main/webapp/static/js/basShuttle/basShuttle.js b/src/main/webapp/static/js/basShuttle/basShuttle.js
index e4811cb..5b54268 100644
--- a/src/main/webapp/static/js/basShuttle/basShuttle.js
+++ b/src/main/webapp/static/js/basShuttle/basShuttle.js
@@ -24,7 +24,7 @@
{type: 'checkbox'}
,{field: 'shuttleNo', align: 'center',title: '鍥涘悜绌挎杞﹀彿', width: 120}
,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'shuttleStatus', align: 'center',title: '浣滀笟鎬�'}
+ // ,{field: 'shuttleStatus', align: 'center',title: '浣滀笟鎬�'}
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
,{field: 'idleLoc', align: 'center',title: '鏆傚瓨搴撲綅'}
// ,{field: 'autoCharge', align: 'center',title: '鑷姩鍏呯數'}
@@ -97,6 +97,9 @@
return d.shuttleNo;
}));
break;
+ case 'oneUpdateCharge':
+ showUpdateCharge();
+ break;
case 'exportData':
admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
@@ -151,12 +154,45 @@
}
});
+ function showUpdateCharge() {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: '涓�閿慨鏀圭數閲忕嚎',
+ content: $('#updateChargeDialog').html(),
+ success: function (layero, dIndex) {
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basShuttle/updateCharge",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ }
+ });
+ }
+
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '灏忚溅鏁版嵁',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
layDateRender(mData);
diff --git a/src/main/webapp/views/admin/basShuttle/basShuttle.html b/src/main/webapp/views/admin/basShuttle/basShuttle.html
index b613769..79e3dcd 100644
--- a/src/main/webapp/views/admin/basShuttle/basShuttle.html
+++ b/src/main/webapp/views/admin/basShuttle/basShuttle.html
@@ -46,6 +46,7 @@
<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-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-sm" lay-event="oneUpdateCharge">涓�閿慨鏀圭數閲忕嚎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
@@ -81,12 +82,6 @@
<option value="1">姝ｅ父</option>
<option value="0">绂佺敤</option>
</select>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">浣滀笟鎬�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="shuttleStatus" placeholder="璇疯緭鍏ヤ綔涓氭��">
</div>
</div>
<div class="layui-form-item">
@@ -144,5 +139,25 @@
</div>
</form>
</script>
+
+<script type="text/html" id="updateChargeDialog">
+ <form id="updateChargeDetail" lay-filter="detail" class="layui-form admin-form model-form">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐢甸噺绾�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="chargeLine" placeholder="璇疯緭鍏ョ數閲忕嚎">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
</html>
--
Gitblit v1.9.1