1 ماه پیش · f364a9d01b
--- a/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailList.html
+++ b/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailList.html
@@ -7,83 +7,70 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SBbfxKcbbInventoryShortageDetail-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                商品ID:<input type="text" class="styled-input" name="productId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品类别:<input type="text" class="styled-input" name="category" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                供应商:<input type="text" class="styled-input" name="supplier" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                库存数量:<input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                再订货水平:<input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                缺货数量:<input type="text" class="styled-input" name="shortageQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后库存检查时间:<input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后编辑人:<input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后编辑时间:<input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SBbfxKcbbInventoryShortageDetail-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品ID: </label>
			
 
				+                            <input type="text" class="styled-input" name="productId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品编码: </label>
			
 
				+                            <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品类别: </label>
			
 
				+                            <input type="text" class="styled-input" name="category" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>供应商: </label>
			
 
				+                            <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>库存数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>再订货水平: </label>
			
 
				+                            <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>缺货数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="shortageQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后库存检查时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后编辑人: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后编辑时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailPageEdit.html
+++ b/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailPageEdit.html
@@ -13,47 +13,47 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品ID:</label>
			
 
				+                            <label>商品ID:</label>
			
 
				                         <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名称:</label>
			
 
				+                            <label>商品名称:</label>
			
 
				                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品编码:</label>
			
 
				+                            <label>商品编码:</label>
			
 
				                         <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类别:</label>
			
 
				+                            <label>商品类别:</label>
			
 
				                         <input name="category" placeholder="商品类别" th:value="${category}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>供应商:</label>
			
 
				+                            <label>供应商:</label>
			
 
				                         <input name="supplier" placeholder="供应商" th:value="${supplier}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>库存数量:</label>
			
 
				+                            <label>库存数量:</label>
			
 
				                         <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>再订货水平:</label>
			
 
				+                            <label>再订货水平:</label>
			
 
				                         <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>缺货数量:</label>
			
 
				+                            <label>缺货数量:</label>
			
 
				                         <input name="shortageQuantity" placeholder="缺货数量" th:value="${shortageQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后库存检查时间:</label>
			
 
				+                            <label>最后库存检查时间:</label>
			
 
				                         <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑人:</label>
			
 
				+                            <label>最后编辑人:</label>
			
 
				                         <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑时间:</label>
			
 
				+                            <label>最后编辑时间:</label>
			
 
				                         <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxList.html
+++ b/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxList.html
@@ -7,83 +7,70 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SBbfxKcbbJgkcmx-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                机构ID:<input type="text" class="styled-input" name="organizationId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品ID:<input type="text" class="styled-input" name="productId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品类别:<input type="text" class="styled-input" name="category" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                供应商:<input type="text" class="styled-input" name="supplier" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                库存数量:<input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                再订货水平:<input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后库存检查时间:<input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后编辑人:<input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                最后编辑时间:<input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SBbfxKcbbJgkcmx-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>机构ID: </label>
			
 
				+                            <input type="text" class="styled-input" name="organizationId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品ID: </label>
			
 
				+                            <input type="text" class="styled-input" name="productId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品编码: </label>
			
 
				+                            <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品类别: </label>
			
 
				+                            <input type="text" class="styled-input" name="category" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>供应商: </label>
			
 
				+                            <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>库存数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>再订货水平: </label>
			
 
				+                            <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后库存检查时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后编辑人: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>最后编辑时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxPageEdit.html
+++ b/health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxPageEdit.html
@@ -13,47 +13,47 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>机构ID:</label>
			
 
				+                            <label>机构ID:</label>
			
 
				                         <input name="organizationId" placeholder="机构ID" th:value="${organizationId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品ID:</label>
			
 
				+                            <label>商品ID:</label>
			
 
				                         <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名称:</label>
			
 
				+                            <label>商品名称:</label>
			
 
				                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品编码:</label>
			
 
				+                            <label>商品编码:</label>
			
 
				                         <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类别:</label>
			
 
				+                            <label>商品类别:</label>
			
 
				                         <input name="category" placeholder="商品类别" th:value="${category}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>供应商:</label>
			
 
				+                            <label>供应商:</label>
			
 
				                         <input name="supplier" placeholder="供应商" th:value="${supplier}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>库存数量:</label>
			
 
				+                            <label>库存数量:</label>
			
 
				                         <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>再订货水平:</label>
			
 
				+                            <label>再订货水平:</label>
			
 
				                         <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后库存检查时间:</label>
			
 
				+                            <label>最后库存检查时间:</label>
			
 
				                         <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑人:</label>
			
 
				+                            <label>最后编辑人:</label>
			
 
				                         <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑时间:</label>
			
 
				+                            <label>最后编辑时间:</label>
			
 
				                         <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordList.html
+++ b/health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordList.html
@@ -7,62 +7,40 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SCgxsCfdjPrescriptionRecord-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                销售单号:<input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SCgxsCfdjPrescriptionRecord-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>销售单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                             <!--<li>
			
 
				-                                销售时间:<input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
			
 
				+                                销售时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
			
 
				                             </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>销售日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">销售日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordPageEdit.html
+++ b/health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordPageEdit.html
@@ -13,59 +13,59 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>销售单号:</label>
			
 
				+                            <label>销售单号:</label>
			
 
				                         <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>销售时间:</label>
			
 
				+                            <label>销售时间:</label>
			
 
				                         <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>登记时间:</label>
			
 
				+                            <label>登记时间:</label>
			
 
				                         <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>处方单号:</label>
			
 
				+                            <label>处方单号:</label>
			
 
				                         <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>类型:</label>
			
 
				+                            <label>类型:</label>
			
 
				                         <input name="type" placeholder="类型" th:value="${type}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>处方日期:</label>
			
 
				+                            <label>处方日期:</label>
			
 
				                         <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>医疗机构名称:</label>
			
 
				+                            <label>医疗机构名称:</label>
			
 
				                         <input name="medicalInstitutionName" placeholder="医疗机构名称" th:value="${medicalInstitutionName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>医生姓名:</label>
			
 
				+                            <label>医生姓名:</label>
			
 
				                         <input name="doctorName" placeholder="医生姓名" th:value="${doctorName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>顾客信息:</label>
			
 
				+                            <label>顾客信息:</label>
			
 
				                         <input name="customerInfo" placeholder="顾客信息" th:value="${customerInfo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审方药师:</label>
			
 
				+                            <label>审方药师:</label>
			
 
				                         <input name="reviewPharmacist" placeholder="审方药师" th:value="${reviewPharmacist}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调配员:</label>
			
 
				+                            <label>调配员:</label>
			
 
				                         <input name="dispenser" placeholder="调配员" th:value="${dispenser}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>复核员:</label>
			
 
				+                            <label>复核员:</label>
			
 
				                         <input name="verifier" placeholder="复核员" th:value="${verifier}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjList.html
+++ b/health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjList.html
@@ -7,62 +7,40 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SCgxsTgypTgypdj-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                销售单号:<input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SCgxsTgypTgypdj-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>销售单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                             <!--<li>
			
 
				-                                销售时间:<input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
			
 
				+                                销售时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
			
 
				                             </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>销售日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">销售日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjPageEdit.html
+++ b/health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjPageEdit.html
@@ -13,51 +13,51 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>销售日期:</label>
			
 
				+                            <label>销售日期:</label>
			
 
				                         <input name="saleDate" placeholder="销售日期" th:value="${saleDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>销售单号:</label>
			
 
				+                            <label>销售单号:</label>
			
 
				                         <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>登记时间:</label>
			
 
				+                            <label>登记时间:</label>
			
 
				                         <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>顾客姓名:</label>
			
 
				+                            <label>顾客姓名:</label>
			
 
				                         <input name="customerName" placeholder="顾客姓名" th:value="${customerName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>性别:</label>
			
 
				+                            <label>性别:</label>
			
 
				                         <input name="gender" placeholder="性别" th:value="${gender}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>身份证号:</label>
			
 
				+                            <label>身份证号:</label>
			
 
				                         <input name="idNumber" placeholder="身份证号" th:value="${idNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>联系电话:</label>
			
 
				+                            <label>联系电话:</label>
			
 
				                         <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>营业员:</label>
			
 
				+                            <label>营业员:</label>
			
 
				                         <input name="salesperson" placeholder="营业员" th:value="${salesperson}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店名称:</label>
			
 
				+                            <label>门店名称:</label>
			
 
				                         <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品编号:</label>
			
 
				+                            <label>药品编号:</label>
			
 
				                         <input name="medicineCode" placeholder="药品编号" th:value="${medicineCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/daas/SDaasChannelManagementList.html
+++ b/health-admin/src/main/resources/templates/daas/SDaasChannelManagementList.html
@@ -7,82 +7,61 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDaasChannelManagement-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                渠道名称:<input type="text" class="styled-input" placeholder="请输入渠道名称" name="channelName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <label style="width: auto">渠道类型</label>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDaasChannelManagement-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>渠道名称: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入渠道名称" name="channelName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>渠道类型</label>
			
 
				                                 <select name="channelType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="线上">线上</option>
			
 
				                                     <option value="线下">线下</option>
			
 
				                                     <option value="第三方平台">第三方平台</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                联系人:<input type="text" class="styled-input" placeholder="请输入联系人" name="contactPerson" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                联系电话:<input type="text" class="styled-input" placeholder="请输入联系电话" name="contactPhone" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <label style="width: auto">渠道状态</label>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>联系人: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入联系人" name="contactPerson" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>联系电话: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入联系电话" name="contactPhone" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>渠道状态</label>
			
 
				                                 <select name="status"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="启用">启用</option>
			
 
				                                     <option value="启用">停用</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>创建时间:</label>
			
 
				                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				                                 <span>-</span>
			
 
				                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/daas/SDaasChannelManagementPageEdit.html
+++ b/health-admin/src/main/resources/templates/daas/SDaasChannelManagementPageEdit.html
@@ -13,55 +13,55 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道名称:</label>
			
 
				+                            <label>渠道名称:</label>
			
 
				                         <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道代码:</label>
			
 
				+                            <label>渠道代码:</label>
			
 
				                         <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道类型</label>
			
 
				+                            <label>渠道类型</label>
			
 
				                         <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台" th:value="${channelType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>联系人:</label>
			
 
				+                            <label>联系人:</label>
			
 
				                         <input name="contactPerson" placeholder="联系人" th:value="${contactPerson}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>联系电话:</label>
			
 
				+                            <label>联系电话:</label>
			
 
				                         <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>电子邮件:</label>
			
 
				+                            <label>电子邮件:</label>
			
 
				                         <input name="email" placeholder="电子邮件" th:value="${email}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>地址:</label>
			
 
				+                            <label>地址:</label>
			
 
				                         <input name="address" placeholder="地址" th:value="${address}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道状态</label>
			
 
				+                            <label>渠道状态</label>
			
 
				                         <input name="status" placeholder="渠道状态：启用、停用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>备注:</label>
			
 
				+                            <label>备注:</label>
			
 
				                         <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpList.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpList.html
@@ -7,71 +7,48 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDdglFpglDsfzfkp-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNo" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                支付方式编码:<input type="text"  style="width: auto" class="styled-input" placeholder="请输入支付方式编码" name="paymentMethodCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>时间范围:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDdglFpglDsfzfkp-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入订单号" name="orderNo" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>支付方式编码:</label>
			
 
				+                            <input type="text"  class="styled-input" placeholder="请输入支付方式编码" name="paymentMethodCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">时间范围:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>订单类型</label>
			
 
				                                 <select name="orderType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="正向单">正向单</option>
			
 
				                                     <option value="逆向单">逆向单</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpPageEdit.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpPageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单号:</label>
			
 
				+                            <label>订单号:</label>
			
 
				                         <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>支付方式编码:</label>
			
 
				+                            <label>支付方式编码:</label>
			
 
				                         <input name="paymentMethodCode" placeholder="支付方式编码" th:value="${paymentMethodCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>支付方式名称:</label>
			
 
				+                            <label>支付方式名称:</label>
			
 
				                         <input name="paymentMethodName" placeholder="支付方式名称" th:value="${paymentMethodName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单金额:</label>
			
 
				+                            <label>订单金额:</label>
			
 
				                         <input name="orderAmount" placeholder="订单金额" th:value="${orderAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开票金额:</label>
			
 
				+                            <label>开票金额:</label>
			
 
				                         <input name="billingAmount" placeholder="开票金额" th:value="${billingAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>原正向订单:</label>
			
 
				+                            <label>原正向订单:</label>
			
 
				                         <input name="originalPositiveOrder" placeholder="原正向订单" th:value="${originalPositiveOrder}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单创建时间:</label>
			
 
				+                            <label>订单创建时间:</label>
			
 
				                         <input name="orderCreateTime" placeholder="订单创建时间" th:value="${orderCreateTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单类型:</label>
			
 
				+                            <label>订单类型:</label>
			
 
				                         <input name="orderType" placeholder="订单类型 (正向单, 逆向单)" th:value="${orderType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoList.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoList.html
@@ -7,80 +7,62 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDdglFpglInvoiceinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                发票类型:<input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                抬头类型:<input type="text" class="styled-input" name="headerType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                开票类型:<input type="text" class="styled-input" name="billingType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店铺名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                审核类型:<input type="text" class="styled-input" name="auditType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                审核状态:<input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                开票状态:<input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>发票类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>抬头类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>开票类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店铺名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>审核类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>审核状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>开票状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>创建时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoPageEdit.html
@@ -13,87 +13,87 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>平台订单号:</label>
			
 
				+                            <label>平台订单号:</label>
			
 
				                         <input name="platformOrderNo" placeholder="平台订单号" th:value="${platformOrderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发票代码:</label>
			
 
				+                            <label>发票代码:</label>
			
 
				                         <input name="invoiceCode" placeholder="发票代码" th:value="${invoiceCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发票号码:</label>
			
 
				+                            <label>发票号码:</label>
			
 
				                         <input name="invoiceNumber" placeholder="发票号码" th:value="${invoiceNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发票金额:</label>
			
 
				+                            <label>发票金额:</label>
			
 
				                         <input name="invoiceAmount" placeholder="发票金额" th:value="${invoiceAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道店铺:</label>
			
 
				+                            <label>渠道店铺:</label>
			
 
				                         <input name="channelStore" placeholder="渠道店铺" th:value="${channelStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单发票类型:</label>
			
 
				+                            <label>订单发票类型:</label>
			
 
				                         <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)" th:value="${orderInvoiceType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发票类型:</label>
			
 
				+                            <label>发票类型:</label>
			
 
				                         <input name="invoiceType" placeholder="发票类型" th:value="${invoiceType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>抬头类型:</label>
			
 
				+                            <label>抬头类型:</label>
			
 
				                         <input name="headerType" placeholder="抬头类型" th:value="${headerType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>抬头名称:</label>
			
 
				+                            <label>抬头名称:</label>
			
 
				                         <input name="headerName" placeholder="抬头名称" th:value="${headerName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开票类型:</label>
			
 
				+                            <label>开票类型:</label>
			
 
				                         <input name="billingType" placeholder="开票类型" th:value="${billingType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开票时间:</label>
			
 
				+                            <label>开票时间:</label>
			
 
				                         <input name="billingTime" placeholder="开票时间" th:value="${billingTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>邮寄信息:</label>
			
 
				+                            <label>邮寄信息:</label>
			
 
				                         <input name="mailingInfo" placeholder="邮寄信息" th:value="${mailingInfo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开票金额:</label>
			
 
				+                            <label>开票金额:</label>
			
 
				                         <input name="billingAmount" placeholder="开票金额" th:value="${billingAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店铺名称:</label>
			
 
				+                            <label>店铺名称:</label>
			
 
				                         <input name="storeName" placeholder="店铺名称" th:value="${storeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审核类型:</label>
			
 
				+                            <label>审核类型:</label>
			
 
				                         <input name="auditType" placeholder="审核类型" th:value="${auditType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审核状态:</label>
			
 
				+                            <label>审核状态:</label>
			
 
				                         <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>暂无数据:</label>
			
 
				+                            <label>暂无数据:</label>
			
 
				                         <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)" th:value="${noData}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合并订单号:</label>
			
 
				+                            <label>合并订单号:</label>
			
 
				                         <input name="mergeOrderNo" placeholder="合并订单号" th:value="${mergeOrderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单号:</label>
			
 
				+                            <label>订单号:</label>
			
 
				                         <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开票状态:</label>
			
 
				+                            <label>开票状态:</label>
			
 
				                         <input name="billingStatus" placeholder="开票状态" th:value="${billingStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglFpglinvoice.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglFpglinvoice.html
