From baf523cff45301d5d6a67db1e1103fd074f25445 Mon Sep 17 00:00:00 2001
From: STAR <3308186939@qq.com>
Date: Tue, 17 Dec 2024 19:49:28 +0800
Subject: [PATCH] 12/17

---
 .../business/inport/inportManager.html        | 363 ++++++++++++------
 1 file changed, 243 insertions(+), 120 deletions(-)
diff --git a/src/main/resources/templates/business/inport/inportManager.html b/src/main/resources/templates/business/inport/inportManager.html
index a87d08a..8d42e38 100644
--- a/src/main/resources/templates/business/inport/inportManager.html
+++ b/src/main/resources/templates/business/inport/inportManager.html
@@ -1,71 +1,52 @@
-<!DOCTYPE html>
+<!DOCTYPE html> <!-- 声明HTML5文档类型 -->
 <html xmlns:th="http://www.thymeleaf.org"
-      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <!-- 引入Thymeleaf和Shiro的命名空间 -->
 <head>
-    <meta charset="UTF-8">
-    <title>Right</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta http-equiv="Access-Control-Allow-Origin" content="*">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="format-detection" content="telephone=no">
-    <link rel="icon" href="/resources/favicon.ico">
+    <meta charset="UTF-8"> <!-- 设置页面编码为UTF-8 -->
+    <title>Right</title> <!-- 设置网页标题 -->
+    <meta name="renderer" content="webkit"> <!-- 强制使用webkit渲染引擎 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <!-- 设置IE兼容模式 -->
+    <meta http-equiv="Access-Control-Allow-Origin" content="*"> <!-- 允许跨域访问 -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <!-- 设置移动端响应式布局 -->
+    <meta name="apple-mobile-web-app-status-bar-style" content="black"> <!-- 设置苹果移动设备状态栏为黑色 -->
+    <meta name="apple-mobile-web-app-capable" content="yes"> <!-- 支持移动设备全屏显示 -->
+    <meta name="format-detection" content="telephone=no"> <!-- 禁用自动检测电话号码 -->
+    <link rel="icon" href="/resources/favicon.ico"> <!-- 设置页面图标 -->
+
+    <!-- 引入layui样式文件 -->
     <link rel="stylesheet" href="resources/layui/css/layui.css" th:href="@{/resources/layui/css/layui.css}" media="all"/>
+    <!-- 引入自定义公共样式 -->
     <link rel="stylesheet" th:href="@{/resources/css/public.css}" media="all"/>
+    <!-- 引入树形菜单相关样式 -->
     <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/dtree.css}" media="all"/>
     <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/font/dtreefont.css}" media="all"/>
+
     <style>
-        input#search_provideridTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input#provideridTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input#leaderprovideridTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input.layui-input.layui-unselect {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input#search_goodsidTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input#goodsidTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
+        /* 输入框样式设置 */
+        input#search_provideridTree_select_input_id,
+        input#provideridTree_select_input_id,
+        input#leaderprovideridTree_select_input_id,
+        input.layui-input.layui-unselect,
+        input#search_goodsidTree_select_input_id,
+        input#goodsidTree_select_input_id,
         input#leadergoodsidTree_select_input_id {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
-        }
-        input.layui-input.layui-unselect {
-            border-radius: 10px;
-            height: 30px;
-            margin-top: 4px;
+            border-radius: 10px; /* 设置圆角 */
+            height: 30px; /* 设置输入框高度 */
+            margin-top: 4px; /* 设置顶部外边距 */
         }
     </style>
 </head>
+
 <body>
-<!--查询条件-->
+<!-- 搜索条件区域 -->
 <fieldset class="layui-elem-field layui-field-title" style="margin-top: 15px;">
-    <legend>搜索条件</legend>
+    <legend>搜索条件</legend> <!-- 定义搜索条件标题 -->
 </fieldset>
+
+<!-- 搜索表单 -->
 <form action="" method="post" id="searchFrm" lay-filter="searchFrm" class="layui-form">
     <div class="layui-form-item">
