From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/webapp/static/js/mat/mat.js | 4 ++--
src/main/webapp/views/mat/mat.html | 10 +++++-----
src/main/java/com/zy/asrs/entity/Mat.java | 8 ++++----
src/main/webapp/static/js/common.js | 6 +++---
src/main/resources/application.yml | 2 +-
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 5249268..8716473 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -338,7 +338,7 @@
private Boolean inoutEveryday;
/**
- * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ * 鐗╂枡绫诲瀷{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
*/
@ApiModelProperty(value= "鐗╂枡绫诲瀷")
@TableField("mat_type")
@@ -571,11 +571,11 @@
}
switch (this.matType) {
case 1:
- return "鍗曞搧";
+ return "鍗曞搧鍖�";
case 2:
- return "楂橀娣锋斁";
+ return "楂橀娣锋斁鍖�";
case 3:
- return "浣庨娣锋斁";
+ return "浣庨娣锋斁鍖�";
default:
return "";
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 02cb0c6..dead881 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
- url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 1aa73c7..fc8d3be 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,12 +181,12 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 290}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'specs', align: 'center',title: '瑙勬牸', width: 200}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 150}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
@@ -223,7 +223,7 @@
,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
,{field: 'storeMaxDate$', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
,{field: 'inoutEveryday$', align: 'center',title: '楂橀', width: 60}
- ,{field: 'matType$', align: 'center',title: '鐗╂枡绫诲瀷', width: 100}
+ ,{field: 'matType$', align: 'center',title: '涓婃灦鍖哄煙', width: 90}
]
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 7d814a0..8bfb2be 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,11 +5,11 @@
var cols = [
{type: 'checkbox'}
,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
- ,{field: 'matnrNew', align: 'center',title: '鏂板晢鍝佺紪鍙�', width: 180}
+ // ,{field: 'matnrNew', align: 'center',title: '鏂板晢鍝佺紪鍙�', width: 180}
];
cols.push.apply(cols, matCols);
cols.push(
- {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
)
return cols;
}
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 168492d..822810c 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -60,7 +60,7 @@
<div class="layui-fluid">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
- <div class="layui-col-md3">
+ <div class="layui-col-md2">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 鏍戝伐鍏锋爮 -->
@@ -80,7 +80,7 @@
</div>
</div>
<!-- 鍙� -->
- <div class="layui-col-md9">
+ <div class="layui-col-md10">
<div class="layui-card">
<div class="layui-card-body" style="padding: 10px;">
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
@@ -261,9 +261,9 @@
<label class="layui-form-label layui-form-required">鐗╂枡绫诲瀷</label>
<div class="layui-input-block">
<select name="matType" lay-vertype="tips" lay-verify="required" required="">
- <option value="1">鍗曞搧</option>
- <option value="2">楂橀娣锋斁</option>
- <option value="3">浣庨娣锋斁</option>
+ <option value="1">鍗曞搧鍖�</option>
+ <option value="2">楂橀娣锋斁鍖�</option>
+ <option value="3">浣庨娣锋斁鍖�</option>
</select>
</div>
</div>
--
Gitblit v1.9.1