@@ -7,80 +7,62 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDdglFpglInvoiceinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                发票类型:<input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                抬头类型:<input type="text" class="styled-input" name="headerType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                开票类型:<input type="text" class="styled-input" name="billingType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店铺名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                审核类型:<input type="text" class="styled-input" name="auditType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                审核状态:<input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                开票状态:<input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>发票类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>抬头类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>开票类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店铺名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>审核类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>审核状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>开票状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>创建时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreList.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreList.html
@@ -7,62 +7,44 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDdglOrderStore-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>订单日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" placeholder="请输入订单号" name="orderId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDdglOrderStore-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">订单日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入订单号" name="orderId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>配送类型</label>
			
 
				                                 <select name="deliveryType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="自提">自提</option>
			
 
				                                     <option value="非自提">非自提</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>渠道名称</label>
			
 
				                                 <select name="channelName"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
@@ -72,22 +54,16 @@
 
				                                     <option value="天猫商城">天猫商城</option>
			
 
				                                     <option value="饿了么">饿了么</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>订单状态</label>
			
 
				                                 <select name="orderStatus"  th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/ddgl/SDdglOrderStorePageEdit.html
+++ b/health-admin/src/main/resources/templates/ddgl/SDdglOrderStorePageEdit.html
@@ -13,127 +13,127 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单号:</label>
			
 
				+                            <label>订单号:</label>
			
 
				                         <input name="orderId" placeholder="订单号" th:value="${orderId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>配送类型:</label>
			
 
				+                            <label>配送类型:</label>
			
 
				                         <input name="deliveryType" placeholder="配送类型" th:value="${deliveryType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>手机号:</label>
			
 
				+                            <label>手机号:</label>
			
 
				                         <input name="mobileNumber" placeholder="手机号" th:value="${mobileNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道名称:</label>
			
 
				+                            <label>渠道名称:</label>
			
 
				                         <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道单号:</label>
			
 
				+                            <label>渠道单号:</label>
			
 
				                         <input name="channelOrderNo" placeholder="渠道单号" th:value="${channelOrderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>PSO销售单号:</label>
			
 
				+                            <label>PSO销售单号:</label>
			
 
				                         <input name="psoSaleOrderNo" placeholder="PSO销售单号" th:value="${psoSaleOrderNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单状态:</label>
			
 
				+                            <label>订单状态:</label>
			
 
				                         <input name="orderStatus" placeholder="订单状态" th:value="${orderStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>配送状态:</label>
			
 
				+                            <label>配送状态:</label>
			
 
				                         <input name="deliveryStatus" placeholder="配送状态" th:value="${deliveryStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单日期:</label>
			
 
				+                            <label>订单日期:</label>
			
 
				                         <input name="orderDate" placeholder="订单日期" th:value="${orderDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店名称:</label>
			
 
				+                            <label>门店名称:</label>
			
 
				                         <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>消费时间:</label>
			
 
				+                            <label>消费时间:</label>
			
 
				                         <input name="consumptionTime" placeholder="消费时间" th:value="${consumptionTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员ID:</label>
			
 
				+                            <label>会员ID:</label>
			
 
				                         <input name="memberId" placeholder="会员ID" th:value="${memberId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员名称:</label>
			
 
				+                            <label>会员名称:</label>
			
 
				                         <input name="memberName" placeholder="会员名称" th:value="${memberName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>系统登录人Id:</label>
			
 
				+                            <label>系统登录人Id:</label>
			
 
				                         <input name="systemLoginUserId" placeholder="系统登录人Id" th:value="${systemLoginUserId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单人:</label>
			
 
				+                            <label>下单人:</label>
			
 
				                         <input name="orderPlacer" placeholder="下单人" th:value="${orderPlacer}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单时间:</label>
			
 
				+                            <label>下单时间:</label>
			
 
				                         <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>结账单id:</label>
			
 
				+                            <label>结账单id:</label>
			
 
				                         <input name="settlementId" placeholder="结账单id" th:value="${settlementId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>结账单code:</label>
			
 
				+                            <label>结账单code:</label>
			
 
				                         <input name="settlementCode" placeholder="结账单code" th:value="${settlementCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后支付时间:</label>
			
 
				+                            <label>最后支付时间:</label>
			
 
				                         <input name="finalPaymentTime" placeholder="最后完成支付的支付时间" th:value="${finalPaymentTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品总数量:</label>
			
 
				+                            <label>药品总数量:</label>
			
 
				                         <input name="totalDrugQuantity" placeholder="药品总数量" th:value="${totalDrugQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>卡号:</label>
			
 
				+                            <label>卡号:</label>
			
 
				                         <input name="cardNumber" placeholder="卡号" th:value="${cardNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发货地址:</label>
			
 
				+                            <label>发货地址:</label>
			
 
				                         <input name="shippingAddress" placeholder="发货地址" th:value="${shippingAddress}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单地址:</label>
			
 
				+                            <label>下单地址:</label>
			
 
				                         <input name="orderAddress" placeholder="下单地址" th:value="${orderAddress}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单类型:</label>
			
 
				+                            <label>订单类型:</label>
			
 
				                         <input name="orderType" placeholder="订单类型" th:value="${orderType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单来源:</label>
			
 
				+                            <label>订单来源:</label>
			
 
				                         <input name="orderSource" placeholder="订单来源" th:value="${orderSource}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单总金额:</label>
			
 
				+                            <label>订单总金额:</label>
			
 
				                         <input name="totalAmount" placeholder="订单总金额" th:value="${totalAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单费用外送费:</label>
			
 
				+                            <label>订单费用外送费:</label>
			
 
				                         <input name="deliveryFee" placeholder="订单费用外送费" th:value="${deliveryFee}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>退款金额:</label>
			
 
				+                            <label>退款金额:</label>
			
 
				                         <input name="refundAmount" placeholder="退款金额" th:value="${refundAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>外送提货方式:</label>
			
 
				+                            <label>外送提货方式:</label>
			
 
				                         <input name="deliveryPickupMethod" placeholder="外送提货方式" th:value="${deliveryPickupMethod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>外送提货时间:</label>
			
 
				+                            <label>外送提货时间:</label>
			
 
				                         <input name="deliveryPickupTime" placeholder="外送提货时间" th:value="${deliveryPickupTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>备注:</label>
			
 
				+                            <label>备注:</label>
			
 
				                         <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/demo/form/sortable.html
+++ b/health-admin/src/main/resources/templates/demo/form/sortable.html
@@ -180,7 +180,6 @@
 
				                                     <i class="fa fa-clock-o"></i> 2018.05.12
			
 
				                                 </div>
			
 
				                             </li>
			
 
				-
			
 
				                         </ul>
			
 
				                     </div>
			
 
				                 </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskList.html
@@ -7,77 +7,62 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SDtpRwglBusinesstask-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                业务归属:<input type="text" class="styled-input" name="businessBelonging" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                任务类型:<input type="text" class="styled-input" name="taskType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                患者姓名:<input type="text" class="styled-input" name="patientName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                完成时间:<input type="text" class="styled-input" name="completeTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                跟进人:<input type="text" class="styled-input" name="follower" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店:<input type="text" class="styled-input" name="store" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                连锁:<input type="text" class="styled-input" name="chain" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SDtpRwglBusinesstask-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>业务归属: </label>
			
 
				+                            <input type="text" class="styled-input" name="businessBelonging" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>任务类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="taskType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>患者姓名: </label>
			
 
				+                            <input type="text" class="styled-input" name="patientName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>创建时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>完成时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="completeTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>跟进人: </label>
			
 
				+                            <input type="text" class="styled-input" name="follower" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店: </label>
			
 
				+                            <input type="text" class="styled-input" name="store" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>连锁: </label>
			
 
				+                            <input type="text" class="styled-input" name="chain" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>业务归属:</label>
			
 
				+                            <label>业务归属:</label>
			
 
				                         <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务类型:</label>
			
 
				+                            <label>任务类型:</label>
			
 
				                         <input name="taskType" placeholder="任务类型" th:value="${taskType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>患者姓名:</label>
			
 
				+                            <label>患者姓名:</label>
			
 
				                         <input name="patientName" placeholder="患者姓名" th:value="${patientName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>完成时间:</label>
			
 
				+                            <label>完成时间:</label>
			
 
				                         <input name="completeTime" placeholder="完成时间" th:value="${completeTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>跟进人:</label>
			
 
				+                            <label>跟进人:</label>
			
 
				                         <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店:</label>
			
 
				+                            <label>门店:</label>
			
 
				                         <input name="store" placeholder="门店" th:value="${store}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁:</label>
			
 
				+                            <label>连锁:</label>
			
 
				                         <input name="chain" placeholder="连锁" th:value="${chain}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,31 +20,35 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpSjdcFollowUpStatistics-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                跟进人:<input type="text" class="styled-input" name="follower" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                预约日期:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                业务归属:<input type="text" class="styled-input" name="patientCount" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <form id="SDtpSjdcFollowUpStatistics-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>跟进人: </label>
			
 
				+                            <input type="text" class="styled-input" name="follower" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label>预约日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>业务归属: </label>
			
 
				+                            <input type="text" class="styled-input" name="patientCount" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsPageEdit.html
@@ -13,63 +13,63 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>跟进人:</label>
			
 
				+                            <label>跟进人:</label>
			
 
				                         <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>年龄:</label>
			
 
				+                            <label>年龄:</label>
			
 
				                         <input name="age" placeholder="年龄" th:value="${age}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>性别:</label>
			
 
				+                            <label>性别:</label>
			
 
				                         <input name="gender" placeholder="性别" th:value="${gender}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>适应症:</label>
			
 
				+                            <label>适应症:</label>
			
 
				                         <input name="indication" placeholder="适应症" th:value="${indication}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>不良反应:</label>
			
 
				+                            <label>不良反应:</label>
			
 
				                         <input name="adverseReaction" placeholder="不良反应" th:value="${adverseReaction}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>用药状态:</label>
			
 
				+                            <label>用药状态:</label>
			
 
				                         <input name="medicationStatus" placeholder="用药状态" th:value="${medicationStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>配合度:</label>
			
 
				+                            <label>配合度:</label>
			
 
				                         <input name="cooperationLevel" placeholder="配合度" th:value="${cooperationLevel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>永久停药:</label>
			
 
				+                            <label>永久停药:</label>
			
 
				                         <input name="permanentDiscontinuation" placeholder="永久停药" th:value="${permanentDiscontinuation}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>暂停用药:</label>
			
 
				+                            <label>暂停用药:</label>
			
 
				                         <input name="temporarySuspension" placeholder="暂停用药" th:value="${temporarySuspension}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>既往治疗方案:</label>
			
 
				+                            <label>既往治疗方案:</label>
			
 
				                         <input name="previousTreatmentPlan" placeholder="既往治疗方案" th:value="${previousTreatmentPlan}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>目前治疗方案:</label>
			
 
				+                            <label>目前治疗方案:</label>
			
 
				                         <input name="currentTreatmentPlan" placeholder="目前治疗方案" th:value="${currentTreatmentPlan}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>生存期（天）:</label>
			
 
				+                            <label>生存期（天）:</label>
			
 
				                         <input name="survivalPeriod" placeholder="生存期（天）" th:value="${survivalPeriod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品通用名:</label>
			
 
				+                            <label>药品通用名:</label>
			
 
				                         <input name="genericName" placeholder="药品通用名" th:value="${genericName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>患者数:</label>
			
 
				+                            <label>患者数:</label>
			
 
				                         <input name="patientCount" placeholder="患者数" th:value="${patientCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务数:</label>
			
 
				+                            <label>任务数:</label>
			
 
				                         <input name="taskCount" placeholder="任务数" th:value="${taskCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,42 +20,45 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpSjdcQualityInspectionTask-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                连锁ID:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="query" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                连锁id:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店id:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="storeName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                质检状态:
			
 
				+                <form id="SDtpSjdcQualityInspectionTask-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>连锁ID: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="query" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>连锁id: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店id: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="storeName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>质检状态:</label>>
			
 
				                                 <select name="inspectionStatus"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="进行中">进行中</option>
			
 
				                                     <option value="质检完成">质检完成</option>
			
 
				                                     <option value="质检异常">质检异常</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建时间:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                分数范围:<input type="number" class="styled-input" placeholder="最大" name="maxInspectionScore" autocomplete="off"/>-
			
 
				-                                <input type="number" class="styled-input" placeholder="最小" name="minInspectionScore" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label>创建时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分数范围:</label>
			
 
				+                            <input type="number" class="styled-input" placeholder="最大" name="maxInspectionScore" autocomplete="off"/>-
			
 
				+                            <input type="number" class="styled-input" placeholder="最小" name="minInspectionScore" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskPageEdit.html
