From 5b446c229afcaa79b1fa3b2cb4f3563a6facefba Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期二, 21 六月 2022 16:31:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/webapp/views/order/out.html | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 7a68bac..9a59d23 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -107,21 +107,21 @@
</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">-->
-<!-- <label class="layui-form-label">鐘舵��:</label>-->
-<!-- <div class="layui-input-inline">-->
-<!-- <select name="isOnline">-->
-<!-- <option value="1">鍏呯數涓�</option>-->
-<!-- <option value="1">鍏呯數涓�</option>-->
-<!-- <option value="0">涓嶅湪鍏呯數</option>-->
-<!-- </select>-->
-<!-- </div>-->
-<!-- </div>-->
+ <!-- <div class="layui-inline">-->
+ <!-- <label class="layui-form-label">鐘舵��:</label>-->
+ <!-- <div class="layui-input-inline">-->
+ <!-- <select name="isOnline">-->
+ <!-- <option value="1">鍏呯數涓�</option>-->
+ <!-- <option value="1">鍏呯數涓�</option>-->
+ <!-- <option value="0">涓嶅湪鍏呯數</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="sensorTbSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -138,15 +138,22 @@
<!-- 澶村伐鍏锋爮 -->
<script type="text/html" id="orderDetToolbar">
- <div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>
- </div>
+
+ <!-- <div class="layui-btn-container">-->
+ <!-- <div class="layui-col-md3">-->
+ <!-- <select id="staNoSelect" lay-verify="required">-->
+ <!-- <option value="">璇烽�夋嫨绔欑偣</option>-->
+ <!-- </select>-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <button class="layui-btn layui-btn-sm layui-btn-danger btn-pakoutPreview" id="btn-pakoutPreview" lay-event="pakoutPreview">鎵归噺鍑哄簱</button>
+
</script>
<!-- 琛屽伐鍏锋爮 -->
<script type="text/html" id="operate">
{{#if (d.anfme > d.qty){ }}
- <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
+ <a class="layui-btn layui-btn-xs layui-btn-danger btn-pakoutPreview" lay-event="pakoutPreview"><i class="layui-icon layui-icon-prev-circle"></i>鍑哄簱</a>
{{# } }}
</script>
@@ -169,9 +176,9 @@
<div class="ew-select-fixed">
<select class="order-sta-select" lay-filter="tbBasicTbStaNos">
{{#if (d.staNos!=null) {}}
- {{# for(let i=0; i<d.staNos.length; i++) { }}
- <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
- {{# } }}
+ {{# for(let i=0; i<d.staNos.length; i++) { }}
+ <option value="{{d.staNos[i]}}">{{d.staNos[i]}}</option>
+ {{# } }}
{{# } }}
</select>
</div>
@@ -187,10 +194,10 @@
<script type="text/html" id="locNoTpl">
<span name="locNo"
- {{# if( d.lack === false){ }}
- class="layui-badge layui-badge-green" >{{d.locNo}}</span>
- {{# } else { }}
- class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span>
+ {{# if( d.lack === false){ }}
+ class="layui-badge layui-badge-green" >{{d.locNo}}</span>
+ {{# } else { }}
+ class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span>
{{# } }}
</script>
@@ -271,7 +278,11 @@
<script type="text/javascript" src="../../static/js/tools/md5.js"></script>
<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/order/out.js" charset="utf-8"></script>
-
+<!--<script type="text/template" id="takeSiteSelectTemplate">-->
+<!-- {{#each data}}-->
+<!-- <option value="{{siteId}}">{{desc}}</option>-->
+<!-- {{/each}}-->
+<!--</script>-->
<!-- 椤圭洰缂栬緫绐楀彛 -->
<script type="text/html" id="hostEditDialog">
<form id="hostEditForm" lay-filter="hostEditForm" class="layui-form model-form">
--
Gitblit v1.9.1