From c5bbd10c5425971f9ca595d2c9d461d1a997c64e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 14:20:40 +0800
Subject: [PATCH] ##
---
src/main/webapp/static/js/itemTable.js | 4 +++-
src/main/java/zy/cloud/wms/manager/entity/Item.java | 10 ++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index 46291cd..304ce74 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -150,6 +150,7 @@
+
@TableField(value = "real_start_time", strategy = FieldStrategy.IGNORED)
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date realStartTime;
@@ -690,6 +691,15 @@
return null;
}
+ public String getType$$(){
+ if (this.type.equals("10")) {
+ return "闆嗘垚椤圭洰";
+ }else {
+ return "甯歌椤圭洰";
+ }
+
+ }
+
public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
}
diff --git a/src/main/webapp/static/js/itemTable.js b/src/main/webapp/static/js/itemTable.js
index 979a894..2cb36a9 100644
--- a/src/main/webapp/static/js/itemTable.js
+++ b/src/main/webapp/static/js/itemTable.js
@@ -42,7 +42,9 @@
cols: [[
{field: 'uuid', title: '璁㈠崟鍙�', width: 100, align: 'center'},
{field: 'inUuid', title: '椤圭洰缂栧彿'},
- {field: 'name', title: '椤圭洰鍚嶇О'}
+ {field: 'name', title: '椤圭洰鍚嶇О'},
+ {field: 'type$$', title: '椤圭洰绫诲瀷'}
+
]],
done: function (res, curr, count) {
$('#dictTable+.layui-table-view .layui-table-body tbody>tr:first').trigger('click');
--
Gitblit v1.9.1