@@ -13,47 +13,47 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁ID:</label>
			
 
				+                            <label>连锁ID:</label>
			
 
				                         <input name="chainId" placeholder="连锁ID" th:value="${chainId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁名称:</label>
			
 
				+                            <label>连锁名称:</label>
			
 
				                         <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店名称:</label>
			
 
				+                            <label>门店名称:</label>
			
 
				                         <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>质检用户:</label>
			
 
				+                            <label>质检用户:</label>
			
 
				                         <input name="inspectionUser" placeholder="质检用户" th:value="${inspectionUser}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务名称:</label>
			
 
				+                            <label>任务名称:</label>
			
 
				                         <input name="taskName" placeholder="任务名称" th:value="${taskName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>质检时间:</label>
			
 
				+                            <label>质检时间:</label>
			
 
				                         <input name="inspectionTime" placeholder="质检时间" th:value="${inspectionTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>质检流程:</label>
			
 
				+                            <label>质检流程:</label>
			
 
				                         <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求" th:value="${inspectionProcess}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>质检评分:</label>
			
 
				+                            <label>质检评分:</label>
			
 
				                         <input name="inspectionScore" placeholder="质检评分" th:value="${inspectionScore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>质检状态:</label>
			
 
				+                            <label>质检状态:</label>
			
 
				                         <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,22 +20,21 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpYypzCallWord-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                分类:
			
 
				+                <form id="SDtpYypzCallWord-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分类:</label>
			
 
				                                 <select name="category"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="整体">整体</option>
			
 
				                                     <option value="医学前沿">单项</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品:</label>
			
 
				+                            <label>药品:</label>
			
 
				                         <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>业务归属:</label>
			
 
				+                            <label>业务归属:</label>
			
 
				                         <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模板名称:</label>
			
 
				+                            <label>模板名称:</label>
			
 
				                         <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模版ID:</label>
			
 
				+                            <label>模版ID:</label>
			
 
				                         <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态：</label>
			
 
				+                            <label>状态：</label>
			
 
				                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,50 +20,50 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpYypzFaqManagement-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                场景:
			
 
				+                <form id="SDtpYypzFaqManagement-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>场景:</label>
			
 
				                                 <select name="scene"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="DTP随访">DTP随访</option>
			
 
				                                     <option value="慢病随访">慢病随访</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                问答类型:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>问答类型:</label>
			
 
				                                 <select name="questionAnswerType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="注射">注射</option>
			
 
				                                     <option value="口服">口服</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                问答摘要:<input type="text" class="styled-input" placeholder="请输入问答摘要" name="summary" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                适用药品
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>问答摘要: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入问答摘要" name="summary" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>适用药品</label>
			
 
				                                 <select name="applicableDrugs"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="美式高锅">美式高锅</option>
			
 
				                                     <option value="储物箱">储物箱</option>
			
 
				                                     <option value="熟料袋">熟料袋(小号)</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态:</label>
			
 
				                                 <select name="status"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="已启用">启用</option>
			
 
				                                     <option value="禁用">禁用</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				             <div class="btn-group-sm" id="toolbar" role="group">
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementPageEdit.html
@@ -13,43 +13,43 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>问答ID:</label>
			
 
				+                            <label>问答ID:</label>
			
 
				                         <input name="questionAnswerId" placeholder="问答ID" th:value="${questionAnswerId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>问答类型:</label>
			
 
				+                            <label>问答类型:</label>
			
 
				                         <input name="questionAnswerType" placeholder="问答类型" th:value="${questionAnswerType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>问答摘要:</label>
			
 
				+                            <label>问答摘要:</label>
			
 
				                         <input name="summary" placeholder="问答摘要" th:value="${summary}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>问题内容:</label>
			
 
				+                            <label>问题内容:</label>
			
 
				                         <input name="questionContent" placeholder="问题内容" th:value="${questionContent}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>回答内容:</label>
			
 
				+                            <label>回答内容:</label>
			
 
				                         <input name="answerContent" placeholder="回答内容" th:value="${answerContent}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>适用药品:</label>
			
 
				+                            <label>适用药品:</label>
			
 
				                         <input name="applicableDrugs" placeholder="适用药品，可以存储多个药品，用逗号分隔" th:value="${applicableDrugs}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>排序权重:</label>
			
 
				+                            <label>排序权重:</label>
			
 
				                         <input name="sortWeight" placeholder="排序权重" th:value="${sortWeight}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑时间:</label>
			
 
				+                            <label>最后编辑时间:</label>
			
 
				                         <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑人:</label>
			
 
				+                            <label>最后编辑人:</label>
			
 
				                         <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,46 +20,48 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpYypzFollowUpSop-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                业务归属:
			
 
				+                <form id="SDtpYypzFollowUpSop-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>业务归属:</label>
			
 
				                                 <select name="businessBelonging"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="常规回访">常规回访</option>
			
 
				                                     <option value="脱落召回">脱落召回</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="drug" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                模板名称:<input type="text" class="styled-input" placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                模版ID:<input type="text" class="styled-input" placeholder="请输入模版ID" name="templateId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建时间:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="drug" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>模板名称: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>模版ID: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入模版ID" name="templateId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label>创建时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态:</label>
			
 
				                                 <select name="status"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="已启用">已启用</option>
			
 
				                                     <option value="已停用">已停用</option>
			
 
				                                     <option value="已创建">已创建</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品:</label>
			
 
				+                            <label>药品:</label>
			
 
				                         <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>业务归属:</label>
			
 
				+                            <label>业务归属:</label>
			
 
				                         <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模板名称:</label>
			
 
				+                            <label>模板名称:</label>
			
 
				                         <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模版ID:</label>
			
 
				+                            <label>模版ID:</label>
			
 
				                         <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,44 +20,46 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpYypzFollowUpTemplate-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                关联药品:<input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                模板名称:<input type="text" class="styled-input"  placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                模版ID:<input type="text" class="styled-input" placeholder="请输入模版ID"  name="templateId" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                事件标签:
			
 
				+                <form id="SDtpYypzFollowUpTemplate-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>关联药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>模板名称: </label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>模版ID: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入模版ID"  name="templateId" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>事件标签:</label>
			
 
				                                 <select name="eventTag"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="普通模版">普通模版</option>
			
 
				                                     <option value="销售订单完成登记">销售订单完成登记</option>
			
 
				                                     <option value="进入慈善援助">进入慈善援助</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                任务数:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>任务数:</label>
			
 
				                                 <select name="taskNumber"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="单任务">单任务</option>
			
 
				                                     <option value="多任务">多任务</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplatePageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplatePageEdit.html
@@ -13,47 +13,47 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>药品:</label>
			
 
				+                            <label>药品:</label>
			
 
				                         <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>事件标签:</label>
			
 
				+                            <label>事件标签:</label>
			
 
				                         <input name="eventTag" placeholder="事件标签" th:value="${eventTag}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模版ID:</label>
			
 
				+                            <label>模版ID:</label>
			
 
				                         <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模板名称:</label>
			
 
				+                            <label>模板名称:</label>
			
 
				                         <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务数:</label>
			
 
				+                            <label>任务数:</label>
			
 
				                         <input name="taskCount" placeholder="任务数" th:value="${taskCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>业务域:</label>
			
 
				+                            <label>业务域:</label>
			
 
				                         <input name="businessDomain" placeholder="业务域" th:value="${businessDomain}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -44,7 +18,7 @@
 
				                     <div class="query-buttons">
			
 
				                         <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                        
			
 
				+
			
 
				                         <a class="btn btn-success" onclick="" shiro:hasPermission="system:user:add">
			
 
				                             <i class="fa fa-plus"></i> MDM数据
			
 
				                         </a>
			
@@ -56,50 +30,49 @@
 
				                         </a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpYypzVerbalTrickt-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                场景:
			
 
				+                <form id="SDtpYypzVerbalTrickt-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>场景:</label>
			
 
				                                 <select name="scene"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="DTP随访">DTP随访</option>
			
 
				                                     <option value="慢病随访">慢病随访</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                话术主题:<input type="text" class="styled-input" placeholder="请输入话术主题" name="scriptTheme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                适用药品类型:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>话术主题: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入话术主题" name="scriptTheme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>适用药品类型:</label>
			
 
				                                 <select name="applicableDrugType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="注射">注射</option>
			
 
				                                     <option value="口服">口服</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                适用随访类型:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>适用随访类型:</label>
			
 
				                                 <select name="applicableFollowUpType"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="常规回访">常规回访</option>
			
 
				                                     <option value="脱落召回">脱落召回</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态:</label>
			
 
				                                 <select name="status"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="已启用">启用</option>
			
 
				                                     <option value="禁用">禁用</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-
			
 
				-                        </ul>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktPageEdit.html
@@ -13,67 +13,67 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术ID:</label>
			
 
				+                            <label>话术ID:</label>
			
 
				                         <input name="scriptId" placeholder="话术ID" th:value="${scriptId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术主题:</label>
			
 
				+                            <label>话术主题:</label>
			
 
				                         <input name="scriptTheme" placeholder="话术主题" th:value="${scriptTheme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术摘要:</label>
			
 
				+                            <label>话术摘要:</label>
			
 
				                         <input name="scriptSummary" placeholder="话术摘要" th:value="${scriptSummary}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术内容:</label>
			
 
				+                            <label>话术内容:</label>
			
 
				                         <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>关键词:</label>
			
 
				+                            <label>关键词:</label>
			
 
				                         <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔" th:value="${keywords}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权重:</label>
			
 
				+                            <label>权重:</label>
			
 
				                         <input name="weight" placeholder="权重" th:value="${weight}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后操作时间:</label>
			
 
				+                            <label>最后操作时间:</label>
			
 
				                         <input name="lastOperationTime" placeholder="最后操作时间" th:value="${lastOperationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后操作人:</label>
			
 
				+                            <label>最后操作人:</label>
			
 
				                         <input name="lastOperator" placeholder="最后操作人" th:value="${lastOperator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术主题ID:</label>
			
 
				+                            <label>话术主题ID:</label>
			
 
				                         <input name="themeId" placeholder="话术主题ID" th:value="${themeId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>话术主题:</label>
			
 
				+                            <label>话术主题:</label>
			
 
				                         <input name="theme" placeholder="话术主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>适用药品类型:</label>
			
 
				+                            <label>适用药品类型:</label>
			
 
				                         <input name="applicableDrugType" placeholder="适用药品类型" th:value="${applicableDrugType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>适用随访类型:</label>
			
 
				+                            <label>适用随访类型:</label>
			
 
				                         <input name="applicableFollowUpType" placeholder="适用随访类型" th:value="${applicableFollowUpType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务主题:</label>
			
 
				+                            <label>任务主题:</label>
			
 
				                         <input name="taskTheme" placeholder="任务主题" th:value="${taskTheme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑时间:</label>
			
 
				+                            <label>最后编辑时间:</label>
			
 
				                         <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后编辑人:</label>
			
 
				+                            <label>最后编辑人:</label>
			
 
				                         <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,27 +20,29 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpZskcxDrugInstructions-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码"  name="query" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                生产厂家:<input type="text" class="styled-input" placeholder="请输入生产厂家"  name="manufacturer" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                DTP商品: <select name="dtpProduct"  class="styled-input">
			
 
				-                                    <option value="">全部</option>
			
 
				-                                    <option value="是">是</option>
			
 
				-                                    <option value="否">否</option>
			
 
				-                                </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <form id="SDtpZskcxDrugInstructions-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码"  name="query" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>生产厂家: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入生产厂家"  name="manufacturer" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>DTP商品:</label>
			
 
				+                            <select name="dtpProduct"  class="styled-input">
			
 
				+                                <option value="">全部</option>
			
 
				+                                <option value="是">是</option>
			
 
				+                                <option value="否">否</option>
			
 
				+                            </select>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsPageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>MDM编码:</label>
			
 
				+                            <label>MDM编码:</label>
			
 
				                         <input name="mdmCode" placeholder="MDM编码" th:value="${mdmCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名:</label>
			
 
				+                            <label>商品名:</label>
			
 
				                         <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>通用名:</label>
			
 
				+                            <label>通用名:</label>
			
 
				                         <input name="genericName" placeholder="通用名" th:value="${genericName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>规格:</label>
			
 
				+                            <label>规格:</label>
			
 
				                         <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>生产厂家:</label>
			
 
				+                            <label>生产厂家:</label>
			
 
				                         <input name="manufacturer" placeholder="生产厂家" th:value="${manufacturer}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>产地:</label>
			
 
				+                            <label>产地:</label>
			
 
				                         <input name="origin" placeholder="产地" th:value="${origin}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否弃用:</label>
			
 
				+                            <label>是否弃用:</label>
			
 
				                         <input name="isDeprecated" placeholder="是否弃用" th:value="${isDeprecated}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,16 +20,18 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpZskcxFollowUpGuidance-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                标题:<input type="text" class="styled-input" placeholder="请输入标题" name="title" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                分类:
			
 
				+                <form id="SDtpZskcxFollowUpGuidance-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>标题: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入标题" name="title" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分类:</label>
			
 
				                                 <select name="category"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="用药参考">用药参考</option>
			
@@ -63,20 +39,20 @@
 
				                                     <option value="科研服务">科研服务</option>
			
 
				                                     <option value="临床指南">临床指南</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                关联药品:<input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                关联疾病:<input type="text" class="styled-input" placeholder="请输入关联疾病" name="associatedDiseases" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                创建人:<input type="text" class="styled-input" placeholder="请输入创建人" name="createdBy" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>关联药品: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>关联疾病: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入关联疾病" name="associatedDiseases" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>创建人: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入创建人" name="createdBy" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidancePageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidancePageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>标题:</label>
			
 
				+                            <label>标题:</label>
			
 
				                         <input name="title" placeholder="标题" th:value="${title}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>分类:</label>
			
 
				+                            <label>分类:</label>
			
 
				                         <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>关联药品:</label>
			
 
				+                            <label>关联药品:</label>
			
 
				                         <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔" th:value="${associatedDrugs}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>关联疾病:</label>
			
 
				+                            <label>关联疾病:</label>
			
 
				                         <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔" th:value="${associatedDiseases}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>疾病病程:</label>
			
 
				+                            <label>疾病病程:</label>
			
 
				                         <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程" th:value="${diseaseCourse}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,16 +20,18 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpZskcxPharmaceuticalShare-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                分类:
			
 
				+                <form id="SDtpZskcxPharmaceuticalShare-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分类:</label>
			
 
				                                 <select name="category"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option value="用药参考">用药参考</option>
			
@@ -63,10 +39,8 @@
 
				                                     <option value="科研服务">科研服务</option>
			
 
				                                     <option value="临床指南">临床指南</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				             <div class="col-sm-12 select-table table-striped">
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalSharePageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalSharePageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>文章标题:</label>
			
 
				+                            <label>文章标题:</label>
			
 
				                         <input name="articleTitle" placeholder="文章标题" th:value="${articleTitle}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>分类:</label>
			
 
				+                            <label>分类:</label>
			
 
				                         <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>来源门店:</label>
			
 
				+                            <label>来源门店:</label>
			
 
				                         <input name="sourceStore" placeholder="来源门店" th:value="${sourceStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新人:</label>
			
 
				+                            <label>更新人:</label>
			
 
				                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceList.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -46,17 +20,17 @@
 
				                         <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				                 </div>
			
 
				-                <form id="SDtpZskcxPharmacovigilance-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                药品:<input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <form id="SDtpZskcxPharmacovigilance-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品: </label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilancePageEdit.html
+++ b/health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilancePageEdit.html
@@ -13,23 +13,23 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>最后更新时间:</label>
			
 
				+                            <label>最后更新时间:</label>
			
 
				                         <input name="lastUpdateTime" placeholder="最后更新时间" th:value="${lastUpdateTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>名称:</label>
			
 
				+                            <label>名称:</label>
			
 
				                         <input name="name" placeholder="名称" th:value="${name}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>介绍:</label>
			
 
				+                            <label>介绍:</label>
			
 
				                         <input name="introduction" placeholder="介绍" th:value="${introduction}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>警戒创建人:</label>
			
 
				+                            <label>警戒创建人:</label>
			
 
				                         <input name="alertCreator" placeholder="警戒创建人" th:value="${alertCreator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/dtp/archives/archivesList.html
+++ b/health-admin/src/main/resources/templates/dtp/archives/archivesList.html
@@ -61,7 +61,7 @@
 
				 									随访跟进人：<input type="text"  placeholder="请输入随访跟进人" class="styled-input" name="followUpPerson"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									是否接受随访:<select name="acceptFollowUp" id="acceptFollowUpSelect"  style="width: auto" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
			
 
				+									是否接受随访:<select name="acceptFollowUp" id="acceptFollowUpSelect" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
			
 
				 										<option value="">所有</option>
			
 
				 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
			
 
				 									</select>
			
--- a/health-admin/src/main/resources/templates/dtp/cold/add.html
+++ b/health-admin/src/main/resources/templates/dtp/cold/add.html
@@ -19,7 +19,7 @@
 
				             <div class="col-sm-3">
			
 
				                 <div class="form-group">
			
 
				                     <div class="form-group">
			
 
				-                        <label>实际配送时间</label>
			
 
				+                            <label>实际配送时间</label>
			
 
				                         <input type="text" class="styled-input time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
			
 
				                     </div>
			
 
				                 </div>
			
--- a/health-admin/src/main/resources/templates/dtp/cold/cold.html
+++ b/health-admin/src/main/resources/templates/dtp/cold/cold.html
@@ -37,19 +37,19 @@
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>订单号：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
			
 
				+									                            <input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>配送员：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
			
 
				+									                            <input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>收货人：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
			
 
				+									                            <input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>收货电话：</label>
			
 
				-								<input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
			
 
				+								                            <input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>配送状态:</label>
			
--- a/health-admin/src/main/resources/templates/dtp/configInfo/addDrug.html
+++ b/health-admin/src/main/resources/templates/dtp/configInfo/addDrug.html
@@ -19,7 +19,7 @@
 
				             <div class="col-sm-3">
			
 
				                 <div class="form-group">
			
 
				                     <div class="form-group">
			
 
				-                        <label>实际配送时间</label>
			
 
				+                            <label>实际配送时间</label>
			
 
				                         <input type="text" class="time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
			
 
				                     </div>
			
 
				                 </div>
			
--- a/health-admin/src/main/resources/templates/dtp/followUp/followUpList.html
+++ b/health-admin/src/main/resources/templates/dtp/followUp/followUpList.html
@@ -51,7 +51,7 @@
 
				 						<div class="select-list" >
			
 
				 							<ul>
			
 
				 								<li>
			
 
				-									患者信息：<input type="text" class="styled-input" name="patientName"/>
			
 
				+									患者信息：                            <input type="text" class="styled-input" name="patientName"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									药品：<input type="text"  class="styled-input" name="genericName"/>
			