+        <!-- 供应商名称搜索框 -->
         <div class="layui-inline">
             <label class="layui-form-label">供应商名称</label>
             <div class="layui-input-inline">
@@ -74,6 +55,8 @@
                 </select>
             </div>
         </div>
+
+        <!-- 商品名称搜索框 -->
         <div class="layui-inline">
             <label class="layui-form-label">商品名称</label>
             <div class="layui-input-inline">
@@ -82,6 +65,8 @@
                 </select>
             </div>
         </div>
+
+        <!-- 开始时间选择框 -->
         <div class="layui-inline">
             <label class="layui-form-label">开始时间</label>
             <div class="layui-input-inline">
@@ -89,6 +74,8 @@
                        class="layui-input input-radius">
             </div>
         </div>
+
+        <!-- 结束时间选择框 -->
         <div class="layui-inline">
             <label class="layui-form-label">结束时间</label>
             <div class="layui-input-inline">
@@ -97,19 +84,21 @@
             </div>
         </div>
     </div>
+
+    <!-- 提交按钮组 -->
     <div class="layui-form-item">
         <div class="layui-input-block" style="text-align: center;padding-right: 15%;">
-            <button type="button" class="layui-btn layui-btn-sm layui-btn-radius" lay-submit="" lay-filter="doSearch"><i
-                    class="layui-icon layui-icon-search layui-icon-normal"></i>查询
+            <button type="button" class="layui-btn layui-btn-sm layui-btn-radius" lay-submit="" lay-filter="doSearch">
+                <i class="layui-icon layui-icon-search layui-icon-normal"></i>查询
             </button>
-            <button type="reset" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm"><i
-                    class="layui-icon layui-icon-refresh"></i><span>重置</span>
+            <button type="reset" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm">
+                <i class="layui-icon layui-icon-refresh"></i><span>重置</span>
             </button>
         </div>
     </div>
 </form>
 
-<!--数据表格-->
+<!-- 数据表格区域 -->
 <div>
     <table class="layui-hide" id="inportTable" lay-filter="inportTable"></table>
     <div id="inportToolBar" style="display: none">
@@ -117,102 +106,231 @@
             <i class="layui-icon layui-icon-add-1"></i>添加进货
         </button>
     </div>
-    <div id="inportRowBar" style="display: none;">
-        <button type="button" lay-event="update" shiro:hasPermission="inport:update" class="layui-btn layui-btn-sm layui-btn-radius"><i
-                class="layui-icon layui-icon-edit"></i>编辑
-        </button>
-        <button type="button" lay-event="delete" shiro:hasPermission="inport:delete" class="layui-btn layui-btn-sm layui-btn-danger layui-btn-radius"><i
-                class="layui-icon layui-icon-delete"></i>删除
-        </button>
-        <button type="button" lay-event="back" shiro:hasPermission="inport:back" class="layui-btn layui-btn-sm layui-btn-warm layui-btn-radius"><i
-                class="layui-icon layui-icon-delete"></i>退货
-        </button>
-    </div>
 </div>
 
-<!--添加和修改弹出层-->
+<!-- 添加/编辑数据表单弹出层 -->
 <div id="addOrUpdateDiv" style="display: none;padding: 10px;padding-right: 5%">
     <form action="" method="post" class="layui-form" id="dataFrm" lay-filter="dataFrm">
         <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">供应商名称</label>
-                <div class="layui-input-inline">
-                    <select name="providerid" id="providerid" lay-filter="providerid">
-                        <option value="0">请选择供应商</option>
-                    </select>
-                    <div class="mydiv" title="不可修改" style="position:absolute;width:100%;height:100%;left:0px;top:0px;background:#fff;opacity:0;filter:alpha(opacity=0)"> </div>
-                </div>
+            <label class="layui-form-label">供应商名称</label>
+            <div class="layui-input-inline">
+                <select name="providerid" id="providerid" lay-filter="providerid">
+                    <option value="0">请选择供应商</option>
+                </select>
             </div>
