From a8b6582ffbcdc353bd06436d76e262e547114897 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 29 十月 2022 12:49:35 +0800
Subject: [PATCH] #
---
src/main/webapp/views/mat/mat.html | 8 ++++----
src/main/java/com/zy/asrs/entity/Mat.java | 19 ++++++++++++++-----
src/main/webapp/static/js/common.js | 4 ++--
3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index aae5257..420a5f5 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -306,17 +306,26 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
@TableField("store_max")
private Double storeMax;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
@TableField("store_min")
private Double storeMin;
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
@TableField("store_max_date")
private Integer storeMaxDate;
/**
- * 鏄惁涓洪绻佸叆鍑哄簱鐗╂枡
+ * 楂橀鍏ュ嚭搴撶墿鏂�
*/
@TableField("inout_everyday")
private Boolean inoutEveryday;
@@ -510,7 +519,7 @@
public String getStoreMax$(){
if (Cools.isEmpty(this.storeMax)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMax + "";
}
@@ -518,7 +527,7 @@
public String getStoreMin$(){
if (Cools.isEmpty(this.storeMin)) {
- return "鏈缃�";
+ return "";
}else {
return this.storeMin + "";
}
@@ -526,9 +535,9 @@
public String getStoreMaxDate$(){
if (Cools.isEmpty(this.storeMaxDate)) {
- return "鏈缃�";
+ return "";
}else {
- return this.storeMaxDate + "澶�";
+ return this.storeMaxDate + "";
}
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 7698016..acf6d61 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -221,8 +221,8 @@
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
,{field: 'storeMax$', align: 'center',title: '搴撳瓨涓婇檺'}
,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
- ,{field: 'storeMaxDate$', align: 'center',title: '鏈�澶ф粸鐣欐椂闂�'}
- ,{field: 'inoutEveryday$', align: 'center',title: '棰戠箒鍏ュ嚭搴撶墿鏂�'}
+ ,{field: 'storeMaxDate$', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
+ ,{field: 'inoutEveryday$', align: 'center',title: '楂橀', width: 60}
]
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 7744925..31b2fda 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -204,13 +204,13 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">婊炵暀鏃堕棿</label>
+ <label class="layui-form-label">搴撻緞涓婇檺(澶�)</label>
<div class="layui-input-block">
- <input name="storeMaxDate" placeholder="鏈�澶ф粸鐣欐椂闂�(澶�)" type="number" class="layui-input">
+ <input name="storeMaxDate" placeholder="搴撻緞涓婇檺(澶�)" type="number" class="layui-input">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">棰戠箒鍏ュ嚭搴撶墿鏂�</label>
+ <label class="layui-form-label layui-form-required">楂橀鐗╂枡</label>
<div class="layui-input-block">
<select name="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
<option value="0">鍚�</option>
@@ -240,7 +240,7 @@
<div class="layui-form-item">
<label class="layui-form-label">搴撳瓨涓嬮檺</label>
<div class="layui-input-block">
- <input name="storeMin" placeholder="搴撳瓨涓嬬嚎" type="number" class="layui-input">
+ <input name="storeMin" placeholder="搴撳瓨涓嬮檺" type="number" class="layui-input">
</div>
</div>
--
Gitblit v1.9.1