--- a/health-admin/src/main/resources/templates/dtp/followUpEvaluation/followUpEvaluationList.html
+++ b/health-admin/src/main/resources/templates/dtp/followUpEvaluation/followUpEvaluationList.html
@@ -47,10 +47,10 @@
 
				 						<div class="select-list" >
			
 
				 							<ul>
			
 
				 								<li>
			
 
				-									连锁店：<input type="text" class="styled-input" name="chainStoreName" autocomplete="off"/>
			
 
				+									连锁店：                            <input type="text" class="styled-input" name="chainStoreName" autocomplete="off"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									门店：<input type="text" class="styled-input" name="storeName"/>
			
 
				+									门店：                            <input type="text" class="styled-input" name="storeName"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									评价日期：
			
--- a/health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingList.html
+++ b/health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingList.html
@@ -46,10 +46,10 @@
 
				 						<div class="select-list" >
			
 
				 							<ul>
			
 
				 								<li>
			
 
				-									患者信息：<input type="text" class="styled-input" name="patientName" autocomplete="off"/>
			
 
				+									患者信息：                            <input type="text" class="styled-input" name="patientName" autocomplete="off"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									疾病：<input type="text" class="styled-input" name="disease"/>
			
 
				+									疾病：                            <input type="text" class="styled-input" name="disease"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									咨询问题：<input type="text"  class="styled-input" name="consultationQuestion"/>
			
--- a/health-admin/src/main/resources/templates/dtp/recipe/recipe.html
+++ b/health-admin/src/main/resources/templates/dtp/recipe/recipe.html
@@ -24,21 +24,21 @@
 
				 						<div class="select-list">
			
 
				 							<ul>
			
 
				 								<li>
			
 
				-									患者信息：<input type="text" class="styled-input" placeholder="请输入患者姓名或手机号" name="query"/>
			
 
				+									患者信息：                            <input type="text" class="styled-input" placeholder="请输入患者姓名或手机号" name="query"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									药品：<input type="text" class="styled-input" name="genericName"/>
			
 
				+									药品：                            <input type="text" class="styled-input" name="genericName"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 								<li>
			
 
				-									订单编号：<input type="text" class="styled-input" name="orderId"/>
			
 
				+									订单编号：                            <input type="text" class="styled-input" name="orderId"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									销售单号：<input type="text" class="styled-input" name="saleOrderNumber"/>
			
 
				+									销售单号：                            <input type="text" class="styled-input" name="saleOrderNumber"/>
			
 
				 								</li>：
			
 
				 								</li>
			
 
				 								<li>
			
 
				-									处方单号：<input type="text" class="styled-input" name="prescriptionNumber"/>
			
 
				+									处方单号：                            <input type="text" class="styled-input" name="prescriptionNumber"/>
			
 
				 								</li>
			
 
				 								<li>
			
 
				 									<label>处方类型</label>
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoList.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoList.html
@@ -7,74 +7,52 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SFwglServercommissionrewardinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" name="servicePackageOrderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                券码:<input type="text" class="styled-input" name="voucherCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店员工号:<input type="text" class="styled-input" name="staffNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SFwglServercommissionrewardinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="servicePackageOrderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>券码: </label>
			
 
				+                            <input type="text" class="styled-input" name="voucherCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店员工号: </label>
			
 
				+                            <input type="text" class="styled-input" name="staffNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				                                 <label>时间:</label>
			
 
				                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				                                 <span>-</span>
			
 
				                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				+                        </div>
			
 
				+
			
 
				 
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServerinfoList.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServerinfoList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServerinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServerinfoPageEdit.html
@@ -13,43 +13,43 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名称:</label>
			
 
				+                            <label>商品名称:</label>
			
 
				                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品ID:</label>
			
 
				+                            <label>商品ID:</label>
			
 
				                         <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>MDM商品编码:</label>
			
 
				+                            <label>MDM商品编码:</label>
			
 
				                         <input name="mdmProductCode" placeholder="MDM商品编码" th:value="${mdmProductCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>价格:</label>
			
 
				+                            <label>价格:</label>
			
 
				                         <input name="price" placeholder="价格" th:value="${price}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类型:</label>
			
 
				+                            <label>商品类型:</label>
			
 
				                         <input name="productType" placeholder="商品类型" th:value="${productType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>库存:</label>
			
 
				+                            <label>库存:</label>
			
 
				                         <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类目:</label>
			
 
				+                            <label>商品类目:</label>
			
 
				                         <input name="productCategory" placeholder="商品类目" th:value="${productCategory}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审核状态:</label>
			
 
				+                            <label>审核状态:</label>
			
 
				                         <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="creationTime" placeholder="创建时间" th:value="${creationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoList.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoList.html
@@ -7,32 +7,6 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
@@ -53,7 +27,7 @@
 
				                     <div class="customize-form-group-container">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group-container">
			
 
				-                        <div class="customize-form-group">
			
 
				+                        <div class="customize-form-group  select-time">
			
 
				                             <label>下单时间:</label>
			
 
				                             <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				                             <span>-</span>
			
@@ -77,14 +51,13 @@
 
				                         </div>
			
 
				                         <div class="customize-form-group">
			
 
				                             <label>是否已使用:</label>
			
 
				-                            <input type="text" class="styled-input" name="couponUsed" autocomplete="off"/>
			
 
				+                            <input type="text" class="styled-input"  name="couponUsed" autocomplete="off"/>
			
 
				                         </div>
			
 
				                         <div class="customize-form-group">
			
 
				                             <label>销售渠道:</label>
			
 
				                             <input type="text" placeholder="请输销售渠道" class="styled-input" name="salesChannel" autocomplete="off"/>
			
 
				                         </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoPageEdit.html
@@ -13,71 +13,71 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单编号:</label>
			
 
				+                            <label>订单编号:</label>
			
 
				                         <input name="orderNumber" placeholder="订单编号" th:value="${orderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类型:</label>
			
 
				+                            <label>商品类型:</label>
			
 
				                         <input name="productType" placeholder="商品类型" th:value="${productType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品企业:</label>
			
 
				+                            <label>商品企业:</label>
			
 
				                         <input name="productEnterprise" placeholder="商品企业" th:value="${productEnterprise}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名称:</label>
			
 
				+                            <label>商品名称:</label>
			
 
				                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单时间:</label>
			
 
				+                            <label>下单时间:</label>
			
 
				                         <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单金额:</label>
			
 
				+                            <label>订单金额:</label>
			
 
				                         <input name="orderAmount" placeholder="订单金额" th:value="${orderAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单来源:</label>
			
 
				+                            <label>订单来源:</label>
			
 
				                         <input name="orderSource" placeholder="订单来源" th:value="${orderSource}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单状态:</label>
			
 
				+                            <label>订单状态:</label>
			
 
				                         <input name="orderStatus" placeholder="订单状态" th:value="${orderStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单账户:</label>
			
 
				+                            <label>下单账户:</label>
			
 
				                         <input name="orderingAccount" placeholder="下单账户" th:value="${orderingAccount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>用户ID:</label>
			
 
				+                            <label>用户ID:</label>
			
 
				                         <input name="userId" placeholder="用户ID" th:value="${userId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单手机号:</label>
			
 
				+                            <label>下单手机号:</label>
			
 
				                         <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单门店:</label>
			
 
				+                            <label>下单门店:</label>
			
 
				                         <input name="orderingStore" placeholder="下单门店" th:value="${orderingStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店编码:</label>
			
 
				+                            <label>门店编码:</label>
			
 
				                         <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>退款操作人:</label>
			
 
				+                            <label>退款操作人:</label>
			
 
				                         <input name="refundOperator" placeholder="退款操作人" th:value="${refundOperator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>优惠券是否已使用:</label>
			
 
				+                            <label>优惠券是否已使用:</label>
			
 
				                         <input name="couponUsed" placeholder="优惠券是否已使用" th:value="${couponUsed}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>实物兑换是否已使用:</label>
			
 
				+                            <label>实物兑换是否已使用:</label>
			
 
				                         <input name="physicalRedemptionUsed" placeholder="实物兑换是否已使用" th:value="${physicalRedemptionUsed}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>销售渠道:</label>
			
 
				+                            <label>销售渠道:</label>
			
 
				                         <input name="salesChannel" placeholder="销售渠道" th:value="${salesChannel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoList.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoList.html
@@ -7,68 +7,44 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SFwglServicepackageinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-
			
 
				-
			
 
				-                                <!--扫码时间:<input type="text" class="styled-input" name="scanningTime" autocomplete="off"/>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>下单日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                订单编号:<input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                服务包名称:<input type="text" class="styled-input" name="servicePackageName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                下单手机号:<input type="text" class="styled-input" name="orderingPhone" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SFwglServicepackageinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container" >
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">下单日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单编号: </label>
			
 
				+                            <input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>服务包名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="servicePackageName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>下单手机号: </label>
			
 
				+                            <input type="text" class="styled-input" name="orderingPhone" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoPageEdit.html
@@ -13,51 +13,51 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单编号:</label>
			
 
				+                            <label>订单编号:</label>
			
 
				                         <input name="orderNumber" placeholder="订单编号" th:value="${orderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁:</label>
			
 
				+                            <label>连锁:</label>
			
 
				                         <input name="chain" placeholder="连锁" th:value="${chain}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务包ID:</label>
			
 
				+                            <label>服务包ID:</label>
			
 
				                         <input name="servicePackageId" placeholder="服务包ID" th:value="${servicePackageId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务包名称:</label>
			
 
				+                            <label>服务包名称:</label>
			
 
				                         <input name="servicePackageName" placeholder="服务包名称" th:value="${servicePackageName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单时间:</label>
			
 
				+                            <label>下单时间:</label>
			
 
				                         <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>用户ID:</label>
			
 
				+                            <label>用户ID:</label>
			
 
				                         <input name="userId" placeholder="用户ID" th:value="${userId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单手机号:</label>
			
 
				+                            <label>下单手机号:</label>
			
 
				                         <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单状态:</label>
			
 
				+                            <label>订单状态:</label>
			
 
				                         <input name="orderStatus" placeholder="订单状态" th:value="${orderStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单门店:</label>
			
 
				+                            <label>下单门店:</label>
			
 
				                         <input name="orderingStore" placeholder="下单门店" th:value="${orderingStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>扫码提成员工工号:</label>
			
 
				+                            <label>扫码提成员工工号:</label>
			
 
				                         <input name="scanningStaffNumber" placeholder="扫码提成员工工号" th:value="${scanningStaffNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>扫码提成员工姓名:</label>
			
 
				+                            <label>扫码提成员工姓名:</label>
			
 
				                         <input name="scanningStaffName" placeholder="扫码提成员工姓名" th:value="${scanningStaffName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>扫码时间:</label>
			
 
				+                            <label>扫码时间:</label>
			
 
				                         <input name="scanningTime" placeholder="扫码时间" th:value="${scanningTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoList.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoList.html
@@ -7,57 +7,37 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SFwglServicetypeinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                服务类型编号:<input type="text" class="styled-input" name="serviceTypeNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li> <!-- 字段需要添加-->
			
 
				-                                状态:<input type="text" class="styled-input" name="fulfillmentParty" autocomplete="off"/>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SFwglServicetypeinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>服务类型编号: </label>
			
 
				+                            <input type="text" class="styled-input" name="serviceTypeNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label> <!-- 字段需要添加-->
			
 
				+                                状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="fulfillmentParty" autocomplete="off"/>
			
 
				                             </li>
			
 
				 
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				-                    </div>
			
 
				 
			
 
				+                    </div>
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoPageEdit.html
@@ -13,27 +13,27 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务id:</label>
			
 
				+                            <label>服务id:</label>
			
 
				                         <input name="serviceId" placeholder="服务id" th:value="${serviceId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务类型编号:</label>
			
 
				+                            <label>服务类型编号:</label>
			
 
				                         <input name="serviceTypeNumber" placeholder="服务类型编号" th:value="${serviceTypeNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务类型名称:</label>
			
 
				+                            <label>服务类型名称:</label>
			
 
				                         <input name="serviceTypeName" placeholder="服务类型名称" th:value="${serviceTypeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务类型描述:</label>
			
 
				+                            <label>服务类型描述:</label>
			
 
				                         <input name="serviceTypeDescription" placeholder="服务类型描述" th:value="${serviceTypeDescription}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>履约方:</label>
			
 
				+                            <label>履约方:</label>
			
 
				                         <input name="fulfillmentParty" placeholder="履约方" th:value="${fulfillmentParty}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>:</label>
			
 
				+                            <label>:</label>
			
 
				                         <input name="create_time" placeholder="" th:value="${create_time}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoList.html
+++ b/health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoList.html
@@ -13,7 +13,6 @@
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-
			
 
				                 <div class="query-condition-container">
			
 
				                     <h4 class="query-condition-title">查询条件</h4>
			
 
				                     <div class="query-buttons">
			
@@ -26,15 +25,15 @@
 
				                     <div class="customize-form-group-container">
			
 
				                         <div class="customize-form-group">
			
 
				                             <label for="userName">用户姓名：</label>
			
 
				-                            <input type="text" class="styled-input" id="userName" name="userName" autocomplete="off">
			
 
				+                            <input type="text" class="styled-input"  id="userName" name="userName" autocomplete="off">
			
 
				                         </div>
			
 
				                         <div class="customize-form-group">
			
 
				                             <label for="filler">填写人：</label>
			
 
				-                            <input type="text" class="styled-input" id="filler" name="filler" autocomplete="off">
			
 
				+                            <input type="text" class="styled-input"  id="filler" name="filler" autocomplete="off">
			
 
				                         </div>
			
 
				                         <div class="customize-form-group">
			
 
				                             <label for="fillSource">填写来源：</label>
			
 
				-                            <input type="text" class="styled-input" id="fillSource" name="fillSource" autocomplete="off">
			
 
				+                            <input type="text" class="styled-input"  id="fillSource" name="fillSource" autocomplete="off">
			
 
				                         </div>
			
 
				                         <div class="customize-form-group select-time">
			
 
				                             <label for="startTime">报告生成时间:</label>
			
--- a/health-admin/src/main/resources/templates/gkdggl/SGkdgglCustomerOrderAuditList.html
+++ b/health-admin/src/main/resources/templates/gkdggl/SGkdgglCustomerOrderAuditList.html
@@ -7,57 +7,40 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SGkdgglCustomerOrderAudit-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>更新时间:</label>
			
 
				-                                <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                订购单号:<input type="text" class="styled-input" placeholder="请输入订购单号" name="orderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <label style="width: auto">收货人信息检索:</label>
			
 
				-                                <input type="text"  style="width: 180px" placeholder="请输入手机号/姓名" class="styled-input" name="query" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SGkdgglCustomerOrderAudit-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">更新时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订购单号: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入订购单号" name="orderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>收货人信息检索:</label>
			
 
				+                            <input type="text"  style="width: 180px" placeholder="请输入手机号/姓名" class="styled-input" name="query" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>订单状态</label>
			
 
				                                 <select name="orderStatus"  class="styled-input">
			
 
				                                     <option value="">全部</option>
			
@@ -65,15 +48,8 @@
 
				                                     <option value="审核驳回">审核驳回</option>
			
 
				                                     <option value="审核通过">审核通过</option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				             <div class="col-sm-12 select-table table-striped">
			
--- a/health-admin/src/main/resources/templates/gkdggl/SGkdgglCustomerOrderAuditPageEdit.html
+++ b/health-admin/src/main/resources/templates/gkdggl/SGkdgglCustomerOrderAuditPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订购单号:</label>
			
 
				+                            <label>订购单号:</label>
			
 
				                         <input name="orderNumber" placeholder="订购单号" th:value="${orderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>收货人手机号:</label>
			
 
				+                            <label>收货人手机号:</label>
			
 
				                         <input name="recipientPhone" placeholder="收货人手机号" th:value="${recipientPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>收货人姓名:</label>
			
 
				+                            <label>收货人姓名:</label>
			
 
				                         <input name="recipientName" placeholder="收货人姓名" th:value="${recipientName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>1待审核, 2审核, 3驳回:</label>
			
 
				+                            <label>1待审核, 2审核, 3驳回:</label>
			
 
				                         <input name="orderStatus" placeholder="1待审核, 2审核, 3驳回" th:value="${orderStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>操作人:</label>
			
 
				+                            <label>操作人:</label>
			
 
				                         <input name="operator" placeholder="操作人" th:value="${operator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>定金支付状态：1支付中，2未支付，3支付完成:</label>
			
 
				+                            <label>定金支付状态：1支付中，2未支付，3支付完成:</label>
			
 
				                         <input name="depositPaymentStatus" placeholder="定金支付状态：1支付中，2未支付，3支付完成" th:value="${depositPaymentStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglEquitiesList.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglEquitiesList.html
