From c445cc6b68ee932bbcb3b3389b4298aaf8b291e0 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 16 三月 2022 15:16:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/receiveDetl/receiveDetl.html | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/receiveDetl/receiveDetl.html b/src/main/webapp/views/receiveDetl/receiveDetl.html
index c7ec1fc..da14da1 100644
--- a/src/main/webapp/views/receiveDetl/receiveDetl.html
+++ b/src/main/webapp/views/receiveDetl/receiveDetl.html
@@ -43,9 +43,10 @@
<script type="text/html" id="operate">
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="add">寮�濮嬪叆搴�</a>
+ <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="add">涓婃灦</a>
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
+
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -58,6 +59,22 @@
<script type="text/html" id="addIn">
<form id="inDetail" lay-filter="inDetail" class="layui-form admin-form">
<div class="layui-row">
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label" >鍞竴ID: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="id" placeholder="璇疯緭鍏�" disabled>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label" >鍏ュ簱鍗曞彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="orderNo" placeholder="璇疯緭鍏�" disabled>
+ </div>
+ </div>
+ </div>
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label" >鍟嗗搧鍚嶇О: </label>
@@ -79,7 +96,7 @@
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label">
- 搴斿叆鏁伴噺:
+ 搴斿叆搴撻噺:
</label>
<div class="layui-input-block">
<input class="layui-input" name="anfme" disabled>
@@ -89,7 +106,7 @@
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label">
- 宸插叆鏁伴噺:
+ 宸插叆搴撻噺:
</label>
<div class="layui-input-block">
<input class="layui-input" name="inQty" disabled>
@@ -102,7 +119,7 @@
鏈鍏ュ簱閲�:
</label>
<div class="layui-input-block">
- <input type="number" class="layui-input" name="remain" placeholder="璇疯緭鍏�">
+ <input type="number" class="layui-input" name="remain" placeholder="璇疯緭鍏�" required>
</div>
</div>
</div>
@@ -112,13 +129,25 @@
鍏ュ簱浣嶇疆:
</label>
<div class="layui-input-block">
- <input type="number" class="layui-input" placeholder="鍙洿鎺ョ偣鍑昏嚜鍔ㄥ叆搴�">
+ <div id="nodeSels" class="ew-xmselect-tree"></div>
+<!-- <input type="number" class="layui-input" placeholder="鍙洿鎺ョ偣鍑昏嚜鍔ㄥ叆搴�">-->
</div>
</div>
</div>
+ <div class="layui-col-md6">
+ <div class="layui-form-item">
+ <label class="layui-form-label">
+ 鎵瑰彿:
+ </label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="batch" placeholder="璇疯緭鍏�" required>
+ </div>
+ </div>
+ </div>
+
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="recommendIn" lay-submit="">鑷姩鍏ュ簱</button>
+<!-- <button class="layui-btn" lay-filter="recommendIn" lay-submit="">鑷姩鍏ュ簱</button>-->
<button class="layui-btn layui-btn-normal" lay-filter="inLoc" lay-submit="">鍏ュ簱</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
--
Gitblit v1.9.1