优化部分页面展示

src/main/resources/templates/pages/application/application-in.html

@@ -64,7 +64,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItem(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
@@ -83,7 +83,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <input id="code" name="code" type="text"
@@ -102,7 +102,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">条形编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <input id="barCode" name="barCode" type="text"
@@ -151,7 +151,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">仓库：</label>
+                                                    <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -227,7 +227,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label"  style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
@@ -243,8 +243,8 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
-                                                    <div class="layui-input-block">
+                                                    <label class="layui-form-label"  style="height: 40px;">组合编码:</label>
+                                                    <div class="layui-input-block" >
                                                         <div class="inputdiv">
                                                             <input id="gcode" name="code" type="text"
                                                                    placeholder="请填写入组合编码"
@@ -267,7 +267,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">仓库：</label>
+                                                    <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -567,7 +567,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label"  style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input type="text" placeholder="请选择物料" class="layui-input"  style="border-style: none"
@@ -579,7 +579,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                      <label class="layui-form-label">物料编码:</label>
+                                      <label class="layui-form-label"  style="height: 40px;">物料编码:</label>
                                       <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                            <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
@@ -590,7 +590,7 @@
                                       </div>
                                  </div>
                                   <div class="layui-form-item">
-                                      <label class="layui-form-label">条形编码:</label>
+                                      <label class="layui-form-label"  style="height: 40px;">条形编码:</label>
                                       <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                            <input id="barcode" name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码" value=""
@@ -631,7 +631,7 @@
                                         </div>
                                     </div>
                                  <div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
@@ -1639,9 +1639,9 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
-                                                        <div class="inputdiv">
+                                                        <div class="inputdiv"  >
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
                                                                    style="border-style: none"
                                                                    id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)"
@@ -1655,7 +1655,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入组合编码" value=""
@@ -1675,7 +1675,7 @@
                                                     </div>
                                                 </div>
                                                  <div class="layui-form-item">
-                                                    <label class="layui-form-label">仓库：</label>
+                                                    <label class="layui-form-label"  style="height: 40px;"> 仓库：</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择仓库" class="layui-input"

src/main/resources/templates/pages/application/application-in_back.html

@@ -40,7 +40,7 @@
                             <div>
                                 <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称:</label>
+                                        <label class="layui-form-label"  style="height: 40px;">物料名称:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <input type="text" th:value="${materialById.getMname()}" placeholder="请选择物料" class="layui-input"

src/main/resources/templates/pages/application/application-in_scanQrCode.html

@@ -191,7 +191,7 @@
             }
             var depositoryItem = `
             <div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -213,7 +213,7 @@
                 let depository = scanValue.depository;
                 // 如果扫描了仓库
                 depositoryItem = `<div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
@@ -235,7 +235,7 @@
                 // 如果扫描了库位
                 let place = scanValue.place;
                 depositoryItem = `<div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label"  style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -267,7 +267,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label"  style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input type="text" placeholder="请选择物料" class="layui-input"  style="border-style: none"
@@ -279,7 +279,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                      <label class="layui-form-label">物料编码:</label>
+                                      <label class="layui-form-label"  style="height: 40px;">物料编码:</label>
                                       <div class="layui-input-block">
                                        <div class="inputdiv">
                                            <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"  onblur="selectCode(this)"
@@ -290,7 +290,7 @@
                                       </div>
                                  </div>
                                  <div class="layui-form-item">
-                                      <label class="layui-form-label">条形编码:</label>
+                                      <label class="layui-form-label"  style="height: 40px;">条形编码:</label>
                                       <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `></select>
@@ -431,7 +431,7 @@
             NewIdNumber = NewIdNumber + 1;
             // 物料名称栏目
             var depositoryItem = `  <div class="layui-form-item">
-        <label class="layui-form-label">仓库：</label>
+        <label class="layui-form-label" style="height: 40px;">仓库：</label>
             <div class="layui-input-block">
             <div class="inputdiv">
                 <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -453,7 +453,7 @@
                 let depository = scanValue.depository;
                 // 如果扫描了仓库
                 depositoryItem = `<div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input" value=` + depository.dname + `
