From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/locRule/locRule.html | 64 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/locRule/locRule.html b/src/main/webapp/views/locRule/locRule.html
index 143c432..5591047 100644
--- a/src/main/webapp/views/locRule/locRule.html
+++ b/src/main/webapp/views/locRule/locRule.html
@@ -78,28 +78,34 @@
<input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍨嬪彿: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瀹㈡埛: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴�">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瑙勬牸: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ヨ鏍�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">鍨嬪彿: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="model" placeholder="璇疯緭鍏ュ瀷鍙�">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瀹㈡埛: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="cstmr" placeholder="璇疯緭鍏ュ鎴�">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">鎵瑰彿: </label>
<div class="layui-input-block">
<input class="layui-input" name="batch" placeholder="璇疯緭鍏ユ壒鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撳尯: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="other" placeholder="璇疯緭鍏ュ簱鍖猴紝涓嶅～鍒欓粯璁や负鍥涢」搴撳簱浣嶈鍒�">
</div>
</div>
<!-- <div class="layui-form-item">-->
@@ -108,12 +114,30 @@
<!-- <input class="layui-input" name="other" placeholder="璇疯緭鍏ュ叾浠�">-->
<!-- </div>-->
<!-- </div>-->
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">涓婇檺: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="limit" placeholder="璇疯緭鍏ヤ笂闄�">-->
+<!-- </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 class="layui-input" name="limit" placeholder="璇疯緭鍏ヤ笂闄�">
+ <select name="mixed">
+ <option value="1">鏄�</option>
+ <option value="0" selected>鍚�</option>
+ </select>
</div>
</div>
+<!-- <div class="layui-form-item">
+ <label class="layui-form-label">娣疯浇鏈壘鍒板簱浣嶇户缁悳绱�: </label>
+ <div class="layui-input-block">
+ <select name="keepGo">
+ <option value="1">鏄�</option>
+ <option value="0" selected>鍚�</option>
+ </select>
+ </div>
+ </div>-->
</div>
--
Gitblit v1.9.1