From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/webapp/views/matCode/matCode_detail.html | 135 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 35c982c..982fe35 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -15,16 +15,16 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form">
- <!--
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
</div>
- </div>
- -->
+ -->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栫爜锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栫爜锛�</label>
<div class="layui-input-inline">
<input id="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
</div>
@@ -36,42 +36,139 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡鍚嶇О锛�</label>
+ <label class="layui-form-label">浜у搧鍚嶇О锛�</label>
<div class="layui-input-inline">
<input id="matName" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡瑙勬牸锛�</label>
+ <label class="layui-form-label">瑙勬牸锛�</label>
<div class="layui-input-inline">
- <input id="str2" class="layui-input" type="text">
+ <input id="specs" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍗曚綅锛�</label>
+ <div class="layui-input-inline">
+ <input id="unit" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">灏哄锛�</label>
+ <div class="layui-input-inline">
+ <input id="size" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">棰滆壊锛�</label>
<div class="layui-input-inline">
- <input id="str3" class="layui-input" type="text">
+ <input id="color" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">閲嶉噺锛�</label>
+ <div class="layui-inline" style="width:31%">
+ <label class="layui-form-label">鍗曢噸锛�</label>
<div class="layui-input-inline">
- <input id="num1" class="layui-input" type="text" lay-verify="number" >
+ <input id="weight" class="layui-input" type="text" lay-verify="number" >
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鐗╂枡鍗曚綅锛�</label>
+
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str1" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">瀹㈡埛锛�</label>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿锛�</label>
+ <div class="layui-input-inline">
+ <input id="str2" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str3" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
<div class="layui-input-inline">
<input id="str4" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str5" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str6" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str7" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str8" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str9" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="str10" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="num1" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="num2" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="num3" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="num4" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="num5" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
+ <label class="layui-form-label">锛�</label>
+ <div class="layui-input-inline">
+ <input id="date1$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label">鍒� 寤� 鑰咃細</label>
<div class="layui-input-inline cool-auto-complete">
<input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none">
--
Gitblit v1.9.1