@@ -476,7 +476,7 @@
                 // 如果扫描了库位
                 let place = scanValue.place;
                 depositoryItem = `<div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -501,7 +501,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input type="text" placeholder="请选择物料" class="layui-input"  style="border-style: none"
@@ -513,7 +513,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                      <label class="layui-form-label">物料编码:</label>
+                                      <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                       <div class="layui-input-block">
                                       <div class="inputdiv">
                                            <input id="code" name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value="" onblur="selectCode(this)"
@@ -524,7 +524,7 @@
                                       </div>
                                  </div>
                                  <div class="layui-form-item">
-                                      <label class="layui-form-label">条形编码:</label>
+                                      <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                       <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                            <input id="barcode" name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码" value=""

src/main/resources/templates/pages/application/application-out.html

@@ -64,7 +64,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItem(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择物料" class="layui-input"
@@ -81,7 +81,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id="code" name="code" type="text"
@@ -95,7 +95,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">条形编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <input id="barCode" name="barCode" type="text"
@@ -177,7 +177,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
@@ -193,7 +193,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id="gcode" name="code" type="text"
@@ -506,7 +506,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                             <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
@@ -518,7 +518,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
@@ -532,7 +532,7 @@
                                     </div>
 
                                  <div class="layui-form-item">
-                                        <label class="layui-form-label">条形编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"
@@ -585,7 +585,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
@@ -601,7 +601,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入组合编码" value=""

src/main/resources/templates/pages/application/application-out_back.html

@@ -46,7 +46,7 @@
                                       style="margin: 0 auto;max-width: 460px;padding-top: 40px;">
                                     <div class="layui-card-body" id="cardItem">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">物料名称:</label>
+                                            <label class="layui-form-label" style="height: 40px;">物料名称:</label>
                                             <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择物料" class="layui-input"

src/main/resources/templates/pages/application/application-out_scanQrCode.html

@@ -198,7 +198,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                             <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none" value="${obj.mname}"

src/main/resources/templates/pages/application/application-transfer.html

@@ -47,7 +47,7 @@
                                             <hr>
                                             <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">物料名称:</label>
+                                                <label class="layui-form-label" style="height: 40px;">物料名称:</label>
                                                 <div class="layui-input-block">
                                                     <div class="inputdiv">
                                                     <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
@@ -61,7 +61,7 @@
 
                                             </div>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">物料编码:</label>
+                                                <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                 <div class="layui-input-block" style="margin: 0px;">
                                                     <div class="inputdiv">
                                                         <input id="code" name="code" type="text" placeholder="请填写入物料编码" value=""
@@ -74,7 +74,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">条形编码:</label>
+                                                <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                 <div class="layui-input-block" style="margin: 0px;">
                                                     <div class="inputdiv">
                                                         <input id="barCode" name="barCode" type="text" placeholder="请填写入条形编码"
@@ -107,7 +107,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">仓库：</label>
+                                                <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                 <div class="layui-input-block">
                                                     <div class="inputdiv">
                                                     <input type="text" placeholder="请选择仓库" class="layui-input" style="border-style: none"
@@ -301,7 +301,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input type="text" placeholder="请选择物料" class="layui-input"  style="border-style: none"

src/main/resources/templates/pages/application/form-step-look_group.html

@@ -109,7 +109,7 @@
                                                 th:text="${groupInfo.getMname()}"></h2>
                                             <div class="layui-colla-content">
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请填写入物料编码"

src/main/resources/templates/pages/depository/table-in.html

@@ -19,12 +19,10 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">申请时间</label>
-                            <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" id="startDate" name="startDate"  autocomplete="off" placeholder="开始日期" class="layui-input">
-                            </div>
-                            <div class="layui-form-mid">-</div>
-                            <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" id="endDate" name="endDate"  autocomplete="off" placeholder="结束日期" class="layui-input">
+                            <div class="layui-input-block" >
+                                <input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate"  autocomplete="off" placeholder="开始日期" class="layui-input">
+                                -
+                                <input type="text"  style="display:inline;width: 101px;" id="endDate" name="endDate"  autocomplete="off" placeholder="结束日期" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -47,19 +45,19 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">物料编码</label>
                             <div class="layui-input-block">
-                                <input type="text" name="mcode" autocomplete="off" class="layui-input">
+                                <input type="text" name="mcode" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">型号</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off"/>
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">记录编码</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="code" name="code" autocomplete="off"/>
+                                <input type="text" class="layui-input" id="code" name="code" autocomplete="off" placeholder="请填写申请记录编码"/>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -184,7 +182,7 @@
             var req = {};
             data = data.field;
             if (data.mname !== '') {
-                req.mname = data.mname;
+                req.mname = data.mname.trim();
             }
             if (data.depositoryId !== '') {
                 req.depositoryId = data.depositoryId;
@@ -196,13 +194,13 @@
                 req.endDate = data.endDate;
             }
             if (data.code !== '') {
-                req.code = data.code;
+                req.code = data.code.trim();
             }
             if (data.mcode !== '') {
-                req.mcode = data.mcode;
+                req.mcode = data.mcode.trim();
             }
             if (data.version !== '') {
-                req.version = data.version;
+                req.version = data.version.trim();
             }
 
             //执行搜索重载

src/main/resources/templates/pages/depository/table-out.html

@@ -19,17 +19,15 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">申请时间</label>
-                            <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" id="startDate" name="startDate"  autocomplete="off" placeholder="开始日期" class="layui-input">
-                            </div>
-                            <div class="layui-form-mid">-</div>
-                            <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" id="endDate" name="endDate"  autocomplete="off" placeholder="结束日期" class="layui-input">
+                            <div class="layui-input-block" >
+                                <input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate"  autocomplete="off" placeholder="开始日期" class="layui-input">
+                                -
+                                <input type="text"  style="display:inline;width: 101px;" id="endDate" name="endDate"  autocomplete="off" placeholder="结束日期" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">仓库</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository"
                                        readonly/>
                                 <input type="text" name="depositoryId" class="layui-input" id="depositoryId"
@@ -39,27 +37,27 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">记录编码</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="code" name="code" autocomplete="off"/>
+                                <input type="text" class="layui-input" id="code" name="code" autocomplete="off" placeholder="请输入申请记录编码"/>
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">物料名称:</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <input id="mname" name="mname"  type="text" placeholder="请填写物料名称"
                                        class="layui-input" />
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label">存货编码</label>
+                            <label class="layui-form-label">物料编码</label>
                             <div class="layui-input-block">
-                                <input type="text" name="mcode" autocomplete="off" class="layui-input">
+                                <input type="text" name="mcode" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
                             </div>
                         </div>
 
                         <div class="layui-inline">
                             <label class="layui-form-label">型号</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off"/>
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -242,17 +240,17 @@
                 req.endDate = data.endDate;
             }
             if (data.mcode !== '') {
-                req.mcode = data.mcode;
+                req.mcode = data.mcode.trim();
             }
             if (data.code !== '') {
-                req.code = data.code;
+                req.code = data.code.trim();
             }
             if (data.mname !== '') {
-                req.mname = data.mname;
+                req.mname = data.mname.trim();
             }
 
             if (data.version !== '') {
-                req.version = data.version;
+                req.version = data.version.trim();
             }
             //执行搜索重载
             table.reload('currentTableId', {

src/main/resources/templates/pages/depository/table-stock.html

@@ -19,11 +19,7 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">仓库</label>
-                            <div class="layui-input-inline">
-                                <!-- <select name="depositoryId" >
-                                     <option value="" selected>请选择仓库</option>
-                                     <option th:each="depository,iterStar:${depositories}" th:value="${depository?.getId()}" th:text="${depository?.getDname()}" >外芯仓库</option>
-                                 </select>-->
+                            <div class="layui-input-block">
                                 <input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository"
                                        readonly/>
                                 <input type="text" name="depositoryId" class="layui-input" id="depositoryId"
@@ -33,20 +29,20 @@
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">物料名称</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="mname" autocomplete="off" class="layui-input">
+                            <div class="layui-input-block">
+                                <input type="text" name="mname" autocomplete="off" class="layui-input" placeholder="请填写物料名称">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">存货编码</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="code" autocomplete="off" class="layui-input">
+                            <div class="layui-input-block">
+                                <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">型号</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off"/>
+                            <div class="layui-input-block">
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
                             </div>
                         </div>
 
@@ -237,7 +233,7 @@
             var req = {};
             data = data.field;
             if (data.mname !== '') {
-                req.mname = data.mname;
+                req.mname = data.mname.trim();
             }
             if (data.depositoryId !== '') {
                 req.depositoryId = data.depositoryId;
@@ -246,10 +242,10 @@
                 req.placeId = data.placeId;
             }
             if (data.code !== '') {
-                req.mcode = data.code;
+                req.mcode = data.code.trim();
             }
             if(data.version !== ''){
-                req.version = data.version;
+                req.version = data.version.trim();
             }
             //执行搜索重载
             table.reload('currentTableId', {

src/main/resources/templates/pages/group/applicationInForGroup.html

@@ -307,7 +307,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input" value="${obj.gname}"
@@ -323,7 +323,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + num + ` type="text" placeholder="请填写入组合编码"
@@ -343,7 +343,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">仓库：</label>
+                                                    <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择仓库" class="layui-input"
@@ -402,7 +402,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
@@ -418,7 +418,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入组合编码" value=""
@@ -438,7 +438,7 @@
                                                     </div>
                                                 </div>
                                                  <div class="layui-form-item">
