From af7b9db27bf72c92108329815ec771fb46e5b877 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:09:20 +0800
Subject: [PATCH] Merge branch 'jsxswms' into integrationWms
---
src/main/webapp/views/mat/mat.html | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 6cdad50..19ed4fb 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -127,6 +127,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="batchModifties">鎵归噺淇敼</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
@@ -181,46 +182,44 @@
<input name="updateTime$" type="hidden">
<input name="updateBy" type="hidden">
<div class="layui-row">
-
<div class="layui-col-md6">
-
<div class="layui-form-item">
<label class="layui-form-label">鍒嗙被</label>
<div class="layui-input-block">
<div id="tagSel" class="ew-xmselect-tree"></div>
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
<div class="layui-input-block">
<input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
-
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁勬墭涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="upQty" placeholder="璇疯緭鍏ユ渶澶х粍鎵樻暟閲�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
<div class="layui-form-item">
<label class="layui-form-label">閰嶇疆</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠鍑�閲�</label>
<div class="layui-input-block">
<input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠浣撶Н</label>
<div class="layui-input-block">
<input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
</div>
</div>
-
</div>
-
<div class="layui-col-md6">
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
@@ -228,35 +227,30 @@
<input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠姣涢噸</label>
<div class="layui-input-block">
<input name="manLength" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
</div>
</div>
-
<div class="layui-form-item">
<label class="layui-form-label">鍗曠浣撶Н</label>
<div class="layui-input-block">
<input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
</div>
</div>
-
</div>
</div>
<hr class="layui-bg-gray">
@@ -350,6 +344,38 @@
</div>
</div>
+<div id="batchModifties" style="display: none;padding: 40px">
+ <form class="layui-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md8">
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撲綅绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="type">
+ <option style="display: none"></option>
+ <option value="12">鏂欑</option>
+ <option value="13">绗兼</option>
+ <option value="14">鎵樼洏</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">缁勬墭涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="upQty" placeholder="璇疯緭鍏ユ渶澶х粍鎵樻暟閲�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ </div>
+ </div>
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="batchModify" lay-submit="batchModify">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</div>
+
<div id="box" style="display: block"></div>
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
--
Gitblit v1.9.1