From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期五, 27 五月 2022 15:31:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs --- src/main/webapp/views/order/out.html | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html index cae77ac..254a593 100644 --- a/src/main/webapp/views/order/out.html +++ b/src/main/webapp/views/order/out.html @@ -107,9 +107,9 @@ </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鎵瑰彿:</label> + <label class="layui-form-label">搴忓垪鐮�:</label> <div class="layui-input-inline"> - <input name="batch" class="layui-input" placeholder="鎵瑰彿"/> + <input name="batch" class="layui-input" placeholder="搴忓垪鐮�"/> </div> </div> <!-- <div class="layui-inline">--> @@ -152,13 +152,16 @@ <!-- 鍑哄簱棰勮 --> <script type="text/html" id="pakoutPreviewBox" style="display: none"> - <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;"> + <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;"> <span style="font-size: large; font-weight: bold">鍑哄簱棰勮</span> </div> <div class="layui-card"> <div class="layui-card-body" style="padding: 10px"> <table id="stoPreTab" lay-filter="stoPreTab"></table> </div> + <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem"> + 鎵归噺淇敼 + </button> </div> </script> @@ -179,7 +182,7 @@ {{# if( d.lack === false){ }} class="layui-badge layui-badge-green" >{{d.locNo}}</span> {{# } else { }} - class="layui-badge layui-badge-red" >缂鸿揣</span> + class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> {{# } }} </script> -- Gitblit v1.9.1