-                                                    <label class="layui-form-label">仓库：</label>
+                                                    <label class="layui-form-label" style="height: 40px;">仓库：</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择仓库" class="layui-input"

src/main/resources/templates/pages/group/applicationOutForGroup.html

@@ -327,7 +327,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input" value="${obj.gname}"
@@ -343,7 +343,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + num + ` type="text" placeholder="请填写入组合编码"
@@ -400,7 +400,7 @@
                                                 <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                                    onclick="deleteItemForGroup(this)"></i>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合名称:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input type="text" placeholder="请选择组合" class="layui-input"
@@ -416,7 +416,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">组合编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">组合编码:</label>
                                                     <div class="layui-input-block">
                                                         <div class="inputdiv">
                                                             <input id=` + "gcode" + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入组合编码" value=""

src/main/resources/templates/pages/group/group-add_back.html

@@ -54,7 +54,7 @@
                         <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
                             <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">组合名称:</label>
+                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                     <div class="layui-input-block">
                                         <div class="inputdiv">
                                             <input type="text" placeholder="请输入组合名称" class="layui-input" id="gname" th:value="${gid == -1?'':group?.getGname()}"
@@ -77,7 +77,7 @@
                                         <i class="layui-icon layui-icon-subtraction" style="display: inline"
                                            onclick="deleteItem(this)"></i>
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">物料名称:</label>
+                                            <label class="layui-form-label" style="height: 40px;">物料名称:</label>
                                             <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择物料" class="layui-input"
