增加了禁止操作注销设备的代码
diff --git a/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java b/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
index 182f4cc..5aac203 100644
--- a/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/water/service/impl/DeviceServiceImpl.java
@@ -64,6 +64,9 @@
Optional<TArea> regiOption = areaDao.findByAvailableAndAreano(1, device.getAreano());
if (deviOption.isPresent() && regiOption.isPresent()) {
TDevice oldDevice = deviOption.get();
+ if (oldDevice.getDeviceStatus().equals("closed")) {
+ return false;
+ }
TArea region = regiOption.get();
oldDevice.setDevicename(device.getDevicename());
oldDevice.setDeviceno(device.getDeviceno());
@@ -146,6 +149,7 @@
List<String> list = new ArrayList<>();
list.add("正常");
list.add("注销");
+ list.add("签出");
return list;
}
diff --git a/src/main/resources/templates/system/device/index.html b/src/main/resources/templates/system/device/index.html
index 8670b7a..a210289 100644
--- a/src/main/resources/templates/system/device/index.html
+++ b/src/main/resources/templates/system/device/index.html
@@ -136,8 +136,15 @@
{field: 'softVer', align: 'center', title: '版本号'},
{
field: 'deviceId', align: 'center', title: '操作', unresize: true, templet: function (item) {
- let html = ' <a class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>修改</a> ' +
- '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>'
+ var html;
+ if (item.deviceStatus === 'closed') {
+ html = ' <a class="layui-btn layui-btn-xs layui-btn-disabled"><i class="layui-icon layui-icon-edit"></i>修改</a> ' +
+ '<a class="layui-btn layui-btn-danger layui-btn-xs layui-btn-disabled"><i class="layui-icon layui-icon-delete"></i>删除</a>';
+ } else {
+ html = ' <a class="layui-btn layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>修改</a> ' +
+ '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>';
+ }
+
// ' <a class="layui-btn layui-btn-warm layui-btn-xs" lay-event="addfunc"><i class="layui-icon layui-icon-set-sm"></i>删除</a> ';
// if (item.editflag === 1) {
// html += '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>';