From b5130c2e6d60c7f23e37f7c620375bc4e253caa3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 14:52:20 +0800
Subject: [PATCH] #
---
src/main/webapp/views/order/out.html | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index dac5f95..c3687e3 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -71,10 +71,10 @@
<div class="layui-card-body" style="padding: 10px;">
<form class="layui-form toolbar">
<div class="layui-form-item">
- <div class="layui-inline" style="max-width: 300px;">
+ <div class="layui-inline" style="max-width: 300px;margin-bottom: 5px">
<input name="orderNo" class="layui-input" placeholder="杈撳叆鍗曟嵁缂栧彿" autocomplete="off"/>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="margin-bottom: 5px">
<button class="layui-btn icon-btn" lay-filter="originTableSearch" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
@@ -84,6 +84,9 @@
</div>
</div>
</form>
+ <button style="margin-bottom: 5px;line-height: 28px;height: 28px" class="layui-btn icon-btn layui-btn-danger" lay-filter="mergeOut" lay-submit>
+ <i class="layui-icon"></i> 鍚堝苟鍑哄簱
+ </button>
<table id="originTable" lay-filter="originTable"></table>
</div>
</div>
@@ -107,21 +110,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>鎼滅储
@@ -152,19 +155,49 @@
<!-- 鍑哄簱棰勮 -->
<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>
+
+<!-- 鍚堝苟琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="mergeDialog">
+ <div style="padding: 25px; line-height: 22px; background-color: #1E9FFF; 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="orderMergeTab" lay-filter="orderMergeTab"></table>
+ </div>
+ </div>
+</script>
+
+<!-- 鍑哄簱棰勮 銆愬悎骞躲�� -->
+<script type="text/html" id="pakoutPreviewMergeBox" style="display: none">
+ <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="stoPreTabMerge" lay-filter="stoPreTabMerge"></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>
<script type="text/html" id="tbBasicTbStaNos">
<div class="ew-select-fixed">
- <select lay-filter="tbBasicTbStaNos">
+ <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>
@@ -174,12 +207,20 @@
</div>
</script>
+<script type="text/html" id="staBatchSelectDialog">
+ <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center">
+ <select id="batchSelectStaBox" name="batchSta" lay-vertype="tips" lay-verify="required" required="">
+ </select>
+ <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">纭畾</button>
+ </form>
+</script>
+
<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>
@@ -280,5 +321,13 @@
</script>
</body>
+
+<script type="text/template" id="batchStaSelectTpl">
+ <option value="">閫夋嫨鍑哄簱绔�</option>
+ {{#each list}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
+
</html>
--
Gitblit v1.9.1