From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/order/out.html | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 5e9532d..5e56678 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>
@@ -95,19 +98,19 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍟嗗搧缂栫爜:</label>
+ <label class="layui-form-label">鐗╂枡鍙�:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="鍟嗗搧缂栫爜"/>
+ <input name="matnr" class="layui-input" placeholder="鐗╂枡鍙�"/>
</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="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="鐗╂枡鍚嶇О"/>
</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="搴忓垪鐮�"/>
</div>
@@ -165,6 +168,33 @@
</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 class="order-sta-select" lay-filter="tbBasicTbStaNos">
--
Gitblit v1.9.1