@@ -7,78 +7,42 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglEquities-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <div class="col-sm-12">
			
 
				-                            <div class="form-group">
			
 
				-                                <!--is-required 增加星号 显示为必填-->
			
 
				-                                <div class="col-sm-3">
			
 
				-                                    <div class="input-group">
			
 
				-                                        <label class="control-label">权益的名称:</label>
			
 
				-                                        <input type="text" class="styled-input" name="benefitName" autocomplete="off"/>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                <div class="col-sm-3">
			
 
				-                                    <div class="input-group">
			
 
				-                                        <label class="control-label">权益的ID:</label>
			
 
				-                                        <input type="text" class="styled-input" name="benefitUniqueIdentifier" autocomplete="off"/>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                <div class="col-sm-3">
			
 
				-                                    <div class="input-group">
			
 
				-                                        <label class="control-label">权益的状态:</label>
			
 
				-                                        <select name="benefitStatus"  th:with="type=${@dict.getType('sys_select_yhgl_qytz')}" class="styled-input">
			
 
				-                                            <option value="">全部</option>
			
 
				-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
			
 
				-                                            ></option>
			
 
				-                                        </select>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                                <div class="col-sm-3">
			
 
				-                                    <div class="input-group">
			
 
				-                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglEquities-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>权益的名称:</label>
			
 
				+                            <input type="text" class="styled-input"  name="benefitName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>权益的ID:</label>
			
 
				+                            <input type="text" class="styled-input"  name="benefitUniqueIdentifier" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>权益的状态:</label>
			
 
				+                            <select name="benefitStatus"  th:with="type=${@dict.getType('sys_select_yhgl_qytz')}" class="styled-input">
			
 
				+                                <option value="">全部</option>
			
 
				+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
			
 
				+                                ></option>
			
 
				+                            </select>
			
 
				                         </div>
			
 
				-
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglEquitiesPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglEquitiesPageEdit.html
@@ -13,55 +13,55 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的唯一标识符:</label>
			
 
				+                            <label>权益的唯一标识符:</label>
			
 
				                         <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符" th:value="${benefitUniqueIdentifier}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的名称:</label>
			
 
				+                            <label>权益的名称:</label>
			
 
				                         <input name="benefitName" placeholder="权益的名称" th:value="${benefitName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的描述:</label>
			
 
				+                            <label>权益的描述:</label>
			
 
				                         <input name="benefitDescription" placeholder="权益的描述" th:value="${benefitDescription}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的用途:</label>
			
 
				+                            <label>权益的用途:</label>
			
 
				                         <input name="benefitPurpose" placeholder="权益的用途" th:value="${benefitPurpose}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的类型:</label>
			
 
				+                            <label>权益的类型:</label>
			
 
				                         <input name="benefitType" placeholder="权益的类型" th:value="${benefitType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的状态:</label>
			
 
				+                            <label>权益的状态:</label>
			
 
				                         <input name="benefitStatus" placeholder="权益的状态" th:value="${benefitStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益的详细说明:</label>
			
 
				+                            <label>权益的详细说明:</label>
			
 
				                         <input name="benefitDetails" placeholder="权益的详细说明" th:value="${benefitDetails}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>总库存:</label>
			
 
				+                            <label>总库存:</label>
			
 
				                         <input name="totalStock" placeholder="总库存" th:value="${totalStock}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>剩余库存:</label>
			
 
				+                            <label>剩余库存:</label>
			
 
				                         <input name="remainingStock" placeholder="剩余库存" th:value="${remainingStock}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审核状态:</label>
			
 
				+                            <label>审核状态:</label>
			
 
				                         <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人的用户名:</label>
			
 
				+                            <label>创建人的用户名:</label>
			
 
				                         <input name="createdByUsername" placeholder="创建人的用户名" th:value="${createdByUsername}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>生成时间:</label>
			
 
				+                            <label>生成时间:</label>
			
 
				                         <input name="creationTime" placeholder="生成时间" th:value="${creationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>操作记录:</label>
			
 
				+                            <label>操作记录:</label>
			
 
				                         <input name="operationLog" placeholder="操作记录" th:value="${operationLog}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglHyxxJzyxMarketingplaninfoList.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglHyxxJzyxMarketingplaninfoList.html
@@ -7,92 +7,82 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglHyxxJzyxMarketingplaninfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                计划的唯一标识符:<input type="text" class="styled-input" name="planUniqueIdentifier" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                计划的名称:<input type="text" class="styled-input" name="planName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                计划的目标人群描述:<input type="text" class="styled-input" name="targetAudienceDescription" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                执行计划的方法:<input type="text" class="styled-input" name="executionMethods" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                推广计划所使用的渠道:<input type="text" class="styled-input" name="promotionChannels" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                计划的开始日期:<input type="text" class="styled-input" name="startDate" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                具体任务的执行时间:<input type="text" class="styled-input" name="taskExecutionTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                计划所属的分组名称:<input type="text" class="styled-input" name="groupBelongingName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                预计参与的会员数量:<input type="text" class="styled-input" name="estimatedParticipants" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                实际成功参与的会员数量:<input type="text" class="styled-input" name="actualParticipants" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                任务推送的进度百分比:<input type="text" class="styled-input" name="taskPushProgress" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                任务完成的进度百分比:<input type="text" class="styled-input" name="taskCompletionProgress" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                计划的状态:<input type="text" class="styled-input" name="planStatus" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                创建计划的用户:<input type="text" class="styled-input" name="createdByUser" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglHyxxJzyxMarketingplaninfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划的唯一标识符: </label>
			
 
				+                            <input type="text" class="styled-input" name="planUniqueIdentifier" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划的名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="planName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划的目标人群描述: </label>
			
 
				+                            <input type="text" class="styled-input" name="targetAudienceDescription" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>执行计划的方法: </label>
			
 
				+                            <input type="text" class="styled-input" name="executionMethods" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>推广计划所使用的渠道: </label>
			
 
				+                            <input type="text" class="styled-input" name="promotionChannels" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划的开始日期: </label>
			
 
				+                            <input type="text" class="styled-input" name="startDate" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>具体任务的执行时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="taskExecutionTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划所属的分组名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="groupBelongingName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>预计参与的会员数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="estimatedParticipants" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>实际成功参与的会员数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="actualParticipants" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>任务推送的进度百分比: </label>
			
 
				+                            <input type="text" class="styled-input" name="taskPushProgress" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>任务完成的进度百分比: </label>
			
 
				+                            <input type="text" class="styled-input" name="taskCompletionProgress" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>计划的状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="planStatus" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>创建计划的用户: </label>
			
 
				+                            <input type="text" class="styled-input" name="createdByUser" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglHyxxJzyxMarketingplaninfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglHyxxJzyxMarketingplaninfoPageEdit.html
@@ -13,59 +13,59 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划的唯一标识符:</label>
			
 
				+                            <label>计划的唯一标识符:</label>
			
 
				                         <input name="planUniqueIdentifier" placeholder="计划的唯一标识符" th:value="${planUniqueIdentifier}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划的名称:</label>
			
 
				+                            <label>计划的名称:</label>
			
 
				                         <input name="planName" placeholder="计划的名称" th:value="${planName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划的目标人群描述:</label>
			
 
				+                            <label>计划的目标人群描述:</label>
			
 
				                         <input name="targetAudienceDescription" placeholder="计划的目标人群描述" th:value="${targetAudienceDescription}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>执行计划的方法:</label>
			
 
				+                            <label>执行计划的方法:</label>
			
 
				                         <input name="executionMethods" placeholder="执行计划的方法" th:value="${executionMethods}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>推广计划所使用的渠道:</label>
			
 
				+                            <label>推广计划所使用的渠道:</label>
			
 
				                         <input name="promotionChannels" placeholder="推广计划所使用的渠道" th:value="${promotionChannels}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划的开始日期:</label>
			
 
				+                            <label>计划的开始日期:</label>
			
 
				                         <input name="startDate" placeholder="计划的开始日期" th:value="${startDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>具体任务的执行时间:</label>
			
 
				+                            <label>具体任务的执行时间:</label>
			
 
				                         <input name="taskExecutionTime" placeholder="具体任务的执行时间" th:value="${taskExecutionTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划所属的分组名称:</label>
			
 
				+                            <label>计划所属的分组名称:</label>
			
 
				                         <input name="groupBelongingName" placeholder="计划所属的分组名称" th:value="${groupBelongingName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>预计参与的会员数量:</label>
			
 
				+                            <label>预计参与的会员数量:</label>
			
 
				                         <input name="estimatedParticipants" placeholder="预计参与的会员数量" th:value="${estimatedParticipants}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>实际成功参与的会员数量:</label>
			
 
				+                            <label>实际成功参与的会员数量:</label>
			
 
				                         <input name="actualParticipants" placeholder="实际成功参与的会员数量" th:value="${actualParticipants}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务推送的进度百分比:</label>
			
 
				+                            <label>任务推送的进度百分比:</label>
			
 
				                         <input name="taskPushProgress" placeholder="任务推送的进度百分比" th:value="${taskPushProgress}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>任务完成的进度百分比:</label>
			
 
				+                            <label>任务完成的进度百分比:</label>
			
 
				                         <input name="taskCompletionProgress" placeholder="任务完成的进度百分比" th:value="${taskCompletionProgress}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>计划的状态:</label>
			
 
				+                            <label>计划的状态:</label>
			
 
				                         <input name="planStatus" placeholder="计划的状态" th:value="${planStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建计划的用户:</label>
			
 
				+                            <label>创建计划的用户:</label>
			
 
				                         <input name="createdByUser" placeholder="创建计划的用户" th:value="${createdByUser}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglMembertagList.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglMembertagList.html
@@ -7,53 +7,30 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglMembertag-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                疾病名称:<input type="text" class="styled-input" name="diseaseName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglMembertag-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>疾病名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="diseaseName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				             <div class="col-sm-12 select-table table-striped">
			
--- a/health-admin/src/main/resources/templates/hygl/SHyglMembertagPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/SHyglMembertagPageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>疾病名称:</label>
			
 
				+                            <label>疾病名称:</label>
			
 
				                         <input name="diseaseName" placeholder="疾病名称" th:value="${diseaseName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员数量:</label>
			
 
				+                            <label>会员数量:</label>
			
 
				                         <input name="memberCount" placeholder="会员数量" th:value="${memberCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>占比:</label>
			
 
				+                            <label>占比:</label>
			
 
				                         <input name="proportion" placeholder="占比" th:value="${proportion}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>删除标记（0: 未删除, 1: 已删除）:</label>
			
 
				+                            <label>删除标记（0: 未删除, 1: 已删除）:</label>
			
 
				                         <input name="deleteFlag" placeholder="删除标记（0: 未删除, 1: 已删除）" th:value="${deleteFlag}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglMemberpointsinfoList.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglMemberpointsinfoList.html
@@ -7,64 +7,28 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglJfglMemberpointsinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <h4>查询条件</h4>
			
 
				-                    <hr>
			
 
				-                    <div class="select-list" >
			
 
				-                                <div class="col-sm-12">
			
 
				-                                    <div class="form-group">
			
 
				-                                        <!--is-required 增加星号 显示为必填-->
			
 
				-                                        <div class="col-sm-6">
			
 
				-                                            <div class="input-group">
			
 
				-                                                <label class="control-label">手机或会员卡号:</label>
			
 
				-                                                <input type="text" class="styled-input" placeholder="请输入手机或会员卡号" name="query" autocomplete="off"/>
			
 
				-                                            </div>
			
 
				-                                        </div>
			
 
				-                                        <div class="col-sm-6">
			
 
				-                                            <div class="input-group">
			
 
				-                                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
			
 
				-                                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                                            </div>
			
 
				-                                        </div>
			
 
				-                                    </div>
			
 
				-                                </div>
			
 
				-
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglJfglMemberpointsinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group">
			
 
				+                        <label>手机或会员卡号:</label>
			
 
				+                        <input type="text" class="styled-input"  placeholder="请输入手机或会员卡号" name="query" autocomplete="off"/>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglMemberpointsinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglMemberpointsinfoPageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员卡号:</label>
			
 
				+                            <label>会员卡号:</label>
			
 
				                         <input name="memberCardNo" placeholder="会员卡号" th:value="${memberCardNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员姓名:</label>
			
 
				+                            <label>会员姓名:</label>
			
 
				                         <input name="memberName" placeholder="会员姓名" th:value="${memberName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>手机号码:</label>
			
 
				+                            <label>手机号码:</label>
			
 
				                         <input name="phoneNumber" placeholder="手机号码" th:value="${phoneNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>领取门店:</label>
			
 
				+                            <label>领取门店:</label>
			
 
				                         <input name="pickupStore" placeholder="领取门店" th:value="${pickupStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>剩余积分:</label>
			
 
				+                            <label>剩余积分:</label>
			
 
				                         <input name="remainingPoints" placeholder="剩余积分" th:value="${remainingPoints}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>积分调整:</label>
			
 
				+                            <label>积分调整:</label>
			
 
				                         <input name="pointsAdjustment" placeholder="积分调整" th:value="${pointsAdjustment}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>积分调整原因:</label>
			
 
				+                            <label>积分调整原因:</label>
			
 
				                         <input name="pointsAdjustmentReason" placeholder="积分调整原因" th:value="${pointsAdjustmentReason}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>积分变动时间:</label>
			
 
				+                            <label>积分变动时间:</label>
			
 
				                         <input name="pointsChangeTime" placeholder="积分变动时间" th:value="${pointsChangeTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoList.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoList.html