-            <div class="layui-inline">
-                <label class="layui-form-label">商品名称</label>
-                <div class="layui-input-inline">
-                    <select name="goodsid" id="goodsid">
-                        <option value="0">请选择商品</option>
-                    </select>
-                </div>
-                <div class="mydiv" title="不可修改" style="position:absolute;width:100%;height:100%;left:0px;top:0px;background:#fff;opacity:0;filter:alpha(opacity=0)"> </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-inline">
+                <select name="goodsid" id="goodsid">
+                    <option value="0">请选择商品</option>
+                </select>
             </div>
         </div>
+
         <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">进货数量</label>
-                <div class="layui-input-block">
-                    <input type="hidden" name="id">
-                    <input type="text" name="number" lay-verify="required|number" autocomplete="off" class="layui-input input-radius" placeholder="请输入进货数量">
-                </div>
+            <label class="layui-form-label">进货数量</label>
+            <div class="layui-input-block">
+                <input type="text" name="number" lay-verify="required|number" autocomplete="off" class="layui-input input-radius" placeholder="请输入进货数量">
             </div>
-            <div class="layui-inline">
-                <label class="layui-form-label">进货价格</label>
-                <div class="layui-input-block">
-                    <input type="text" name="inportprice" lay-verify="required|number" autocomplete="off" class="layui-input input-radius" placeholder="请输入进货价格">
-                </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">进货备注</label>
+            <div class="layui-input-block">
+                <textarea name="remark" placeholder="请输入进货备注" class="layui-textarea"></textarea>
             </div>
         </div>
+
+        <!-- 提交按钮组 -->
         <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">支付类型</label>