@@ -94,7 +94,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">物料编码:</label>
+                                            <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                             <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input id="code" name="code" type="text"
@@ -108,7 +108,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">条形编码:</label>
+                                            <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                             <div class="layui-input-block" style="margin: 0px;">
                                                 <div class="inputdiv">
                                                     <input id="barCode" name="barCode" type="text"
@@ -294,7 +294,7 @@
                                 <hr>
                                     <i  class="layui-icon layui-icon-subtraction" style="display: inline" onclick="deleteItem(this)"></i>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                             <input type="text" placeholder="请选择物料" class="layui-input" style="border-style: none"
@@ -306,7 +306,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block">
                                             <div class="inputdiv">
                                                 <input id=` + "code" + NewIdNumber + ` name=` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
@@ -320,7 +320,7 @@
                                     </div>
 
                                  <div class="layui-form-item">
-                                        <label class="layui-form-label">条形编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <input id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + ` type="text" placeholder="请填写入条形编码"

src/main/resources/templates/pages/group/group-out.html

@@ -37,22 +37,22 @@
 
                         <div class="layui-inline">
                             <label class="layui-form-label">组合名称</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="name" autocomplete="off" class="layui-input">
+                            <div class="layui-input-block">
+                                <input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入组合名称">
                             </div>
                         </div>
 
 
                         <div class="layui-inline">
                             <label class="layui-form-label">组合编码</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="code" autocomplete="off" class="layui-input">