@@ -7,109 +7,85 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglJfglOrderinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <h4>查询条件</h4>
			
 
				-                    <hr>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" placeholder="请输入订单号" name="orderID" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品类型 <select name="productType"  th:with="type=${@dict.getType('sys_select_product_type')}" class="styled-input">
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglJfglOrderinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入订单号" name="orderID" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品类型:</label><select name="productType"  th:with="type=${@dict.getType('sys_select_product_type')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                兑换渠道
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>兑换渠道</label>
			
 
				                                 <select name="redemptionChannel"  th:with="type=${@dict.getType('sys_select_jfdh_qd')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                特价订单
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>特价订单</label>
			
 
				                                 <select name="specialOrder"  th:with="type=${@dict.getType('sys_select_jfdhtj_order')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				-                    </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                自提码:<input type="text" class="styled-input"  placeholder="请输入自提码" name="redemptionChannel" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                核销门店:<input type="text" class="styled-input"  placeholder="请输入核销门店" name="verificationStore" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                兑换状态
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>自提码: </label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入自提码" name="redemptionChannel" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>核销门店: </label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入核销门店" name="verificationStore" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>兑换状态</label>
			
 
				                                 <select name="redemptionStatus"  th:with="type=${@dict.getType('sys_select_jfdh_status')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li class="select-time">
			
 
				-                                <label>下单时间: </label>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-
			
 
				-
			
 
				-                        </ul>
			
 
				-                    </div>
			
 
				-
			
 
				-                <div class="select-list">
			
 
				-                    <ul>
			
 
				-                        <li>
			
 
				-                            手机号<input type="text" class="styled-input"  placeholder="请输入手机号" name="memberPhoneOrCardNo" autocomplete="off"/>
			
 
				-                        </li>
			
 
				-                        <li>
			
 
				-                            积分区间:
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">下单时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>手机号:</label>
			
 
				+                            <input type="text" class="styled-input"  placeholder="请输入手机号" name="memberPhoneOrCardNo" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>积分区间:</label>
			
 
				                             <input type="number" style="width: 92px;" class="styled-input"  placeholder="最大" name="pointsMax" autocomplete="off"/>
			
 
				                             ~
			
 
				                             <input type="number" style="width: 92px;" class="styled-input"  placeholder="最小" name="pointsMin" autocomplete="off"/>
			
 
				-                        </li>
			
 
				-                    </ul>
			
 
				-                </div>
			
 
				+                        </div>
			
 
				+                    </div>
			
 
				                 </form>
			
 
				             </div>
			
 
				             <div class="btn-group-sm" id="toolbar" role="group">
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoPageEdit.html
@@ -13,91 +13,91 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单ID:</label>
			
 
				+                            <label>订单ID:</label>
			
 
				                         <input name="orderID" placeholder="订单ID" th:value="${orderID}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名:</label>
			
 
				+                            <label>商品名:</label>
			
 
				                         <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品类型:</label>
			
 
				+                            <label>商品类型:</label>
			
 
				                         <input name="productType" placeholder="商品类型" th:value="${productType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单总价:</label>
			
 
				+                            <label>订单总价:</label>
			
 
				                         <input name="orderTotalPrice" placeholder="订单总价" th:value="${orderTotalPrice}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>外部积分支付:</label>
			
 
				+                            <label>外部积分支付:</label>
			
 
				                         <input name="externalPointsPaid" placeholder="外部积分支付" th:value="${externalPointsPaid}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否特价订单:</label>
			
 
				+                            <label>是否特价订单:</label>
			
 
				                         <input name="isPromotionOrder" placeholder="是否特价订单" th:value="${isPromotionOrder}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>兑换数量:</label>
			
 
				+                            <label>兑换数量:</label>
			
 
				                         <input name="redemptionQuantity" placeholder="兑换数量" th:value="${redemptionQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>兑换渠道:</label>
			
 
				+                            <label>兑换渠道:</label>
			
 
				                         <input name="redemptionChannel" placeholder="兑换渠道" th:value="${redemptionChannel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>支付方式:</label>
			
 
				+                            <label>支付方式:</label>
			
 
				                         <input name="paymentMethod" placeholder="支付方式" th:value="${paymentMethod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>兑换状态:</label>
			
 
				+                            <label>兑换状态:</label>
			
 
				                         <input name="redemptionStatus" placeholder="兑换状态" th:value="${redemptionStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>下单时间:</label>
			
 
				+                            <label>下单时间:</label>
			
 
				                         <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员手机号/卡号:</label>
			
 
				+                            <label>会员手机号/卡号:</label>
			
 
				                         <input name="memberPhoneOrCardNo" placeholder="会员手机号/卡号" th:value="${memberPhoneOrCardNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>用户身份:</label>
			
 
				+                            <label>用户身份:</label>
			
 
				                         <input name="userRole" placeholder="用户身份" th:value="${userRole}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>自提/兑换门店:</label>
			
 
				+                            <label>自提/兑换门店:</label>
			
 
				                         <input name="pickupOrRedemptionStore" placeholder="自提/兑换门店" th:value="${pickupOrRedemptionStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>推荐兑换员工:</label>
			
 
				+                            <label>推荐兑换员工:</label>
			
 
				                         <input name="recommendingEmployee" placeholder="推荐兑换员工" th:value="${recommendingEmployee}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>推荐兑换门店:</label>
			
 
				+                            <label>推荐兑换门店:</label>
			
 
				                         <input name="recommendingStore" placeholder="推荐兑换门店" th:value="${recommendingStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>核销门店:</label>
			
 
				+                            <label>核销门店:</label>
			
 
				                         <input name="verificationStore" placeholder="核销门店" th:value="${verificationStore}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>核销人:</label>
			
 
				+                            <label>核销人:</label>
			
 
				                         <input name="verifiedBy" placeholder="核销人" th:value="${verifiedBy}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>核销时间:</label>
			
 
				+                            <label>核销时间:</label>
			
 
				                         <input name="verificationTime" placeholder="核销时间" th:value="${verificationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>特价订单:</label>
			
 
				+                            <label>特价订单:</label>
			
 
				                         <input name="specialOrder" placeholder="特价订单" th:value="${specialOrder}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>兑换码:</label>
			
 
				+                            <label>兑换码:</label>
			
 
				                         <input name="exchangeCode" placeholder="兑换码" th:value="${exchangeCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>积分:</label>
			
 
				+                            <label>积分:</label>
			
 
				                         <input name="points" placeholder="积分" th:value="${points}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentList.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentList.html
@@ -7,82 +7,47 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglJfglPointAdjustment-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <h4>查询条件</h4>
			
 
				-                    <hr>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                <label>申请单编号</label>
			
 
				-                               <input type="text" class="styled-input" name="applicationNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglJfglPointAdjustment-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>申请单编号</label>
			
 
				+                            <input type="text" class="styled-input"  name="applicationNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>审批状态</label>
			
 
				                                 <select name="approvalStatus"  th:with="type=${@dict.getType('sys_select_yhgl_jfgl_check_status')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                审批人:<input type="text" class="styled-input" name="approver" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>申请时间: </label>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="sqstartTime" placeholder="开始时间" name="plibeginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="sqendTime" placeholder="结束时间" name="pliendTime"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				-                    </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>审批时间: </label>
			
 
				-                                <input type="text" class="time-input-new  styled-input" id="spstartTime" placeholder="开始时间" name="appbeginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input-new  styled-input" id="spendTime" placeholder="结束时间" name="appendTime"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>审批人: </label>
			
 
				+                            <input type="text" class="styled-input" name="approver" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">申请时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				                 </form>
			
 
				             </div>
			
--- a/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentPageEdit.html
@@ -13,55 +13,55 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>申请单编号:</label>
			
 
				+                            <label>申请单编号:</label>
			
 
				                         <input name="applicationNumber" placeholder="申请单编号" th:value="${applicationNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调整数量:</label>
			
 
				+                            <label>调整数量:</label>
			
 
				                         <input name="adjustmentQuantity" placeholder="调整数量" th:value="${adjustmentQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>申请人:</label>
			
 
				+                            <label>申请人:</label>
			
 
				                         <input name="applicant" placeholder="申请人" th:value="${applicant}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>申请时间:</label>
			
 
				+                            <label>申请时间:</label>
			
 
				                         <input name="applicationTime" placeholder="申请时间" th:value="${applicationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审批人:</label>
			
 
				+                            <label>审批人:</label>
			
 
				                         <input name="approver" placeholder="审批人" th:value="${approver}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审批时间:</label>
			
 
				+                            <label>审批时间:</label>
			
 
				                         <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>审批状态:</label>
			
 
				+                            <label>审批状态:</label>
			
 
				                         <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回" th:value="${approvalStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员卡号:</label>
			
 
				+                            <label>会员卡号:</label>
			
 
				                         <input name="memberCardNumber" placeholder="会员卡号" th:value="${memberCardNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员手机号:</label>
			
 
				+                            <label>会员手机号:</label>
			
 
				                         <input name="memberPhone" placeholder="会员手机号" th:value="${memberPhone}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>会员姓名:</label>
			
 
				+                            <label>会员姓名:</label>
			
 
				                         <input name="memberName" placeholder="会员姓名" th:value="${memberName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>积分调整:</label>
			
 
				+                            <label>积分调整:</label>
			
 
				                         <input name="pointsAdjusted" placeholder="积分调整" th:value="${pointsAdjusted}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调整原因:</label>
			
 
				+                            <label>调整原因:</label>
			
 
				                         <input name="adjustmentReason" placeholder="调整原因" th:value="${adjustmentReason}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调整单类型:</label>
			
 
				+                            <label>调整单类型:</label>
			
 
				                         <input name="adjustmentType" placeholder="调整单类型" th:value="${adjustmentType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxMouldmessageList.html
+++ b/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxMouldmessageList.html
@@ -7,68 +7,44 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglHyyxMouldmessage-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                短信名称:<input type="text" class="styled-input" name="smsName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglHyyxMouldmessage-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>短信名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="smsName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>短信状态</label>
			
 
				                                 <select name="status"  th:with="type=${@dict.getType('sys_select_yhgl_hyyx_dxzt')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建时间: </label>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="ndTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxMouldmessagePageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxMouldmessagePageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>短信名称:</label>
			
 
				+                            <label>短信名称:</label>
			
 
				                         <input name="smsName" placeholder="短信名称" th:value="${smsName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>短信平台:</label>
			
 
				+                            <label>短信平台:</label>
			
 
				                         <input name="smsPlatform" placeholder="短信平台" th:value="${smsPlatform}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>三方模版ID:</label>
			
 
				+                            <label>三方模版ID:</label>
			
 
				                         <input name="thirdPartyTemplateId" placeholder="三方模版ID" th:value="${thirdPartyTemplateId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>模板类型:</label>
			
 
				+                            <label>模板类型:</label>
			
 
				                         <input name="templateType" placeholder="模板类型" th:value="${templateType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>短信内容:</label>
			
 
				+                            <label>短信内容:</label>
			
 
				                         <input name="smsContent" placeholder="短信内容" th:value="${smsContent}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>短信变量:</label>
			
 
				+                            <label>短信变量:</label>
			
 
				                         <input name="smsVariables" placeholder="短信变量" th:value="${smsVariables}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxPeoplemanagementList.html
+++ b/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxPeoplemanagementList.html
@@ -7,67 +7,44 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SHyglHyyxPeoplemanagement-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                人群名称:<input type="text" class="styled-input" name="peopleName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SHyglHyyxPeoplemanagement-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>人群名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="peopleName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				                                 <label>更新方式</label>
			
 
				                                 <select name="updateMethod"  th:with="type=${@dict.getType('sys_select_yhgl_hyyx_gxfs')}" class="styled-input">
			
 
				                                     <option value="">全部</option>
			
 
				                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				                                     ></option>
			
 
				                                 </select>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建时间: </label>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input-new styled-input" id="cendTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxPeoplemanagementPageEdit.html
+++ b/health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxPeoplemanagementPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>人群名称:</label>
			
 
				+                            <label>人群名称:</label>
			
 
				                         <input name="peopleName" placeholder="人群名称" th:value="${peopleName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>人群定义:</label>
			
 
				+                            <label>人群定义:</label>
			
 
				                         <input name="peopleDefinition" placeholder="人群定义" th:value="${peopleDefinition}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>总人数:</label>
			
 
				+                            <label>总人数:</label>
			
 
				                         <input name="totalPeopleCount" placeholder="总人数" th:value="${totalPeopleCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>成功人数:</label>
			
 
				+                            <label>成功人数:</label>
			
 
				                         <input name="successPeopleCount" placeholder="成功人数" th:value="${successPeopleCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>失败人数:</label>
			
 
				+                            <label>失败人数:</label>
			
 
				                         <input name="failurePeopleCount" placeholder="失败人数" th:value="${failurePeopleCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新方式:</label>
			
 
				+                            <label>更新方式:</label>
			
 
				                         <input name="updateMethod" placeholder="更新方式" th:value="${updateMethod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>更新时间:</label>
			
 
				+                            <label>更新时间:</label>
			
 
				                         <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建时间:</label>
			
 
				+                            <label>创建时间:</label>
			
 
				                         <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建人:</label>
			
 
				+                            <label>创建人:</label>
			
 
				                         <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jggl/SJgglPriceadjustmentsheetList.html
+++ b/health-admin/src/main/resources/templates/jggl/SJgglPriceadjustmentsheetList.html
@@ -7,79 +7,54 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJgglPriceadjustmentsheet-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                渠道:<input type="text" class="styled-input" name="channel" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                价格类型:<input type="text" class="styled-input" name="priceType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                调价单号:<input type="text" class="styled-input" name="adjustmentSheetNo" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <!--  生效时间:<input type="text" class="styled-input" name="effectiveTime" autocomplete="off"/>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>生效时间:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-
			
 
				-
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                连锁名称:<input type="text" class="styled-input" name="chainName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                </div>
			
 
				+                <form id="SJgglPriceadjustmentsheet-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>渠道: </label>
			
 
				+                            <input type="text" class="styled-input" name="channel" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>价格类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="priceType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>调价单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="adjustmentSheetNo" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                            <!--  生效时间: </label>
			
 
				+                            <input type="text" class="styled-input" name="effectiveTime" autocomplete="off"/>-->
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">生效时间:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>连锁名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="chainName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jggl/SJgglPriceadjustmentsheetPageEdit.html
+++ b/health-admin/src/main/resources/templates/jggl/SJgglPriceadjustmentsheetPageEdit.html
@@ -13,51 +13,51 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调价单号:</label>
			
 
				+                            <label>调价单号:</label>
			
 
				                         <input name="adjustmentSheetNo" placeholder="调价单号" th:value="${adjustmentSheetNo}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调价单名称:</label>
			
 
				+                            <label>调价单名称:</label>
			
 
				                         <input name="adjustmentSheetName" placeholder="调价单名称" th:value="${adjustmentSheetName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调价类型:</label>
			
 
				+                            <label>调价类型:</label>
			
 
				                         <input name="adjustmentType" placeholder="调价类型" th:value="${adjustmentType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调价原因:</label>
			
 
				+                            <label>调价原因:</label>
			
 
				                         <input name="adjustmentReason" placeholder="调价原因" th:value="${adjustmentReason}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>渠道:</label>
			
 
				+                            <label>渠道:</label>
			
 
				                         <input name="channel" placeholder="渠道" th:value="${channel}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>价格类型:</label>
			
 
				+                            <label>价格类型:</label>
			
 
				                         <input name="priceType" placeholder="价格类型" th:value="${priceType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁名称:</label>
			
 
				+                            <label>连锁名称:</label>
			
 
				                         <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店名称:</label>
			
 
				+                            <label>门店名称:</label>
			
 
				                         <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店编码:</label>
			
 
				+                            <label>门店编码:</label>
			
 
				                         <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>要求生效时间:</label>
			
 
				+                            <label>要求生效时间:</label>
			
 
				                         <input name="effectiveTime" placeholder="要求生效时间" th:value="${effectiveTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>生成通知时间:</label>
			
 
				+                            <label>生成通知时间:</label>
			
 
				                         <input name="notificationTime" placeholder="生成通知时间" th:value="${notificationTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>制单人:</label>
			
 
				+                            <label>制单人:</label>
			
 
				                         <input name="createdUser" placeholder="制单人" th:value="${createdUser}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglCommissionrewardinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglCommissionrewardinfoList.html
@@ -7,73 +7,50 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglCommissionrewardinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                订单号:<input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                券码:<input type="text" class="styled-input" name="couponCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店员工号:<input type="text" class="styled-input" name="staffCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SJkglCommissionrewardinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>订单号: </label>
			
 
				+                            <input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>券码: </label>
			
 
				+                            <input type="text" class="styled-input" name="couponCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店员工号: </label>
			
 
				+                            <input type="text" class="styled-input" name="staffCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				                                 <label>发生时间:</label>
			
 
				                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				                                 <span>-</span>
			
 
				                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglCommissionrewardinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglCommissionrewardinfoPageEdit.html
@@ -13,55 +13,55 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>提成来源:</label>
			
 
				+                            <label>提成来源:</label>
			
 
				                         <input name="commissionSource" placeholder="提成来源" th:value="${commissionSource}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>奖励类型:</label>
			
 
				+                            <label>奖励类型:</label>
			
 
				                         <input name="rewardType" placeholder="奖励类型" th:value="${rewardType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>发生时间:</label>
			
 
				+                            <label>发生时间:</label>
			
 
				                         <input name="occurrenceTime" placeholder="发生时间" th:value="${occurrenceTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>订单号:</label>
			
 
				+                            <label>订单号:</label>
			
 
				                         <input name="orderNumber" placeholder="订单号" th:value="${orderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>连锁:</label>
			
 
				+                            <label>连锁:</label>
			
 
				                         <input name="chain" placeholder="连锁" th:value="${chain}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店:</label>
			
 
				+                            <label>门店:</label>
			
 
				                         <input name="store" placeholder="门店" th:value="${store}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>券码:</label>
			
 
				+                            <label>券码:</label>
			
 
				                         <input name="couponCode" placeholder="券码" th:value="${couponCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店员工号:</label>
			
 
				+                            <label>店员工号:</label>
			
 
				                         <input name="staffCode" placeholder="店员工号" th:value="${staffCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店员ID:</label>
			
 
				+                            <label>店员ID:</label>
			
 
				                         <input name="staffId" placeholder="店员ID" th:value="${staffId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店员姓名:</label>
			
 
				+                            <label>店员姓名:</label>
			
 
				                         <input name="staffName" placeholder="店员姓名" th:value="${staffName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约ID:</label>
			
 
				+                            <label>合约ID:</label>
			
 
				                         <input name="contractId" placeholder="合约ID" th:value="${contractId}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约单ID:</label>
			
 
				+                            <label>合约单ID:</label>
			
 
				                         <input name="contractOrderNumber" placeholder="合约单ID" th:value="${contractOrderNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyflCategoryinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyflCategoryinfoList.html
@@ -7,62 +7,36 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglGyhyHyflCategoryinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				-                            </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                分类名称:<input type="text" class="styled-input" name="categoryName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SJkglGyhyHyflCategoryinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container" >
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分类名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="categoryName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyflCategoryinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyflCategoryinfoPageEdit.html
@@ -13,19 +13,19 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>分类名称:</label>
			
 
				+                            <label>分类名称:</label>
			
 
				                         <input name="categoryName" placeholder="分类名称" th:value="${categoryName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>包含合约:</label>
			
 
				+                            <label>包含合约:</label>
			
 
				                         <input name="includedContracts" placeholder="包含合约" th:value="${includedContracts}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>配图:</label>
			
 
				+                            <label>配图:</label>
			
 
				                         <input name="featuredImage" placeholder="配图" th:value="${featuredImage}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyglContractinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyglContractinfoList.html
@@ -7,91 +7,66 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglGyhyHyglContractinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品编码:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				-                            </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                升级尊享:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                合约性质:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                合约模板:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                </div>
			
 
				+                <form id="SJkglGyhyHyglContractinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                删除合约:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>主题: </label>
			
 
				+                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品编码: </label>
			
 
				+                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>合约分类: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>升级尊享: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>合约性质: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>合约模板: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>删除合约: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyglContractinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyglContractinfoPageEdit.html
@@ -13,43 +13,43 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>主题:</label>
			
 
				+                            <label>主题:</label>
			
 
				                         <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约分类:</label>
			
 
				+                            <label>合约分类:</label>
			
 
				                         <input name="contractCategory" placeholder="合约分类" th:value="${contractCategory}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约有效时间:</label>
			
 
				+                            <label>合约有效时间:</label>
			
 
				                         <input name="contractValidPeriod" placeholder="合约有效时间" th:value="${contractValidPeriod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>签约有效时间:</label>
			
 
				+                            <label>签约有效时间:</label>
			
 
				                         <input name="signingValidPeriod" placeholder="签约有效时间" th:value="${signingValidPeriod}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约性质:</label>
			
 
				+                            <label>合约性质:</label>
			
 
				                         <input name="contractNature" placeholder="合约性质" th:value="${contractNature}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否配置药品维系:</label>
			
 
				+                            <label>是否配置药品维系:</label>
			
 
				                         <input name="isDrugMaintenanceConfigured" placeholder="是否配置药品维系" th:value="${isDrugMaintenanceConfigured}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>参与人次:</label>
			
 
				+                            <label>参与人次:</label>
			
 
				                         <input name="participationCount" placeholder="参与人次" th:value="${participationCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>核销人次:</label>
			
 
				+                            <label>核销人次:</label>
			
 
				                         <input name="verificationCount" placeholder="核销人次" th:value="${verificationCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyPthyContracttemplateinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyPthyContracttemplateinfoList.html
@@ -7,86 +7,60 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglGyhyPthyContracttemplateinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                合约性质:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				-                            </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li>
			
 
				-                                商品名称:<input type="text" class="styled-input" name="startTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品编码:<input type="text" class="styled-input" name="endTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                删除合约:<input type="text" class="styled-input" name="signingStartTime" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                </div>
			
 
				+                <form id="SJkglGyhyPthyContracttemplateinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>主题: </label>
			
 
				+                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>合约性质: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>合约分类: </label>
			
 
				+                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="startTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品编码: </label>
			
 
				+                            <input type="text" class="styled-input" name="endTime" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>删除合约: </label>
			
 
				+                            <input type="text" class="styled-input" name="signingStartTime" autocomplete="off"/>
			
 
				+                            </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyPthyContracttemplateinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyPthyContracttemplateinfoPageEdit.html
@@ -13,55 +13,55 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>主题:</label>
			
 
				+                            <label>主题:</label>
			
 
				                         <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约分类:</label>
			
 
				+                            <label>合约分类:</label>
			
 
				                         <input name="contractCategory" placeholder="合约分类" th:value="${contractCategory}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>合约性质:</label>
			
 
				+                            <label>合约性质:</label>
			
 
				                         <input name="contractNature" placeholder="合约性质" th:value="${contractNature}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开始时间:</label>
			
 
				+                            <label>开始时间:</label>
			
 
				                         <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>结束时间:</label>
			
 
				+                            <label>结束时间:</label>
			
 
				                         <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>签约开始时间:</label>
			
 
				+                            <label>签约开始时间:</label>
			
 
				                         <input name="signingStartTime" placeholder="签约开始时间" th:value="${signingStartTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>签约结束时间:</label>
			
 
				+                            <label>签约结束时间:</label>
			
 
				                         <input name="signingEndTime" placeholder="签约结束时间" th:value="${signingEndTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>投放状态:</label>
			
 
				+                            <label>投放状态:</label>
			
 
				                         <input name="tfStatus" placeholder="投放状态" th:value="${tfStatus}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>投放连锁:</label>
			
 
				+                            <label>投放连锁:</label>
			
 
				                         <input name="tfChain" placeholder="投放连锁" th:value="${tfChain}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>投放成功数量:</label>
			
 
				+                            <label>投放成功数量:</label>
			
 
				                         <input name="successfulDeployments" placeholder="投放成功数量" th:value="${successfulDeployments}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>启用连锁数量:</label>
			
 
				+                            <label>启用连锁数量:</label>
			
 
				                         <input name="enabledChains" placeholder="启用连锁数量" th:value="${enabledChains}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyYjtjActivityinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyYjtjActivityinfoList.html
@@ -7,66 +7,40 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglGyhyYjtjActivityinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-
			
 
				-                            <li>
			
 
				-                                主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				-                            </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SJkglGyhyYjtjActivityinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>主题: </label>
			
 
				+                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglGyhyYjtjActivityinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglGyhyYjtjActivityinfoPageEdit.html
@@ -13,35 +13,35 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>主题:</label>
			
 
				+                            <label>主题:</label>
			
 
				                         <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>开始时间:</label>
			
 
				+                            <label>开始时间:</label>
			
 
				                         <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>结束时间:</label>
			
 
				+                            <label>结束时间:</label>
			
 
				                         <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>使用合约:</label>
			
 
				+                            <label>使用合约:</label>
			
 
				                         <input name="usedContract" placeholder="使用合约" th:value="${usedContract}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>邀请人数:</label>
			
 
				+                            <label>邀请人数:</label>
			
 
				                         <input name="invitedCount" placeholder="邀请人数" th:value="${invitedCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>成功人数:</label>
			
 
				+                            <label>成功人数:</label>
			
 
				                         <input name="successCount" placeholder="成功人数" th:value="${successCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglMbglQyglBenefitinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglMbglQyglBenefitinfoList.html
@@ -7,66 +7,40 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglMbglQyglBenefitinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-
			
 
				-                            <li>
			
 
				-                                权益主题:<input type="text" class="styled-input" name="benefitSubject" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				-                            </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SJkglMbglQyglBenefitinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>权益主题: </label>
			
 
				+                            <input type="text" class="styled-input" name="benefitSubject" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglMbglQyglBenefitinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglMbglQyglBenefitinfoPageEdit.html
@@ -13,23 +13,23 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>权益主题:</label>
			
 
				+                            <label>权益主题:</label>
			
 
				                         <input name="benefitSubject" placeholder="权益主题" th:value="${benefitSubject}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>疾病标签:</label>
			
 
				+                            <label>疾病标签:</label>
			
 
				                         <input name="diseaseTag" placeholder="疾病标签" th:value="${diseaseTag}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>包含权益分类:</label>
			
 
				+                            <label>包含权益分类:</label>
			
 
				                         <input name="includedBenefitCategory" placeholder="包含权益分类" th:value="${includedBenefitCategory}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglMxbZdyFieldconfigList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglMxbZdyFieldconfigList.html
@@ -7,77 +7,55 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <!--<div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglMxbZdyFieldconfig-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                字段名称:<input type="text" class="styled-input" name="fieldName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                是否启用:<input type="text" class="styled-input" name="isEnabled" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                是否必填:<input type="text" class="styled-input" name="isMandatory" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                单位:<input type="text" class="styled-input" name="unit" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                字段长度:<input type="text" class="styled-input" name="fieldLength" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                录入形式:<input type="text" class="styled-input" name="entryForm" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                启用位置:<input type="text" class="styled-input" name="enableLocation" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                分组名称:<input type="text" class="styled-input" name="groupName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                修改选项值:<input type="text" class="styled-input" name="modificationOptions" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <form id="SJkglMxbZdyFieldconfig-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>字段名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="fieldName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>是否启用: </label>
			
 
				+                            <input type="text" class="styled-input" name="isEnabled" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>是否必填: </label>
			
 
				+                            <input type="text" class="styled-input" name="isMandatory" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>单位: </label>
			
 
				+                            <input type="text" class="styled-input" name="unit" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>字段长度: </label>
			
 
				+                            <input type="text" class="styled-input" name="fieldLength" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>录入形式: </label>
			
 
				+                            <input type="text" class="styled-input" name="entryForm" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>启用位置: </label>
			
 
				+                            <input type="text" class="styled-input" name="enableLocation" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>分组名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="groupName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>修改选项值: </label>
			
 
				+                            <input type="text" class="styled-input" name="modificationOptions" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglMxbZdyFieldconfigPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglMxbZdyFieldconfigPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>字段名称:</label>
			
 
				+                            <label>字段名称:</label>
			
 
				                         <input name="fieldName" placeholder="字段名称" th:value="${fieldName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否启用:</label>
			
 
				+                            <label>是否启用:</label>
			
 
				                         <input name="isEnabled" placeholder="是否启用" th:value="${isEnabled}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否必填:</label>
			
 
				+                            <label>是否必填:</label>
			
 
				                         <input name="isMandatory" placeholder="是否必填" th:value="${isMandatory}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>单位:</label>
			
 
				+                            <label>单位:</label>
			
 
				                         <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>字段长度:</label>
			
 
				+                            <label>字段长度:</label>
			
 
				                         <input name="fieldLength" placeholder="字段长度" th:value="${fieldLength}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>录入形式:</label>
			
 
				+                            <label>录入形式:</label>
			
 
				                         <input name="entryForm" placeholder="录入形式" th:value="${entryForm}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>启用位置:</label>
			
 
				+                            <label>启用位置:</label>
			
 
				                         <input name="enableLocation" placeholder="启用位置" th:value="${enableLocation}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>分组名称:</label>
			
 
				+                            <label>分组名称:</label>
			
 
				                         <input name="groupName" placeholder="分组名称" th:value="${groupName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>修改选项值:</label>
			
 
				+                            <label>修改选项值:</label>
			
 
				                         <input name="modificationOptions" placeholder="修改选项值" th:value="${modificationOptions}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglRegistrationinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglRegistrationinfoList.html
@@ -7,69 +7,48 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglRegistrationinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-
			
 
				-                            <li>
			
 
				-                                主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                登记类型:<input type="text" class="styled-input" name="registrationType" autocomplete="off"/>
			
 
				-                            </li>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SJkglRegistrationinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>主题: </label>
			
 
				+                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态: </label>
			
 
				+                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>登记类型: </label>
			
 
				+                            <input type="text" class="styled-input" name="registrationType" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                             <!--<li>
			
 
				-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				+                                创建日期: </label>
			
 
				+                            <input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
			
 
				                             </li>-->
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglRegistrationinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglRegistrationinfoPageEdit.html
@@ -13,27 +13,27 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>主题:</label>
			
 
				+                            <label>主题:</label>
			
 
				                         <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>登记类型:</label>
			
 
				+                            <label>登记类型:</label>
			
 
				                         <input name="registrationType" placeholder="登记类型" th:value="${registrationType}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否强管控:</label>
			
 
				+                            <label>是否强管控:</label>
			
 
				                         <input name="isStrictControl" placeholder="是否强管控" th:value="${isStrictControl}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>登记次数:</label>
			
 
				+                            <label>登记次数:</label>
			
 
				                         <input name="registrationCount" placeholder="登记次数" th:value="${registrationCount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglYpwxServiceprojectinfoList.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglYpwxServiceprojectinfoList.html
@@ -7,89 +7,61 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SJkglYpwxServiceprojectinfo-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                药品名:<input type="text" class="styled-input" placeholder="请输入药品名称" name="includedMedicines" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <label>状态</label>
			
 
				-                                <select name="status"  class="styled-input">
			
 
				-                                    <option value="">全部</option>
			
 
				-                                    <option value="停用">停用</option>
			
 
				-                                    <option value="进行中">进行中</option>
			
 
				-                                    <option value="未开启">未开启</option>
			
 
				-                                </select>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                <label>数据来源</label>
			
 
				-                                <select name="dataSource"  class="styled-input">
			
 
				-                                    <option value="">全部</option>
			
 
				-                                    <option value="平台投放">平台投放</option>
			
 
				-                                    <option value="企业创建">企业创建</option>
			
 
				-                                </select>
			
 
				-                            </li>
			
 
				-                            <li class="select-time">
			
 
				-                                <label>创建日期:</label>
			
 
				-                                <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
			
 
				-                                <span>-</span>
			
 
				-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                            </li>
			
 
				-
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				                     </div>
			
 
				-                    <div class="select-list">
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                <label style="width: auto">是否配置短信模板</label>
			
 
				-                                <select name="isSmsTemplateConfigured"  class="styled-input"  style="width: 150px">
			
 
				-                                    <option value="">全部</option>
			
 
				-                                    <option value="是">是</option>
			
 
				-                                    <option value="否">否</option>
			
 
				-                                </select>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                </div>
			
 
				+                <form id="SJkglYpwxServiceprojectinfo-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>药品名: </label>
			
 
				+                            <input type="text" class="styled-input" placeholder="请输入药品名称" name="includedMedicines" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>状态</label>
			
 
				+                            <select name="status"  class="styled-input">
			
 
				+                                <option value="">全部</option>
			
 
				+                                <option value="停用">停用</option>
			
 
				+                                <option value="进行中">进行中</option>
			
 
				+                                <option value="未开启">未开启</option>
			
 
				+                            </select>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>数据来源</label>
			
 
				+                            <select name="dataSource"  class="styled-input">
			
 
				+                                <option value="">全部</option>
			
 
				+                                <option value="平台投放">平台投放</option>
			
 
				+                                <option value="企业创建">企业创建</option>
			
 
				+                            </select>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group select-time">
			
 
				+                            <label for="startTime">创建日期:</label>
			
 
				+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
			
 
				+                            <span>-</span>
			
 
				+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>是否配置短信模板</label>
			
 
				+                            <select name="isSmsTemplateConfigured"  class="styled-input"  style="width: 150px">
			
 
				+                                <option value="">全部</option>
			
 
				+                                <option value="是">是</option>
			
 
				+                                <option value="否">否</option>
			
 
				+                            </select>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/jkgl/SJkglYpwxServiceprojectinfoPageEdit.html
+++ b/health-admin/src/main/resources/templates/jkgl/SJkglYpwxServiceprojectinfoPageEdit.html
@@ -13,39 +13,39 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>创建日期:</label>
			
 
				+                            <label>创建日期:</label>
			
 
				                         <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>主题:</label>
			
 
				+                            <label>主题:</label>
			
 
				                         <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>包含药品:</label>
			
 
				+                            <label>包含药品:</label>
			
 
				                         <input name="includedMedicines" placeholder="包含药品" th:value="${includedMedicines}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>维系模式:</label>
			
 
				+                            <label>维系模式:</label>
			
 
				                         <input name="maintenanceMode" placeholder="维系模式" th:value="${maintenanceMode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务期数:</label>
			
 
				+                            <label>服务期数:</label>
			
 
				                         <input name="servicePeriods" placeholder="服务期数" th:value="${servicePeriods}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>状态:</label>
			
 
				+                            <label>状态:</label>
			
 
				                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>服务人数:</label>
			
 
				+                            <label>服务人数:</label>
			
 
				                         <input name="servedPeople" placeholder="服务人数" th:value="${servedPeople}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>是否配置短信模板:</label>
			
 
				+                            <label>是否配置短信模板:</label>
			
 
				                         <input name="isSmsTemplateConfigured" placeholder="是否配置短信模板" th:value="${isSmsTemplateConfigured}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>数据来源:</label>
			
 
				+                            <label>数据来源:</label>
			
 
				                         <input name="dataSource" placeholder="数据来源" th:value="${dataSource}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>
			
--- a/health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationList.html
+++ b/health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationList.html
@@ -7,170 +7,186 @@
 
				     <th:block th:include="include :: layout-latest-css" />
			
 
				     <th:block th:include="include :: ztree-css" />
			
 
				 </head>
			
 
				-<style>
			
 
				-    /* 设置 ul 的基本样式 */
			
 
				-    ul {
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(5, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul{
			
 
				-        list-style-type: none; /* 去掉项目符号 */
			
 
				-        padding: 0; /* 去掉默认的内边距 */
			
 
				-        display: grid; /* 使用网格布局 */
			
 
				-        grid-template-columns: repeat(4, 1fr); /* 设置三列 */
			
 
				-    }
			
 
				-    ul-list ul li{
			
 
				-        /*padding: 10px;*/ /* 内边距 */
			
 
				-        text-align: left; /* 文本居中 */
			
 
				-    }
			
 
				-
			
 
				-    /* 设置 li 的基本样式 */
			
 
				-    li {
			
 
				-        /*background-color: lightblue; *//* 背景颜色 */
			
 
				-        /*padding: 1px; !* 内边距 *!*/
			
 
				-        text-align: right; /* 文本居中 */
			
 
				-    }
			
 
				-</style>
			
 
				 
			
 
				 <body class="gray-bg">
			
 
				 <div class="ui-layout-center">
			
 
				     <div class="container-div">
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse" >
			
 
				-                <form id="SKcBbInventoryvariation-form">
			
 
				-                    <input type="hidden" id="deptId" name="deptId">
			
 
				-                    <input type="hidden" id="parentId" name="parentId">
			
 
				-                    <div class="select-list" >
			
 
				-                        <ul>
			
 
				-                            <li>
			
 
				-                                序号:<input type="text" class="styled-input" name="sequenceNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期间:<input type="text" class="styled-input" name="period" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                规格:<input type="text" class="styled-input" name="specification" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                单位:<input type="text" class="styled-input" name="unit" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                生产企业:<input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                剂型:<input type="text" class="styled-input" name="dosageForm" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                批号:<input type="text" class="styled-input" name="batchNumber" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                批次:<input type="text" class="styled-input" name="batch" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期初库存数量:<input type="text" class="styled-input" name="initialStockQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期初库存成本金额/元:<input type="text" class="styled-input" name="initialStockCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                大仓配送数量:<input type="text" class="styled-input" name="warehouseDeliveryQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                大仓配送成本金额/元:<input type="text" class="styled-input" name="warehouseDeliveryCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                调拨调入配送数量:<input type="text" class="styled-input" name="transferInQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                调拨调入配送成本金额/元:<input type="text" class="styled-input" name="transferInCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店采收货数量:<input type="text" class="styled-input" name="storeReceiptQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店采收货成本金额:<input type="text" class="styled-input" name="storeReceiptCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店采退货数量:<input type="text" class="styled-input" name="storeReturnQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                店采退货金额/元:<input type="text" class="styled-input" name="storeReturnAmount" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                调拨调出数量:<input type="text" class="styled-input" name="transferOutQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                调拨调出成本金额/元:<input type="text" class="styled-input" name="transferOutCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店退仓数量:<input type="text" class="styled-input" name="storeReturnWarehouseQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                门店退仓成本金额/元:<input type="text" class="styled-input" name="storeReturnWarehouseCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线下销售数量:<input type="text" class="styled-input" name="offlineSalesQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线下销售成本金额/元:<input type="text" class="styled-input" name="offlineSalesCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线下销售退货数量:<input type="text" class="styled-input" name="offlineSalesReturnQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线下销售退货金额/元:<input type="text" class="styled-input" name="offlineSalesReturnAmount" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线上销售数量:<input type="text" class="styled-input" name="onlineSalesQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线上销售成本金额/元:<input type="text" class="styled-input" name="onlineSalesCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线上销售退货数量:<input type="text" class="styled-input" name="onlineSalesReturnQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                线上销售退货金额/元:<input type="text" class="styled-input" name="onlineSalesReturnAmount" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                报损数量:<input type="text" class="styled-input" name="lossQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                报损成本金额:<input type="text" class="styled-input" name="lossCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                报溢数量:<input type="text" class="styled-input" name="gainQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                报溢成本金额/元:<input type="text" class="styled-input" name="gainCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期末库存数量:<input type="text" class="styled-input" name="finalStockQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期末库存成本金额/元:<input type="text" class="styled-input" name="finalStockCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期初导入库存数量:<input type="text" class="styled-input" name="initialImportQuantity" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li>
			
 
				-                                期初导入库存成本金额/元:<input type="text" class="styled-input" name="initialImportCost" autocomplete="off"/>
			
 
				-                            </li>
			
 
				-                            <li style="text-align: center">
			
 
				-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				-                            </li>
			
 
				-                        </ul>
			
 
				+                <div class="query-condition-container">
			
 
				+                    <h4 class="query-condition-title">查询条件</h4>
			
 
				+                    <div class="query-buttons">
			
 
				+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
			
 
				+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
			
 
				+                    </div>
			
 
				+                </div>
			
 
				+                <form id="SKcBbInventoryvariation-form" class="customize-search-form">
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                    </div>
			
 
				+                    <div class="customize-form-group-container">
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>序号: </label>
			
 
				+                            <input type="text" class="styled-input" name="sequenceNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期间: </label>
			
 
				+                            <input type="text" class="styled-input" name="period" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品编码: </label>
			
 
				+                            <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>商品名称: </label>
			
 
				+                            <input type="text" class="styled-input" name="productName" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>规格: </label>
			
 
				+                            <input type="text" class="styled-input" name="specification" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>单位: </label>
			
 
				+                            <input type="text" class="styled-input" name="unit" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>生产企业: </label>
			
 
				+                            <input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>剂型: </label>
			
 
				+                            <input type="text" class="styled-input" name="dosageForm" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>批号: </label>
			
 
				+                            <input type="text" class="styled-input" name="batchNumber" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>批次: </label>
			
 
				+                            <input type="text" class="styled-input" name="batch" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期初库存数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="initialStockQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期初库存成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="initialStockCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>大仓配送数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="warehouseDeliveryQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>大仓配送成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="warehouseDeliveryCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>调拨调入配送数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="transferInQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>调拨调入配送成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="transferInCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店采收货数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReceiptQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店采收货成本金额: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReceiptCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店采退货数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReturnQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>店采退货金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReturnAmount" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>调拨调出数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="transferOutQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>调拨调出成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="transferOutCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店退仓数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReturnWarehouseQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>门店退仓成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="storeReturnWarehouseCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线下销售数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="offlineSalesQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线下销售成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="offlineSalesCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线下销售退货数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="offlineSalesReturnQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线下销售退货金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="offlineSalesReturnAmount" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线上销售数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="onlineSalesQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线上销售成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="onlineSalesCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线上销售退货数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="onlineSalesReturnQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>线上销售退货金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="onlineSalesReturnAmount" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>报损数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="lossQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>报损成本金额: </label>
			
 
				+                            <input type="text" class="styled-input" name="lossCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>报溢数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="gainQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>报溢成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="gainCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期末库存数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="finalStockQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期末库存成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="finalStockCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期初导入库存数量: </label>
			
 
				+                            <input type="text" class="styled-input" name="initialImportQuantity" autocomplete="off"/>
			
 
				+                        </div>
			
 
				+                        <div class="customize-form-group">
			
 
				+                            <label>期初导入库存成本金额/元: </label>
			
 
				+                            <input type="text" class="styled-input" name="initialImportCost" autocomplete="off"/>
			
 
				+                        </div>
			
 
				                     </div>
			
 
				-
			
 
				                 </form>
			
 
				             </div>
			
 
				 
			
--- a/health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationPageEdit.html
+++ b/health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationPageEdit.html
@@ -13,163 +13,163 @@
 
				         <div class="customize-form-group-container">
			
 
				             <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>序号:</label>
			
 
				+                            <label>序号:</label>
			
 
				                         <input name="sequenceNumber" placeholder="序号" th:value="${sequenceNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期间:</label>
			
 
				+                            <label>期间:</label>
			
 
				                         <input name="period" placeholder="期间" th:value="${period}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品编码:</label>
			
 
				+                            <label>商品编码:</label>
			
 
				                         <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>商品名称:</label>
			
 
				+                            <label>商品名称:</label>
			
 
				                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>规格:</label>
			
 
				+                            <label>规格:</label>
			
 
				                         <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>单位:</label>
			
 
				+                            <label>单位:</label>
			
 
				                         <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>生产企业:</label>
			
 
				+                            <label>生产企业:</label>
			
 
				                         <input name="manufacturer" placeholder="生产企业" th:value="${manufacturer}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>剂型:</label>
			
 
				+                            <label>剂型:</label>
			
 
				                         <input name="dosageForm" placeholder="剂型" th:value="${dosageForm}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>批号:</label>
			
 
				+                            <label>批号:</label>
			
 
				                         <input name="batchNumber" placeholder="批号" th:value="${batchNumber}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>批次:</label>
			
 
				+                            <label>批次:</label>
			
 
				                         <input name="batch" placeholder="批次" th:value="${batch}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期初库存数量:</label>
			
 
				+                            <label>期初库存数量:</label>
			
 
				                         <input name="initialStockQuantity" placeholder="期初库存数量" th:value="${initialStockQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期初库存成本金额/元:</label>
			
 
				+                            <label>期初库存成本金额/元:</label>
			
 
				                         <input name="initialStockCost" placeholder="期初库存成本金额/元" th:value="${initialStockCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>大仓配送数量:</label>
			
 
				+                            <label>大仓配送数量:</label>
			
 
				                         <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量" th:value="${warehouseDeliveryQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>大仓配送成本金额/元:</label>
			
 
				+                            <label>大仓配送成本金额/元:</label>
			
 
				                         <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元" th:value="${warehouseDeliveryCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调拨调入配送数量:</label>
			
 
				+                            <label>调拨调入配送数量:</label>
			
 
				                         <input name="transferInQuantity" placeholder="调拨调入配送数量" th:value="${transferInQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调拨调入配送成本金额/元:</label>
			
 
				+                            <label>调拨调入配送成本金额/元:</label>
			
 
				                         <input name="transferInCost" placeholder="调拨调入配送成本金额/元" th:value="${transferInCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店采收货数量:</label>
			
 
				+                            <label>店采收货数量:</label>
			
 
				                         <input name="storeReceiptQuantity" placeholder="店采收货数量" th:value="${storeReceiptQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店采收货成本金额:</label>
			
 
				+                            <label>店采收货成本金额:</label>
			
 
				                         <input name="storeReceiptCost" placeholder="店采收货成本金额" th:value="${storeReceiptCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店采退货数量:</label>
			
 
				+                            <label>店采退货数量:</label>
			
 
				                         <input name="storeReturnQuantity" placeholder="店采退货数量" th:value="${storeReturnQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>店采退货金额/元:</label>
			
 
				+                            <label>店采退货金额/元:</label>
			
 
				                         <input name="storeReturnAmount" placeholder="店采退货金额/元" th:value="${storeReturnAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调拨调出数量:</label>
			
 
				+                            <label>调拨调出数量:</label>
			
 
				                         <input name="transferOutQuantity" placeholder="调拨调出数量" th:value="${transferOutQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>调拨调出成本金额/元:</label>
			
 
				+                            <label>调拨调出成本金额/元:</label>
			
 
				                         <input name="transferOutCost" placeholder="调拨调出成本金额/元" th:value="${transferOutCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店退仓数量:</label>
			
 
				+                            <label>门店退仓数量:</label>
			
 
				                         <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量" th:value="${storeReturnWarehouseQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>门店退仓成本金额/元:</label>
			
 
				+                            <label>门店退仓成本金额/元:</label>
			
 
				                         <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元" th:value="${storeReturnWarehouseCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线下销售数量:</label>
			
 
				+                            <label>线下销售数量:</label>
			
 
				                         <input name="offlineSalesQuantity" placeholder="线下销售数量" th:value="${offlineSalesQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线下销售成本金额/元:</label>
			
 
				+                            <label>线下销售成本金额/元:</label>
			
 
				                         <input name="offlineSalesCost" placeholder="线下销售成本金额/元" th:value="${offlineSalesCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线下销售退货数量:</label>
			
 
				+                            <label>线下销售退货数量:</label>
			
 
				                         <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量" th:value="${offlineSalesReturnQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线下销售退货金额/元:</label>
			
 
				+                            <label>线下销售退货金额/元:</label>
			
 
				                         <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元" th:value="${offlineSalesReturnAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线上销售数量:</label>
			
 
				+                            <label>线上销售数量:</label>
			
 
				                         <input name="onlineSalesQuantity" placeholder="线上销售数量" th:value="${onlineSalesQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线上销售成本金额/元:</label>
			
 
				+                            <label>线上销售成本金额/元:</label>
			
 
				                         <input name="onlineSalesCost" placeholder="线上销售成本金额/元" th:value="${onlineSalesCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线上销售退货数量:</label>
			
 
				+                            <label>线上销售退货数量:</label>
			
 
				                         <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量" th:value="${onlineSalesReturnQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>线上销售退货金额/元:</label>
			
 
				+                            <label>线上销售退货金额/元:</label>
			
 
				                         <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元" th:value="${onlineSalesReturnAmount}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>报损数量:</label>
			
 
				+                            <label>报损数量:</label>
			
 
				                         <input name="lossQuantity" placeholder="报损数量" th:value="${lossQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>报损成本金额:</label>
			
 
				+                            <label>报损成本金额:</label>
			
 
				                         <input name="lossCost" placeholder="报损成本金额" th:value="${lossCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>报溢数量:</label>
			
 
				+                            <label>报溢数量:</label>
			
 
				                         <input name="gainQuantity" placeholder="报溢数量" th:value="${gainQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>报溢成本金额/元:</label>
			
 
				+                            <label>报溢成本金额/元:</label>
			
 
				                         <input name="gainCost" placeholder="报溢成本金额/元" th:value="${gainCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期末库存数量:</label>
			
 
				+                            <label>期末库存数量:</label>
			
 
				                         <input name="finalStockQuantity" placeholder="期末库存数量" th:value="${finalStockQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期末库存成本金额/元:</label>
			
 
				+                            <label>期末库存成本金额/元:</label>
			
 
				                         <input name="finalStockCost" placeholder="期末库存成本金额/元" th:value="${finalStockCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期初导入库存数量:</label>
			
 
				+                            <label>期初导入库存数量:</label>
			
 
				                         <input name="initialImportQuantity" placeholder="期初导入库存数量" th:value="${initialImportQuantity}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				                     <div class="customize-form-group">
			
 
				-                        <label>期初导入库存成本金额/元:</label>
			
 
				+                            <label>期初导入库存成本金额/元:</label>
			
 
				                         <input name="initialImportCost" placeholder="期初导入库存成本金额/元" th:value="${initialImportCost}" class="styled-input" type="text">
			
 
				                     </div>
			
 
				         </div>