-                <div class="layui-input-block">
-                    <input type="radio" name="paytype" value="微信" title="微信">
-                    <input type="radio" name="paytype" value="支付宝" title="支付宝" checked>
-                    <input type="radio" name="paytype" value="银联" title="银联">
-                </div>
+            <div class="layui-input-block" style="text-align: center;padding-right: 7%">
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doSubmit">
+                    <i class="layui-icon layui-icon-search layui-icon-normal"></i>提交
+                </button>
+                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm">
+                    <i class="layui-icon layui-icon-refresh"></i><span>重置</span>
+                </button>
+            </div>
+        </div>
+    </form>
+</div><!DOCTYPE html> <!-- 声明HTML5文档类型 -->
+<html xmlns:th="http://www.thymeleaf.org"
+      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <!-- 引入Thymeleaf和Shiro的命名空间 -->
+<head>
+    <meta charset="UTF-8"> <!-- 设置页面编码为UTF-8 -->
+    <title>Right</title> <!-- 设置网页标题 -->
+    <meta name="renderer" content="webkit"> <!-- 强制使用webkit渲染引擎 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <!-- 设置IE兼容模式 -->
+    <meta http-equiv="Access-Control-Allow-Origin" content="*"> <!-- 允许跨域访问 -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <!-- 设置移动端响应式布局 -->
+    <meta name="apple-mobile-web-app-status-bar-style" content="black"> <!-- 设置苹果移动设备状态栏为黑色 -->
+    <meta name="apple-mobile-web-app-capable" content="yes"> <!-- 支持移动设备全屏显示 -->
+    <meta name="format-detection" content="telephone=no"> <!-- 禁用自动检测电话号码 -->
+    <link rel="icon" href="/resources/favicon.ico"> <!-- 设置页面图标 -->
+
+    <!-- 引入layui样式文件 -->
+    <link rel="stylesheet" href="resources/layui/css/layui.css" th:href="@{/resources/layui/css/layui.css}" media="all"/>
+    <!-- 引入自定义公共样式 -->
+    <link rel="stylesheet" th:href="@{/resources/css/public.css}" media="all"/>
+    <!-- 引入树形菜单相关样式 -->
+    <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/dtree.css}" media="all"/>
+    <link rel="stylesheet" th:href="@{/resources/layui_ext/dtree/font/dtreefont.css}" media="all"/>
+
+    <style>
+        /* 输入框样式设置 */
+        input#search_provideridTree_select_input_id,
+        input#provideridTree_select_input_id,
+        input#leaderprovideridTree_select_input_id,
+        input.layui-input.layui-unselect,
+        input#search_goodsidTree_select_input_id,
+        input#goodsidTree_select_input_id,
+        input#leadergoodsidTree_select_input_id {
+            border-radius: 10px; /* 设置圆角 */
+            height: 30px; /* 设置输入框高度 */
+            margin-top: 4px; /* 设置顶部外边距 */
+        }
+    </style>
+</head>
+
+<body>
+<!-- 搜索条件区域 -->
+<fieldset class="layui-elem-field layui-field-title" style="margin-top: 15px;">
+    <legend>搜索条件</legend> <!-- 定义搜索条件标题 -->
+</fieldset>
+
+<!-- 搜索表单 -->
+<form action="" method="post" id="searchFrm" lay-filter="searchFrm" class="layui-form">
+    <div class="layui-form-item">
+        <!-- 供应商名称搜索框 -->
+        <div class="layui-inline">
+            <label class="layui-form-label">供应商名称</label>
+            <div class="layui-input-inline">
+                <select name="providerid" id="select_providerid">
+                    <option value="0">请选择供应商</option>
+                </select>
+            </div>
+        </div>
+
+        <!-- 商品名称搜索框 -->
+        <div class="layui-inline">
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-inline">
+                <select name="goodsid" id="select_goodsid">
+                    <option value="0">请选择商品</option>
+                </select>
+            </div>
+        </div>
+
+        <!-- 开始时间选择框 -->
+        <div class="layui-inline">
+            <label class="layui-form-label">开始时间</label>
+            <div class="layui-input-inline">
+                <input type="text" name="startTime" id="startTime" readonly="readonly" placeholder="yyyy-MM-dd"
+                       class="layui-input input-radius">
+            </div>
+        </div>
+
+        <!-- 结束时间选择框 -->
+        <div class="layui-inline">
+            <label class="layui-form-label">结束时间</label>
+            <div class="layui-input-inline">
+                <input type="text" name="endTime" id="endTime" readonly="readonly" placeholder="yyyy-MM-dd"
+                       class="layui-input input-radius">
+            </div>
+        </div>
+    </div>
+
+    <!-- 提交按钮组 -->
+    <div class="layui-form-item">
+        <div class="layui-input-block" style="text-align: center;padding-right: 15%;">
+            <button type="button" class="layui-btn layui-btn-sm layui-btn-radius" lay-submit="" lay-filter="doSearch">
+                <i class="layui-icon layui-icon-search layui-icon-normal"></i>查询
+            </button>
+            <button type="reset" class="layui-btn layui-btn-sm layui-btn-radius layui-btn-warm">
+                <i class="layui-icon layui-icon-refresh"></i><span>重置</span>
+            </button>
+        </div>
+    </div>
+</form>
+
+<!-- 数据表格区域 -->
+<div>
+    <table class="layui-hide" id="inportTable" lay-filter="inportTable"></table>
+    <div id="inportToolBar" style="display: none">
+        <button type="button" lay-event="add" shiro:hasPermission="inport:create" class="layui-btn layui-btn-sm layui-btn-normal layui-btn-radius">
+            <i class="layui-icon layui-icon-add-1"></i>添加进货
+        </button>
+    </div>
+</div>
+
+<!-- 添加/编辑数据表单弹出层 -->
+<div id="addOrUpdateDiv" style="display: none;padding: 10px;padding-right: 5%">
+    <form action="" method="post" class="layui-form" id="dataFrm" lay-filter="dataFrm">
+        <div class="layui-form-item">
+            <label class="layui-form-label">供应商名称</label>
+            <div class="layui-input-inline">
+                <select name="providerid" id="providerid" lay-filter="providerid">
+                    <option value="0">请选择供应商</option>
+                </select>
             </div>
         </div>
+
         <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">进货备注</label>