+                            <div class="layui-input-block">
+                                <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入组合编码">
                             </div>
                         </div>
 
                         <div class="layui-inline">
                             <label class="layui-form-label">状态</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <select id="state" name="state">
                                     <option value="" selected>请选择状态</option>
                                     <option value="1">启用</option>

src/main/resources/templates/pages/material/material-add.html

@@ -53,7 +53,7 @@
                   </div>
                 </div>
                 <div class="layui-form-item">
-                  <label class="layui-form-label">条形码:</label>
+                  <label class="layui-form-label" style="height: 40px;">条形码:</label>
                   <div class="layui-input-block" style="margin: 0px;">
                     <div class="inputdiv">
                       <input id="barcode" name="barCode" type="text" placeholder="请填写入条形码" value="" onblur="selectBarCode(this)"
@@ -110,7 +110,7 @@
 <!--                  </div>-->
 <!--                </div>-->
                 <div class="layui-form-item">
-                  <label class="layui-form-label">保质期:</label>
+                  <label class="layui-form-label" style="height: 40px;">保质期:</label>
                   <div class="layui-input-block">
                     <div class="inputdiv">
                       <input type="number" name="shelfLife" id="shelfLife"  placeholder="请填写保质日期"  autocomplete="off"

src/main/resources/templates/pages/material/material-out.html

@@ -22,7 +22,7 @@
 
                         <div class="layui-inline">
                             <label class="layui-form-label">种类</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType"
                                        readonly/>
                                 <input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId"
@@ -31,25 +31,25 @@
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">物料名称</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="mname" autocomplete="off" class="layui-input">
+                            <div class="layui-input-block">
+                                <input type="text" name="mname" autocomplete="off" class="layui-input" placeholder="请输入物料名称">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">型号</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off"/>
+                            <div class="layui-input-block">
+                                <input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label">存货编码</label>
-                            <div class="layui-input-inline">
-                                <input type="text" name="code" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label">物料编码</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入物料编码">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">状态</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <select name="state">
                                     <option value="">请选择状态</option>
                                     <option value="1">启用</option>

src/main/resources/templates/pages/material/material-view.html

@@ -101,7 +101,7 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">保质期:</label>
+        <label class="layui-form-label" style="height: 40px;">保质期:</label>
         <div class="layui-input-inline">
             <div class="inputdiv">
                 <input type="number" name="shelfLife" id="shelfLife" placeholder="请填写保质日期" autocomplete="off"

src/main/resources/templates/pages/materialtype/materialType_view.html

@@ -20,7 +20,7 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">类型名称</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <select name="tname">
                                     <option value="" selected>请选择类型</option>
                                     <option th:each="materialType,iterStar:${materialTypes}"
@@ -32,7 +32,7 @@
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">状态</label>
-                            <div class="layui-input-inline">
+                            <div class="layui-input-block">
                                 <select name="state">
                                     <option value="">请选择状态</option>
                                     <option value="1">启用</option>

src/main/resources/templates/pages/notice/notice-add.html

@@ -32,7 +32,7 @@
                 <div class="layui-card-body" style="padding: 0">
                     <div class="layui-form" style="margin-top: 30px">
                         <div class="layui-form-item" >
-                            <label class="layui-form-label">可见范围:</label>
+                            <label class="layui-form-label" style="height: 40px;">可见范围:</label>
                             <div class="layui-input-block">
                                 <div class="fairy-tag-container" style="border-style: none">
                                 <div class="inputdiv">

