From f61eee2e6166cfde93e0eccccb9f1cdc80beb636 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 12:18:56 +0800
Subject: [PATCH] 联调
---
src/main/webapp/views/mat/mat.html | 69 ++++++++++++++++++----------------
src/main/webapp/static/js/common.js | 4 +-
2 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 8591e21..624d8e1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -182,11 +182,11 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'name', align: 'center',title: '濂楀彿'}
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 7fa0553..18717f2 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -192,42 +192,42 @@
</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">
- <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ュ瀷鏉愬瀷鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</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="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
+ <input name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input">
</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="weight" placeholder="璇疯緭鍏ユ�婚噸閲�" class="layui-input">
+ <input name="name" placeholder="璇疯緭鍏ュ鍙�" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">寮�妯″鍘�</label>
- <div class="layui-input-block">
- <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">寮�妯″鍘�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="volume" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-col-md6">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
- <div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">妯″叿鍚嶇О</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ユā鍏峰悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
@@ -236,24 +236,27 @@
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-block">
- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">澶囨敞</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">妯″瓟鏁�</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="length" placeholder="璇疯緭鍏ユā瀛旀暟" class="layui-input">-->
+<!-- </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="length" placeholder="璇疯緭鍏ユā瀛旀暟" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">寮�妯″鍘�</label>
- <div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ュ紑妯″鍘�" class="layui-input">
+ <select id="status" name="status" lay-filter="status" placeholder="璇烽�夋嫨鐘舵��">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="">姝ｅ父</option>
+ <option value="">鎶ュ簾</option>
+ </select>
</div>
</div>
--
Gitblit v1.9.1