-                <div class="layui-input-block">
-                    <textarea name="remark" placeholder="请输入进货备注" class="layui-textarea" cols="200" rows="8"></textarea>
-                </div>
+            <label class="layui-form-label">商品名称</label>
+            <div class="layui-input-inline">
+                <select name="goodsid" id="goodsid">
+                    <option value="0">请选择商品</option>
+                </select>
             </div>
         </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">进货数量</label>
+            <div class="layui-input-block">
+                <input type="text" name="number" lay-verify="required|number" autocomplete="off" class="layui-input input-radius" placeholder="请输入进货数量">
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">进货备注</label>
+            <div class="layui-input-block">
+                <textarea name="remark" placeholder="请输入进货备注" class="layui-textarea"></textarea>
+            </div>
+        </div>
+
+        <!-- 提交按钮组 -->
         <div class="layui-form-item">
             <div class="layui-input-block" style="text-align: center;padding-right: 7%">
-                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doSubmit" id="doSubmit"><i
-                        class="layui-icon layui-icon-search layui-icon-normal"></i>提交
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doSubmit">
+                    <i class="layui-icon layui-icon-search layui-icon-normal"></i>提交
                 </button>
-                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm"><i
-                        class="layui-icon layui-icon-refresh"></i><span>重置</span>
+                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm">
+                    <i class="layui-icon layui-icon-refresh"></i><span>重置</span>
                 </button>
             </div>
         </div>
     </form>
 </div>
 
-<!--退货的弹出层-->
+<!-- 退货的弹出层，用于用户输入退货信息 -->
 <div id="backGoodsDiv" style="display: none;padding-right: 3%">
     <form action="" method="post" class="layui-form" id="dataFrmBack" lay-filter="dataFrmBack">
 
+        <!-- 退货数量输入区域 -->
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label">退货数量</label>
                 <div class="layui-input-block">
-                    <input type="hidden" name="id">  <!-- 进货单ID  -->
-                    <input type="hidden" name="currentNumber" id="currentNumber">  <!-- 进货单中进货数量  -->
+                    <input type="hidden" name="id">  <!-- 隐藏字段存储当前退货的进货单ID -->
+                    <input type="hidden" name="currentNumber" id="currentNumber">  <!-- 当前进货单的实际进货数量 -->
                     <input type="text" name="number" lay-verify="required|checkNumber" autocomplete="off" class="layui-input input-radius" placeholder="请输入退货数量">
                 </div>
             </div>
         </div>
+
+        <!-- 退货备注输入区域 -->
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label">退货备注</label>
@@ -221,13 +339,17 @@
                 </div>
             </div>
         </div>
+
+        <!-- 提交与重置按钮区域 -->
         <div class="layui-form-item">
             <div class="layui-input-block" style="text-align: center;padding-right: 7%">
-                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doBackSubmit" id="doBackSubmit"><i
-                        class="layui-icon layui-icon-search layui-icon-normal"></i>提交
+                <!-- 提交按钮，用于提交退货信息 -->
+                <button type="button" class="layui-btn layui-btn-radius" lay-submit="" lay-filter="doBackSubmit" id="doBackSubmit">
+                    <i class="layui-icon layui-icon-search layui-icon-normal"></i> 提交
                 </button>
-                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm"><i
-                        class="layui-icon layui-icon-refresh"></i><span>重置</span>
+                <!-- 重置按钮，用于清空退货表单输入数据 -->
+                <button type="reset" class="layui-btn layui-btn-radius layui-btn-warm">
+                    <i class="layui-icon layui-icon-refresh"></i><span>重置</span>
                 </button>
             </div>
         </div>
@@ -235,6 +357,7 @@
 </div>
 
 
+
 <script type="text/javascript" src="/resources/layui/layui.js"></script>
 
 <script type="text/javascript">
@@ -448,7 +571,7 @@
                 form.render("select");
             });
         }
-        
+
 
         form.on("submit(doSubmit)",function (data) {
             $.post(url,data.field,function (res) {