src/main/resources/templates/pages/notice/notice-edit.html

@@ -33,7 +33,7 @@
                     <div class="layui-form" style="margin-top: 30px">
                         <input style="display:none;" name="id" th:value="${record.getId()}">
                         <div class="layui-form-item" >
-                            <label class="layui-form-label">可见范围:</label>
+                            <label class="layui-form-label" style="height: 40px;">可见范围:</label>
                             <div class="layui-input-block">
                                 <div class="fairy-tag-container" style="border-style: none">
                                     <div class="inputdiv">

src/main/resources/templates/pages/post/post-out.html

@@ -133,9 +133,9 @@
             var req = {};
             data = data.field;
             if (data.name !== '') {
-                req.name = data.name;
+                req.name = data.name.trim();
             }
-            if (data.state != '') {
+            if (data.state !== '') {
                 req.state = data.state;
             }
             req.superior = parentId;

src/main/resources/templates/pages/split/split-out.html

@@ -20,15 +20,15 @@
 
                         <div class="layui-inline">
                             <label class="layui-form-label">物料名称：</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" id="mname" name="mname" autocomplete="off"/>
+                            <div class="layui-input-block">
+                                <input type="text" class="layui-input" id="mname" name="mname" autocomplete="off" placeholder="请输入物料名称"/>
                             </div>
                         </div>
 
                         <div class="layui-inline">
                             <label class="layui-form-label">物料编码：</label>
-                            <div class="layui-input-inline">
-                                <input type="text" class="layui-input" id="mcode" name="mcode" autocomplete="off"/>
+                            <div class="layui-input-block">
+                                <input type="text" class="layui-input" id="mcode" name="mcode" autocomplete="off" placeholder="请输入物料编码"/>
                             </div>
                         </div>
 

src/main/resources/templates/pages/split/split_add.html

@@ -55,7 +55,7 @@
                                   style="margin: 0 auto;max-width: 700px;padding-top: 5px; padding-bottom: 50px"
                                   lay-filter="formStep">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">物料名称:</label>
+                                    <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                     <div class="layui-input-block">
                                         <div class="inputdiv">
@@ -73,7 +73,7 @@
 
 
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">物料编码:</label>
+                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                     <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                             <input id="code" name="code" type="text" placeholder="请填写入物料编码" value=""
@@ -87,7 +87,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">条形编码:</label>
+                                    <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                     <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                             <select id="barCode" name="barCode" type="text" readonly

src/main/resources/templates/pages/split/split_edit.html

@@ -52,7 +52,7 @@
                                   lay-filter="formStep">
                                 <input name="id" style="display: none" id="id" th:value="${record.getId()}">
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">物料名称:</label>
+                                    <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                     <div class="layui-input-block">
                                         <div class="inputdiv">
@@ -69,7 +69,7 @@
 
 
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">物料编码:</label>
+                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                     <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                             <input id="code" name="code" type="text" placeholder="请填写入物料编码" readonly
@@ -81,7 +81,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
-                                    <label class="layui-form-label">条形编码:</label>
+                                    <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                     <div class="layui-input-block" style="margin: 0px;">
                                         <div class="inputdiv">
                                             <input id="barCode" name="barCode" type="text"  readonly

src/main/resources/templates/pages/stockTaking/stockTaking.html

@@ -58,7 +58,7 @@
                                       lay-filter="form1" id="form1">
                                     <div class="layui-card-body" id="takingHeader" style="padding-right: 0px">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">盘点位置:</label>
+                                            <label class="layui-form-label" style="height: 40px;">盘点位置:</label>
                                             <div class="layui-input-block">
                                                 <div class="inputdiv">
                                                     <input type="text" placeholder="请选择盘点位置" class="layui-input"
@@ -77,7 +77,7 @@
                                             </div>
                                         </div>
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label">负责人：</label>
+                                            <label class="layui-form-label" style="height: 40px;">负责人：</label>
                                             <div class="layui-input-block">
 
                                                 <div class="fairy-tag-container" style="border-style: none">
@@ -106,7 +106,7 @@
                                                onclick="deleteItem(this)"></i>
 
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">物料名称:</label>
+                                                <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                                 <div class="layui-input-block" style="margin: 0px;">
                                                     <div class="inputdiv">
@@ -124,7 +124,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">物料编码:</label>
+                                                <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                 <div class="layui-input-block" style="margin: 0px;">
                                                     <div class="inputdiv">
                                                         <input id="code" name="code" type="text" placeholder="请填写入物料编码"
@@ -139,7 +139,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">条形编码:</label>
+                                                <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                 <div class="layui-input-block" style="margin: 0px;">
                                                     <div class="inputdiv">
                                                         <select id="barCode" name="barCode"
@@ -498,7 +498,7 @@
                                        onclick="deleteItem(this)"></i>
 
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
@@ -514,7 +514,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码" value=""
@@ -527,7 +527,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">条形编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `
@@ -1112,7 +1112,7 @@
                                        onclick="deleteItem(this)"></i>
 
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料名称:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料名称:</label>
 
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
@@ -1128,7 +1128,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">物料编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <input id=` + "code" + NewIdNumber + ` name= ` + "code" + NewIdNumber + ` type="text" placeholder="请填写入物料编码"
@@ -1141,7 +1141,7 @@
                                         </div>
                                     </div>
                                     <div class="layui-form-item">
-                                        <label class="layui-form-label">条形编码:</label>
+                                        <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                         <div class="layui-input-block" style="margin: 0px;">
                                             <div class="inputdiv">
                                                 <select id=` + "barCode" + NewIdNumber + ` name=` + "barCode" + NewIdNumber + `

src/main/resources/templates/pages/stockTaking/stockTakingComplete.html

@@ -104,7 +104,7 @@
                                                         th:text="${recordMin.getMname()}"></h2>
                                                     <div class="layui-colla-content">
                                                         <div class="layui-form-item">
-                                                            <label class="layui-form-label">物料编码:</label>
+                                                            <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                             <div class="layui-input-block" style="margin: 0px;">
                                                                 <div class="inputdiv">
                                                                     <input th:attr="name='code' +${recordMin.getId()},id='code'+${recordMin.getId()}"
@@ -117,7 +117,7 @@
                                                             </div>
                                                         </div>
                                                         <div class="layui-form-item">
-                                                            <label class="layui-form-label">条形编码:</label>
+                                                            <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                             <div class="layui-input-block" style="margin: 0px;">
                                                                 <div class="inputdiv">
                                                                     <select

src/main/resources/templates/pages/stockTaking/stockTakingReview.html

@@ -104,7 +104,7 @@
                                                         th:text="${recordMin.getMname()}"></h2>
                                                     <div class="layui-colla-content">
                                                         <div class="layui-form-item">
-                                                            <label class="layui-form-label">物料编码:</label>
+                                                            <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                             <div class="layui-input-block" style="margin: 0px;">
                                                                 <div class="inputdiv">
                                                                     <input th:attr="name='code' +${recordMin.getId()},id='code'+${recordMin.getId()}"
@@ -116,7 +116,7 @@
                                                             </div>
                                                         </div>
                                                         <div class="layui-form-item">
-                                                            <label class="layui-form-label">条形编码:</label>
+                                                            <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                             <div class="layui-input-block" style="margin: 0px;">
                                                                 <div class="inputdiv">
                                                                     <select

src/main/resources/templates/pages/stockTaking/stockTransfer.html

@@ -76,7 +76,7 @@
                                                 th:text="${recordMin.getMname()}"></h2>
                                             <div class="layui-colla-content">
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">物料编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">物料编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <input th:attr="name='code' +${recordMin.getId()},id='code'+${recordMin.getId()}"
@@ -88,7 +88,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="layui-form-item">
-                                                    <label class="layui-form-label">条形编码:</label>
+                                                    <label class="layui-form-label" style="height: 40px;">条形编码:</label>
                                                     <div class="layui-input-block" style="margin: 0px;">
                                                         <div class="inputdiv">
                                                             <select