update 修改页面查询条件显示

health-admin/src/main/java/com/bzd/web/controller/gjgzt/SGjgztHealthplaninfoController.java

@@ -18,7 +18,7 @@ import java.util.List;
 
 /**
 *
-* 健康报告列表 前端控制器Controller
+* 管家工作台 前端控制器Controller
 * @author LiXiangFei
 * @since 2024-10-15
 */
@@ -33,7 +33,7 @@ public class SGjgztHealthplaninfoController extends BaseController {
     private SGjgztHealthplaninfoService sGjgztHealthplaninfoService;
 
     /**
-    * 健康报告列表 新增页面跳转
+    * 管家工作台 新增页面跳转
     *
     * @return
     */
@@ -44,11 +44,11 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表 新增
+    * 管家工作台 新增
     *
     * @return
     */
-    @Log(title = "健康报告列表新增", businessType = BusinessType.INSERT)
+    @Log(title = "管家工作台新增", businessType = BusinessType.INSERT)
     @PostMapping("/sGjgztHealthplaninfoAdd")
     @ResponseBody
     public AjaxResult addSave() throws Exception {
@@ -68,7 +68,7 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表 查询页面跳转
+    * 管家工作台 查询页面跳转
     *
     * @return
     */
@@ -79,7 +79,7 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表 数据查询
+    * 管家工作台 数据查询
     *
     * @return
     * @throws Exception
@@ -95,13 +95,13 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表 数据删除 根据id
+    * 管家工作台 数据删除 根据id
     *
     * @return
     * @throws Exception
     */
     @RequiresPermissions("gjgzt:gj:remove")
-    @Log(title = "健康报告列表删除", businessType = BusinessType.DELETE)
+    @Log(title = "管家工作台删除", businessType = BusinessType.DELETE)
     @PostMapping("/sGjgztHealthplaninfoRemove")
     @ResponseBody
     public AjaxResult sgjgzthealthplaninfoRemove() throws Exception {
@@ -111,7 +111,7 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表 数据修改
+    * 管家工作台 数据修改
     *
     * @return
     * @throws Exception
@@ -130,10 +130,10 @@ public class SGjgztHealthplaninfoController extends BaseController {
     }
 
     /**
-    * 健康报告列表保存修改的数据
+    * 管家工作台保存修改的数据
     */
     @RequiresPermissions("gjgzt:gj:edit")
-    @Log(title = "健康报告列表修改", businessType = BusinessType.UPDATE)
+    @Log(title = "管家工作台修改", businessType = BusinessType.UPDATE)
     @PostMapping("/sGjgztHealthplaninfoEdit")
     @ResponseBody
     public AjaxResult sgjgzthealthplaninfoEditSave() throws Exception {

health-admin/src/main/java/com/bzd/web/controller/mdyy/SMdyyglMdygxxStoreemployeeinfoController.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class SMdyyglMdygxxStoreemployeeinfoController extends BaseController {
 
     // 页面跳转前缀
-    private String prefix = "mdyygl";
+    private String prefix = "mdyy";
 
     @Autowired
     private SMdyyglMdygxxStoreemployeeinfoService sMdyyglMdygxxStoreemployeeinfoService;

health-admin/src/main/java/com/bzd/web/controller/mdyy/SMdyyglMdysjqChiefmainsalesplanController.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class SMdyyglMdysjqChiefmainsalesplanController extends BaseController {
 
     // 页面跳转前缀
-    private String prefix = "mdyygl";
+    private String prefix = "mdyy";
 
     @Autowired
     private SMdyyglMdysjqChiefmainsalesplanService sMdyyglMdysjqChiefmainsalesplanService;

health-admin/src/main/java/com/bzd/web/controller/mdyy/SMdyyglMdysjqMbxsjhController.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class SMdyyglMdysjqMbxsjhController extends BaseController {
 
     // 页面跳转前缀
-    private String prefix = "mdyygl";
+    private String prefix = "mdyy";
 
     @Autowired
     private SMdyyglMdysjqMbxsjhService sMdyyglMdysjqMbxsjhService;

health-admin/src/main/java/com/bzd/web/controller/mdyy/SMdyyglMdysjqStoreweightinfoController.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class SMdyyglMdysjqStoreweightinfoController extends BaseController {
 
     // 页面跳转前缀
-    private String prefix = "mdyygl";
+    private String prefix = "mdyy";
 
     @Autowired
     private SMdyyglMdysjqStoreweightinfoService sMdyyglMdysjqStoreweightinfoService;

health-admin/src/main/java/com/bzd/web/controller/mdyy/SMdyyglMdysjqStoreweightsettingController.java

@@ -27,7 +27,7 @@ import java.util.List;
 public class SMdyyglMdysjqStoreweightsettingController extends BaseController {
 
     // 页面跳转前缀
-    private String prefix = "mdyygl";
+    private String prefix = "mdyy";
 
     @Autowired
     private SMdyyglMdysjqStoreweightsettingService sMdyyglMdysjqStoreweightsettingService;

health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordList.html

@@ -45,46 +45,16 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 销售单号:<input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 销售时间:<input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                登记时间:<input type="text" class="styled-input" name="registerTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方单号:<input type="text" class="styled-input" name="prescriptionNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                类型:<input type="text" class="styled-input" name="type" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方日期:<input type="text" class="styled-input" name="prescriptionDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                医疗机构名称:<input type="text" class="styled-input" name="medicalInstitutionName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                医生姓名:<input type="text" class="styled-input" name="doctorName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                顾客信息:<input type="text" class="styled-input" name="customerInfo" autocomplete="off"/>
-                            </li>
-                            <li>
-                                审方药师:<input type="text" class="styled-input" name="reviewPharmacist" autocomplete="off"/>
-                            </li>
-                            <li>
-                                调配员:<input type="text" class="styled-input" name="dispenser" autocomplete="off"/>
-                            </li>
-                            <li>
-                                复核员:<input type="text" class="styled-input" name="verifier" 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>

health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjList.html

@@ -45,40 +45,16 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售日期:<input type="text" class="styled-input" name="saleDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 销售单号:<input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
                             </li>
-                            <li>
-                                登记时间:<input type="text" class="styled-input" name="registerTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                顾客姓名:<input type="text" class="styled-input" name="customerName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                性别:<input type="text" class="styled-input" name="gender" autocomplete="off"/>
-                            </li>
-                            <li>
-                                身份证号:<input type="text" class="styled-input" name="idNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                联系电话:<input type="text" class="styled-input" name="contactPhone" autocomplete="off"/>
-                            </li>
-                            <li>
-                                营业员:<input type="text" class="styled-input" name="salesperson" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                药品编号:<input type="text" class="styled-input" name="medicineCode" autocomplete="off"/>
+                            <!--<li>
+                                销售时间:<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>

health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoList.html

@@ -45,53 +45,35 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                提成来源:<input type="text" class="styled-input" name="commissionSource" autocomplete="off"/>
-                            </li>
-                            <li>
-                                奖励类型:<input type="text" class="styled-input" name="rewardType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                发生时间:<input type="text" class="styled-input" name="occurrenceTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                服务包订单号:<input type="text" class="styled-input" name="servicePackageOrderNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                券核销订单号:<input type="text" class="styled-input" name="voucherRedemptionOrderNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                连锁:<input type="text" class="styled-input" name="chain" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店:<input type="text" class="styled-input" name="store" autocomplete="off"/>
+                                订单号:<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>
-                                店员ID:<input type="text" class="styled-input" name="staffID" autocomplete="off"/>
-                            </li>
-                            <li>
-                                店员姓名:<input type="text" class="styled-input" name="staffName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                合约ID:<input type="text" class="styled-input" name="contractID" autocomplete="off"/>
-                            </li>
-                            <li>
-                                合约单ID:<input type="text" class="styled-input" name="contractOrderID" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态:<input type="text" class="styled-input" name="status" 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>
+                    <div class="select-list" >
+                        <ul>
+                            <li>
+                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            </li>
+                        </ul>
+                    </div>
 
                 </form>
             </div>

health-admin/src/main/resources/templates/fwgl/SFwglServerinfoList.html

@@ -45,38 +45,30 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
+                                商品名称:<input type="text" placeholder="商品名称" class="styled-input" name="productName" autocomplete="off"/>
                             </li>
                             <li>
-                                商品ID:<input type="text" class="styled-input" name="productId" autocomplete="off"/>
+                                商品ID:<input type="text" placeholder="商品ID" class="styled-input" name="productId" autocomplete="off"/>
                             </li>
                             <li>
-                                MDM商品编码:<input type="text" class="styled-input" name="mdmProductCode" autocomplete="off"/>
+                                商品类目:<input type="text" placeholder="商品类目" class="styled-input" name="productCategory" autocomplete="off"/>
                             </li>
-                            <li>
-                                价格:<input type="text" class="styled-input" name="price" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品类型:<input type="text" class="styled-input" name="productType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                库存:<input type="text" class="styled-input" name="stock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品类目:<input type="text" class="styled-input" name="productCategory" autocomplete="off"/>
+                            <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="auditStatus" autocomplete="off"/>
+                                商品名称商品名称商:<input type="text" placeholder="商品名称" class="styled-input" name="productName" autocomplete="off"/>
                             </li>
                             <li>
-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
+                                商品ID:<input type="text" placeholder="商品ID" class="styled-input" name="productId" autocomplete="off"/>
                             </li>
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="creationTime" 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>
+                                商品类目:<input type="text" placeholder="商品类目" class="styled-input" name="productCategory" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>

health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoList.html

@@ -44,56 +44,30 @@
                     <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="productType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品企业:<input type="text" class="styled-input" name="productEnterprise" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单时间:<input type="text" class="styled-input" name="orderTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                订单金额:<input type="text" class="styled-input" name="orderAmount" autocomplete="off"/>
+                                <!--下单时间:<input type="text" class="styled-input" name="orderTime" 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="orderSource" autocomplete="off"/>
+                                订单来源:<input type="text" placeholder="请输订单来源" class="styled-input" name="orderSource" autocomplete="off"/>
                             </li>
                             <li>
-                                订单状态:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
+                                订单状态:<input type="text" placeholder="订单状态" class="styled-input" name="orderStatus" autocomplete="off"/>
                             </li>
-                            <li>
-                                下单账户:<input type="text" class="styled-input" name="orderingAccount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                用户ID:<input type="text" class="styled-input" name="userId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单手机号:<input type="text" class="styled-input" name="orderingPhone" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单门店:<input type="text" class="styled-input" name="orderingStore" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店编码:<input type="text" class="styled-input" name="storeCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                退款操作人:<input type="text" class="styled-input" name="refundOperator" autocomplete="off"/>
+                            <li> <!--订单编号/拼团编号/商品名称/手机号码搜索-->
+                                关键字:<input type="text" placeholder="订单编号/拼团编号/商品名称/手机号码搜索" class="styled-input" name="orderingAccount" autocomplete="off"/>
                             </li>
                             <li>
-                                优惠券是否已使用:<input type="text" class="styled-input" name="couponUsed" autocomplete="off"/>
+                                操作人:<input type="text" placeholder="请输操作人" class="styled-input" name="refundOperator" autocomplete="off"/>
                             </li>
                             <li>
-                                实物兑换是否已使用:<input type="text" class="styled-input" name="physicalRedemptionUsed" autocomplete="off"/>
+                                是否已使用:<input type="text" class="styled-input" name="couponUsed" autocomplete="off"/>
                             </li>
                             <li>
-                                销售渠道:<input type="text" class="styled-input" name="salesChannel" autocomplete="off"/>
+                                销售渠道:<input type="text" placeholder="请输销售渠道" class="styled-input" name="salesChannel" 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>

health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoList.html

@@ -44,42 +44,24 @@
                     <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="chain" autocomplete="off"/>
+
+
+                                <!--扫码时间:<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>
-                                服务包ID:<input type="text" class="styled-input" name="servicePackageId" autocomplete="off"/>
+                                订单编号:<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="orderTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                用户ID:<input type="text" class="styled-input" name="userId" autocomplete="off"/>
-                            </li>
-                            <li>
                                 下单手机号:<input type="text" class="styled-input" name="orderingPhone" autocomplete="off"/>
                             </li>
-                            <li>
-                                订单状态:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单门店:<input type="text" class="styled-input" name="orderingStore" autocomplete="off"/>
-                            </li>
-                            <li>
-                                扫码提成员工工号:<input type="text" class="styled-input" name="scanningStaffNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                扫码提成员工姓名:<input type="text" class="styled-input" name="scanningStaffName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                扫码时间:<input type="text" class="styled-input" name="scanningTime" 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>

health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoList.html

@@ -47,18 +47,10 @@
                             <li>
                                 服务类型编号:<input type="text" class="styled-input" name="serviceTypeNumber" autocomplete="off"/>
                             </li>
-                            <li>
-                                服务类型名称:<input type="text" class="styled-input" name="serviceTypeName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                服务类型描述:<input type="text" class="styled-input" name="serviceTypeDescription" autocomplete="off"/>
-                            </li>
-                            <li>
-                                履约方:<input type="text" class="styled-input" name="fulfillmentParty" autocomplete="off"/>
-                            </li>
-                            <li>
-                                :<input type="text" class="styled-input" name="create_time" autocomplete="off"/>
+                            <li> <!-- 字段需要添加-->
+                                状态:<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>
@@ -146,7 +138,7 @@
                     { field: 'serviceTypeName', title: '服务类型名称', align: 'center' },
                     { field: 'serviceTypeDescription', title: '服务类型描述', align: 'center' },
                     { field: 'fulfillmentParty', title: '履约方', align: 'center' },
-                    { field: 'create_time', title: '', align: 'center' },
+                    { field: 'create_time', title: '创建时间', align: 'center' },
 
                 {
                     title: '操作',

health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoList.html

@@ -30,7 +30,7 @@
     li {
         /*background-color: lightblue; *//* 背景颜色 */
         /*padding: 1px; !* 内边距 *!*/
-        text-align: right; /* 文本居中 */
+        text-align: left; /* 文本居中 */
     }
 </style>
 
@@ -45,39 +45,26 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                健康方案ID:<input type="text" class="styled-input" name="healthPlanId" autocomplete="off"/>
+                                用户姓名：<input type="text" class="styled-input" name="userName" autocomplete="off"/>
                             </li>
                             <li>
-                                健康方案名称:<input type="text" class="styled-input" name="healthPlanName" autocomplete="off"/>
+                                填写人：<input type="text" class="styled-input" name="filler" autocomplete="off"/>
                             </li>
                             <li>
-                                连锁用户ID:<input type="text" class="styled-input" name="chainUserId" autocomplete="off"/>
+                                填写来源：<input type="text" class="styled-input" name="fillSource" autocomplete="off"/>
                             </li>
-                            <li>
-                                用户姓名:<input type="text" class="styled-input" name="userName" 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="filler" autocomplete="off"/>
-                            </li>
-                            <li>
-                                填写人手机号:<input type="text" class="styled-input" name="fillerPhoneNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                填写来源:<input type="text" class="styled-input" name="fillSource" autocomplete="off"/>
-                            </li>
-                            <li>
-                                连锁名称:<input type="text" class="styled-input" name="chainName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                报告生成时间:<input type="text" class="styled-input" name="reportGenerationTime" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
+                            <li style="text-align: right">
                                 <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>
-
                 </form>
             </div>
 
@@ -105,7 +92,6 @@
         </div>
     </div>
 </div>
-
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: layout-latest-js" />
 <th:block th:include="include :: ztree-js" />
@@ -130,6 +116,9 @@
         queryArchivesList();
     });
 
+
+
+
     function queryArchivesList() {
         var options = {
             url: prefix + "/sGjgztHealthplaninfoList",
@@ -154,15 +143,15 @@
                 checkbox: true
             },
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
-                    { field: 'healthPlanId', title: '健康方案ID', align: 'center' },
-                    { field: 'healthPlanName', title: '健康方案名称', align: 'center' },
-                    { field: 'chainUserId', title: '连锁用户ID', align: 'center' },
-                    { field: 'userName', title: '用户姓名', align: 'center' },
-                    { field: 'filler', title: '填写人', align: 'center' },
-                    { field: 'fillerPhoneNumber', title: '填写人手机号', align: 'center' },
-                    { field: 'fillSource', title: '填写来源', align: 'center' },
-                    { field: 'chainName', title: '连锁名称', align: 'center' },
-                    { field: 'reportGenerationTime', title: '报告生成时间', align: 'center' },
+                { field: 'healthPlanId', title: '健康方案ID', align: 'center' },
+                { field: 'healthPlanName', title: '健康方案名称', align: 'center' },
+                { field: 'chainUserId', title: '连锁用户ID', align: 'center' },
+                { field: 'userName', title: '用户姓名', align: 'center' },
+                { field: 'filler', title: '填写人', align: 'center' },
+                { field: 'fillerPhoneNumber', title: '填写人手机号', align: 'center' },
+                { field: 'fillSource', title: '填写来源', align: 'center' },
+                { field: 'chainName', title: '连锁名称', align: 'center' },
+                { field: 'reportGenerationTime', title: '报告生成时间', align: 'center' },
 
                 {
                     title: '操作',

health-admin/src/main/resources/templates/gkdggl/SGkdgglCustomerOrderAuditList.html

@@ -44,32 +44,24 @@
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updateTime" autocomplete="off"/>
-                            </li>
+
                             <li>
                                 订购单号:<input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
                             </li>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 收货人手机号:<input type="text" class="styled-input" name="recipientPhone" autocomplete="off"/>
                             </li>
-                            <li>
-                                收货人姓名:<input type="text" class="styled-input" name="recipientName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                1待审核, 2审核, 3驳回:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
+                            <li><!--1待审核, 2审核, 3驳回:-->
+                                订单状态：<input type="text"  placeholder="待审核, 审核, 驳回" class="styled-input" name="orderStatus" autocomplete="off"/>
                             </li>
-                            <li>
-                                操作人:<input type="text" class="styled-input" name="operator" autocomplete="off"/>
-                            </li>
-                            <li>
-                                定金支付状态：1支付中，2未支付，3支付完成:<input type="text" class="styled-input" name="depositPaymentStatus" autocomplete="off"/>
+                            <!--<li>
+                                更新时间:<input type="text" class="styled-input" name="updateTime" 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>

health-admin/src/main/resources/templates/jggl/SJgglPriceadjustmentsheetList.html

@@ -45,44 +45,37 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                调价单号:<input type="text" class="styled-input" name="adjustmentSheetNo" autocomplete="off"/>
-                            </li>
-                            <li>
-                                调价单名称:<input type="text" class="styled-input" name="adjustmentSheetName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                调价类型:<input type="text" class="styled-input" name="adjustmentType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                调价原因:<input type="text" class="styled-input" name="adjustmentReason" autocomplete="off"/>
-                            </li>
-                            <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="chainName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
+                                调价单号:<input type="text" class="styled-input" name="adjustmentSheetNo" autocomplete="off"/>
                             </li>
-                            <li>
-                                门店编码:<input type="text" class="styled-input" name="storeCode" autocomplete="off"/>
+
+                            <!--  生效时间:<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>
-                                要求生效时间:<input type="text" class="styled-input" name="effectiveTime" autocomplete="off"/>
+
+
+                            <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="notificationTime" autocomplete="off"/>
+                                连锁名称:<input type="text" class="styled-input" name="chainName" autocomplete="off"/>
                             </li>
                             <li>
-                                制单人:<input type="text" class="styled-input" name="createdUser" 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>
+                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>

health-admin/src/main/resources/templates/jkgl/SJkglCommissionrewardinfoList.html

@@ -45,43 +45,20 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                提成来源:<input type="text" class="styled-input" name="commissionSource" autocomplete="off"/>
-                            </li>
-                            <li>
-                                奖励类型:<input type="text" class="styled-input" name="rewardType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                发生时间:<input type="text" class="styled-input" name="occurrenceTime" autocomplete="off"/>
-                            </li>
-                            <li>
                                 订单号:<input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
                             </li>
-                            <li>
-                                连锁:<input type="text" class="styled-input" name="chain" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店:<input type="text" class="styled-input" name="store" 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>
-                                店员ID:<input type="text" class="styled-input" name="staffId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                店员姓名:<input type="text" class="styled-input" name="staffName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                合约ID:<input type="text" class="styled-input" name="contractId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                合约单ID:<input type="text" class="styled-input" name="contractOrderNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态:<input type="text" class="styled-input" name="status" 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>
@@ -89,6 +66,13 @@
                             </li>
                         </ul>
                     </div>
+                    <div class="select-list" >
+                        <ul>
+                            <li>
+                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            </li>
+                        </ul>
+                    </div>
 
                 </form>
             </div>

health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyflCategoryinfoList.html

@@ -44,18 +44,18 @@
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
-                            <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>
                                 分类名称:<input type="text" class="styled-input" name="categoryName" autocomplete="off"/>
                             </li>
-                            <li>
-                                包含合约:<input type="text" class="styled-input" name="includedContracts" autocomplete="off"/>
-                            </li>
-                            <li>
-                                配图:<input type="text" class="styled-input" name="featuredImage" 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>

health-admin/src/main/resources/templates/jkgl/SJkglGyhyHyglContractinfoList.html

@@ -45,38 +45,49 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
                             </li>
                             <li>
-                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
+                                商品编码:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
                             </li>
                             <li>
-                                合约有效时间:<input type="text" class="styled-input" name="contractValidPeriod" autocomplete="off"/>
+                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
                             </li>
-                            <li>
-                                签约有效时间:<input type="text" class="styled-input" name="signingValidPeriod" autocomplete="off"/>
+                            <!--<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="status" autocomplete="off"/>
+                            <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="contractNature" autocomplete="off"/>
+                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
                             </li>
                             <li>
-                                是否配置药品维系:<input type="text" class="styled-input" name="isDrugMaintenanceConfigured" autocomplete="off"/>
+                                升级尊享:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
                             </li>
                             <li>
-                                参与人次:<input type="text" class="styled-input" name="participationCount" autocomplete="off"/>
+                                合约性质:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
                             </li>
                             <li>
-                                核销人次:<input type="text" class="styled-input" name="verificationCount" autocomplete="off"/>
+                                合约模板:<input type="text" class="styled-input" name="contractNature" 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>
+                        </ul>
+                    </div>
+                    <div class="select-list" >
+                        <ul>
+                            <li>
+                                删除合约:<input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>

health-admin/src/main/resources/templates/jkgl/SJkglGyhyPthyContracttemplateinfoList.html

@@ -45,47 +45,44 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
                             </li>
                             <li>
-                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
+                                状态:<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="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>
-                            <li>
-                                签约结束时间:<input type="text" class="styled-input" name="signingEndTime" autocomplete="off"/>
+                            <!--<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="status" autocomplete="off"/>
+
+                            <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="tfStatus" autocomplete="off"/>
+                                合约分类:<input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
                             </li>
+
                             <li>
-                                投放连锁:<input type="text" class="styled-input" name="tfChain" autocomplete="off"/>
+                                商品名称:<input type="text" class="styled-input" name="startTime" autocomplete="off"/>
                             </li>
                             <li>
-                                投放成功数量:<input type="text" class="styled-input" name="successfulDeployments" autocomplete="off"/>
+                                商品编码:<input type="text" class="styled-input" name="endTime" autocomplete="off"/>
                             </li>
                             <li>
-                                启用连锁数量:<input type="text" class="styled-input" name="enabledChains" 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>
+                                删除合约:<input type="text" class="styled-input" name="signingStartTime" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>

health-admin/src/main/resources/templates/jkgl/SJkglGyhyYjtjActivityinfoList.html

@@ -44,29 +44,21 @@
                     <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>
                                 主题:<input type="text" class="styled-input" name="theme" 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="usedContract" autocomplete="off"/>
-                            </li>
-                            <li>
                                 状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
                             </li>
-                            <li>
-                                邀请人数:<input type="text" class="styled-input" name="invitedCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                成功人数:<input type="text" class="styled-input" name="successCount" autocomplete="off"/>
+                            <!--<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>

health-admin/src/main/resources/templates/jkgl/SJkglMbglQyglBenefitinfoList.html

@@ -44,21 +44,22 @@
                     <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>
                                 权益主题:<input type="text" class="styled-input" name="benefitSubject" autocomplete="off"/>
                             </li>
                             <li>
-                                疾病标签:<input type="text" class="styled-input" name="diseaseTag" autocomplete="off"/>
-                            </li>
-                            <li>
-                                包含权益分类:<input type="text" class="styled-input" name="includedBenefitCategory" 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>

health-admin/src/main/resources/templates/jkgl/SJkglMxbZdyFieldconfigList.html

@@ -38,7 +38,7 @@
 <div class="ui-layout-center">
     <div class="container-div">
         <div class="row">
-            <div class="col-sm-12 search-collapse" >
+            <!--<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">
@@ -97,7 +97,7 @@
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
-            </div>
+            </div>-->
 
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

health-admin/src/main/resources/templates/jkgl/SJkglRegistrationinfoList.html

@@ -44,23 +44,24 @@
                     <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>
                                 主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
                             </li>
                             <li>
-                                登记类型:<input type="text" class="styled-input" name="registrationType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否强管控:<input type="text" class="styled-input" name="isStrictControl" autocomplete="off"/>
-                            </li>
-                            <li>
                                 状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
                             </li>
                             <li>
-                                登记次数:<input type="text" class="styled-input" name="registrationCount" autocomplete="off"/>
+                                登记类型:<input type="text" class="styled-input" name="registrationType" 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>

health-admin/src/main/resources/templates/jkgl/SJkglYpwxServiceprojectinfoList.html

@@ -45,38 +45,36 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建日期:<input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
-                            </li>
-                            <li>
                                 包含药品:<input type="text" class="styled-input" name="includedMedicines" autocomplete="off"/>
                             </li>
                             <li>
-                                维系模式:<input type="text" class="styled-input" name="maintenanceMode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                服务期数:<input type="text" class="styled-input" name="servicePeriods" autocomplete="off"/>
-                            </li>
-                            <li>
                                 状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
                             </li>
                             <li>
-                                服务人数:<input type="text" class="styled-input" name="servedPeople" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否配置短信模板:<input type="text" class="styled-input" name="isSmsTemplateConfigured" autocomplete="off"/>
-                            </li>
-                            <li>
                                 数据来源:<input type="text" class="styled-input" name="dataSource" 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>
+                    <div class="select-list" >
+                        <ul>
+                            <li>
+                                是否配置短信模板:<input type="text" class="styled-input" name="isSmsTemplateConfigured" autocomplete="off"/>
+                            </li>
+                        </ul>
+                    </div>
 
                 </form>
             </div>

health-admin/src/main/resources/templates/mdyy/SMdyyglMdygxxStoreemployeeinfoList.html

@@ -45,53 +45,9 @@
                     <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="storeName" autocomplete="off"/>
                             </li>
-                            <li>
-                                建档日期:<input type="text" class="styled-input" name="建档Date" autocomplete="off"/>
-                            </li>
-                            <li>
-                                员工编码:<input type="text" class="styled-input" name="employeeCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                员工姓名:<input type="text" class="styled-input" name="employeeName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店编号:<input type="text" class="styled-input" name="departmentId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店编码:<input type="text" class="styled-input" name="storeCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                出生日期:<input type="text" class="styled-input" name="birthDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                联系电话:<input type="text" class="styled-input" name="contactNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                民族:<input type="text" class="styled-input" name="nationality" autocomplete="off"/>
-                            </li>
-                            <li>
-                                执证书编号:<input type="text" class="styled-input" name="certificateNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                资格证书:<input type="text" class="styled-input" name="qualificationCertificate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                职务:<input type="text" class="styled-input" name="position" autocomplete="off"/>
-                            </li>
-                            <li>
-                                毕业院校:<input type="text" class="styled-input" name="graduationInstitution" autocomplete="off"/>
-                            </li>
-                            <li>
-                                专业:<input type="text" class="styled-input" name="major" autocomplete="off"/>
-                            </li>
-                            <li>
-                                文化专业:<input type="text" class="styled-input" name="educationalSpecialty" 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>

health-admin/src/main/resources/templates/server/serv/serv.html

@@ -5,6 +5,33 @@
 	<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">
@@ -17,10 +44,10 @@
 						<div class="select-list">
 							<ul>
 								<li>
-									服务编号：<input type="text" name="serviceTypeNumber"/>
+									服务编号：<input type="text" class="styled-input" name="serviceTypeNumber"/>
 								</li>
 								<li>
-									服务名称：<input type="text" name="serviceTypeName"/>
+									服务名称：<input type="text" class="styled-input" name="serviceTypeName"/>
 								</li>
 								<!--li>
 									用户状态：<select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">

health-admin/src/main/resources/templates/xsgl/SXsglMdlsSalesinventoryinfoList.html

@@ -45,142 +45,19 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                连锁Id:<input type="text" class="styled-input" name="chainId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                组织Id:<input type="text" class="styled-input" name="organizationId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                组织名称:<input type="text" class="styled-input" name="organizationName" autocomplete="off"/>
-                            </li>
-                            <li>
                                 门店Id:<input type="text" class="styled-input" name="storeId" autocomplete="off"/>
                             </li>
                             <li>
-                                日期:<input type="text" class="styled-input" name="date" autocomplete="off"/>
-                            </li>
-                            <li>
-                                实际金额:<input type="text" class="styled-input" name="actualAmount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售额预算值:<input type="text" class="styled-input" name="salesBudget" autocomplete="off"/>
-                            </li>
-                            <li>
-                                毛利额预算:<input type="text" class="styled-input" name="grossProfitBudget" autocomplete="off"/>
-                            </li>
-                            <li>
-                                毛利额:<input type="text" class="styled-input" name="grossProfitAmount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                毛利率:<input type="text" class="styled-input" name="grossProfitMargin" autocomplete="off"/>
-                            </li>
-                            <li>
-                                近效期数量:<input type="text" class="styled-input" name="nearExpiryQuantity" autocomplete="off"/>
-                            </li>
-                            <li>
-                                三月不动效数量:<input type="text" class="styled-input" name="threeMonthInactiveQuantity" autocomplete="off"/>
-                            </li>
-                            <li>
-                                来客数:<input type="text" class="styled-input" name="customerVisits" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员销售金额:<input type="text" class="styled-input" name="memberSalesAmount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员销售毛利:<input type="text" class="styled-input" name="memberSalesGrossProfit" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员客户数:<input type="text" class="styled-input" name="memberCustomerCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                保健品:<input type="text" class="styled-input" name="healthSupplements" autocomplete="off"/>
-                            </li>
-                            <li>
-                                OTC:<input type="text" class="styled-input" name="otc" autocomplete="off"/>
-                            </li>
-                            <li>
-                                其他:<input type="text" class="styled-input" name="others" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方:<input type="text" class="styled-input" name="prescription" autocomplete="off"/>
-                            </li>
-                            <li>
-                                中药参茸:<input type="text" class="styled-input" name="chineseMedicineAndGinseng" autocomplete="off"/>
-                            </li>
-                            <li>
-                                中西成药:<input type="text" class="styled-input" name="chineseAndWesternMedicines" autocomplete="off"/>
-                            </li>
-                            <li>
-                                便利食品:<input type="text" class="styled-input" name="convenienceFood" autocomplete="off"/>
-                            </li>
-                            <li>
-                                日化用品:<input type="text" class="styled-input" name="dailyChemicals" autocomplete="off"/>
+                                片区:<input type="text" class="styled-input" name="actualAmount" autocomplete="off"/>
                             </li>
-                            <li>
-                                服务与非卖品:<input type="text" class="styled-input" name="servicesAndNonSellableItems" autocomplete="off"/>
-                            </li>
-                            <li>
-                                母婴用品:<input type="text" class="styled-input" name="maternityProducts" autocomplete="off"/>
-                            </li>
-                            <li>
-                                消杀用品:<input type="text" class="styled-input" name="disinfectionSupplies" autocomplete="off"/>
-                            </li>
-                            <li>
-                                A1:<input type="text" class="styled-input" name="categoryA1" autocomplete="off"/>
-                            </li>
-                            <li>
-                                A2:<input type="text" class="styled-input" name="categoryA2" autocomplete="off"/>
-                            </li>
-                            <li>
-                                A3:<input type="text" class="styled-input" name="categoryA3" autocomplete="off"/>
-                            </li>
-                            <li>
-                                A4:<input type="text" class="styled-input" name="categoryA4" autocomplete="off"/>
-                            </li>
-                            <li>
-                                AA:<input type="text" class="styled-input" name="categoryAA" autocomplete="off"/>
-                            </li>
-                            <li>
-                                其它营销级别:<input type="text" class="styled-input" name="otherMarketingLevels" autocomplete="off"/>
-                            </li>
-                            <li>
-                                低毛利:<input type="text" class="styled-input" name="lowProfit" autocomplete="off"/>
-                            </li>
-                            <li>
-                                微毛利:<input type="text" class="styled-input" name="marginalProfit" autocomplete="off"/>
-                            </li>
-                            <li>
-                                负毛利:<input type="text" class="styled-input" name="negativeProfit" autocomplete="off"/>
-                            </li>
-                            <li>
-                                淘汰:<input type="text" class="styled-input" name="elimination" autocomplete="off"/>
-                            </li>
-                            <li>
-                                一月不动销剩余库存:<input type="text" class="styled-input" name="oneMonthInactiveStock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                三月不动效剩余库存:<input type="text" class="styled-input" name="threeMonthInactiveStock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                近效期剩余库存:<input type="text" class="styled-input" name="nearExpiryRemainingStock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                环境标识:<input type="text" class="styled-input" name="environmentIdentifier" autocomplete="off"/>
-                            </li>
-                            <li>
-                                记录状态:<input type="text" class="styled-input" name="recordStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人id:<input type="text" class="styled-input" name="creatorId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新人id:<input type="text" class="styled-input" name="updaterId" autocomplete="off"/>
-                            </li>
-                            <li>
+                            <!--<li>
                                 更新时间:<input type="text" class="styled-input" name="updateTime" 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>

health-admin/src/main/resources/templates/xsgl/SXsglReturnproductinfoList.html

@@ -44,36 +44,11 @@
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
-                            <li>
-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                通用名:<input type="text" class="styled-input" name="genericName" 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="salesperson" autocomplete="off"/>
                             </li>
-                            <li>
-                                退货数量:<input type="text" class="styled-input" name="returnQuantity" autocomplete="off"/>
-                            </li>
-                            <li>
-                                应退金额/元:<input type="text" class="styled-input" name="refundAmount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产批号/批次号:<input type="text" class="styled-input" name="productionBatchNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产厂家:<input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                            </li>
-                            <li>
-                                产地:<input type="text" class="styled-input" name="origin" 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>

health-admin/src/main/resources/templates/xsgl/SXsglXsmxDdmxSalesorderinfoList.html

@@ -47,27 +47,49 @@
                             <li>
                                 销售单号:<input type="text" class="styled-input" name="saleDocumentNumber" autocomplete="off"/>
                             </li>
+
                             <li>
-                                订单状态:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
+                                会员:<input type="text" class="styled-input" name="member" autocomplete="off"/>
                             </li>
                             <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
+                                订单状态:<input type="text" class="styled-input" name="transferStatus" autocomplete="off"/>
                             </li>
-                            <li>
-                                转单状态:<input type="text" class="styled-input" name="transferStatus" autocomplete="off"/>
+                            <!--<li>
+                                销售日期:<input type="text" class="styled-input" name="saleDate" 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>
+                    <div class="select-list" >
+                        <ul>
                             <li>
-                                销售日期:<input type="text" class="styled-input" name="saleDate" autocomplete="off"/>
+                                收银员:<input type="text" class="styled-input" name="cashier" autocomplete="off"/>
                             </li>
+
+
                             <li>
-                                会员:<input type="text" class="styled-input" name="member" autocomplete="off"/>
+                                是否会员:<input type="text" class="styled-input" name="cashier" autocomplete="off"/>
                             </li>
                             <li>
-                                收银员:<input type="text" class="styled-input" name="cashier" autocomplete="off"/>
+                                销售端:<input type="text" class="styled-input" name="cashier" autocomplete="off"/>
                             </li>
                             <li>
                                 拣货员:<input type="text" class="styled-input" name="picker" autocomplete="off"/>
                             </li>
+                        </ul>
+                    </div>
+                    <div class="select-list" >
+                        <ul>
                             <li>
                                 拣货员编码:<input type="text" class="styled-input" name="pickerCode" autocomplete="off"/>
                             </li>
@@ -75,14 +97,17 @@
                                 订单来源:<input type="text" class="styled-input" name="orderSource" autocomplete="off"/>
                             </li>
                             <li>
-                                渠道单号:<input type="text" class="styled-input" name="channelDocumentNumber" autocomplete="off"/>
+                                动态验证码:<input type="text" class="styled-input" name="orderSource" autocomplete="off"/>
                             </li>
                             <li>
-                                备注或附加信息:<input type="text" class="styled-input" name="om" autocomplete="off"/>
+                                片区:<input type="text" class="styled-input" name="channelDocumentNumber" 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>
+                        </ul>
+                    </div>
+                    <div class="select-list" >
+                        <ul>
+                            <li>
+                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>

health-admin/src/main/resources/templates/xzgl/SXzglDownloadManagementList.html

@@ -38,7 +38,7 @@
 <div class="ui-layout-center">
     <div class="container-div">
         <div class="row">
-            <div class="col-sm-12 search-collapse" >
+            <!--<div class="col-sm-12 search-collapse" >
                 <form id="SXzglDownloadManagement-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
@@ -139,7 +139,7 @@
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
-            </div>
+            </div>-->
 
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>

health-admin/src/main/resources/templates/ybgl/SYbglMedicaremanagementList.html

@@ -56,7 +56,7 @@
                             <li>
                                 渠道编码:<input type="text" class="styled-input" name="channelCode" autocomplete="off"/>
                             </li>
-                            <li>
+                            <!--<li>
                                 渠道名称:<input type="text" class="styled-input" name="channelName" autocomplete="off"/>
                             </li>
                             <li>
@@ -64,22 +64,27 @@
                             </li>
                             <li>
                                 创建人:<input type="text" class="styled-input" name="creator" autocomplete="off"/>
-                            </li>
-                            <li>
-                                渠道分类编码:<input type="text" class="styled-input" name="channelCategoryCode" autocomplete="off"/>
-                            </li>
-                            <li>
+                            </li>-->
+
+                            <!--<li>
                                 医保最小剂量单位:<input type="text" class="styled-input" name="medicareMinDosageUnit" autocomplete="off"/>
                             </li>
                             <li>
                                 是否拆零上传（0: 否, 1: 是）:<input type="text" class="styled-input" name="isSplitUpload" autocomplete="off"/>
-                            </li>
+                            </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="select-list" >
+                        <ul>
+                            <li>
+                                渠道分类编码:<input type="text" class="styled-input" name="channelCategoryCode" autocomplete="off"/>
+                            </li>
+                        </ul>
+                    </div>
 
                 </form>
             </div>

health-admin/src/main/resources/templates/ypdg/SYpdgChineseDecoctionstList.html

@@ -45,76 +45,20 @@
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
                                 需求单号:<input type="text" class="styled-input" name="demandOrderNumber" autocomplete="off"/>
                             </li>
                             <li>
-                                第三方订单ID:<input type="text" class="styled-input" name="thirdOrderId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                平台用户ID:<input type="text" class="styled-input" name="platformUserId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                业务ID:<input type="text" class="styled-input" name="businessId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单人:<input type="text" class="styled-input" name="orderer" autocomplete="off"/>
-                            </li>
-                            <li>
                                 下单人手机号:<input type="text" class="styled-input" name="ordererPhone" autocomplete="off"/>
                             </li>
                             <li>
-                                收货人:<input type="text" class="styled-input" name="consignee" autocomplete="off"/>
-                            </li>
-                            <li>
-                                加密收货人:<input type="text" class="styled-input" name="encryptedConsignee" autocomplete="off"/>
-                            </li>
-                            <li>
-                                加密收货人手机号:<input type="text" class="styled-input" name="encryptedConsigneePhone" autocomplete="off"/>
+                                是否录入商品:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
                             </li>
-                            <li>
-                                收货人手机号:<input type="text" class="styled-input" name="consigneePhone" autocomplete="off"/>
-                            </li>
-                            <li>
-                                连锁公司名称:<input type="text" class="styled-input" name="chainCompanyName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                存储ID:<input type="text" class="styled-input" name="storageId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否保存:<input type="text" class="styled-input" name="isSaved" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方图片:<input type="text" class="styled-input" name="prescriptionImage" autocomplete="off"/>
-                            </li>
-                            <li>
-                                药品剂量:<input type="text" class="styled-input" name="medicineDosage" autocomplete="off"/>
-                            </li>
-                            <li>
-                                煎药方式:<input type="text" class="styled-input" name="decoctionMethod" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单门店:<input type="text" class="styled-input" name="orderStore" autocomplete="off"/>
-                            </li>
-                            <li>
-                                提交时间:<input type="text" class="styled-input" name="submitTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                取消时间:<input type="text" class="styled-input" name="cancelTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                支付时间:<input type="text" class="styled-input" name="paymentTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                订单状态：1待录方，2待付款，3已完成，4已取消:<input type="text" class="styled-input" name="orderStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                备注:<input type="text" class="styled-input" name="remarks" autocomplete="off"/>
+                                <!--提交时间:<input type="text" class="styled-input" name="submitTime" 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>

health-system/src/main/resources/mapper/gjgzt/SGjgztHealthplaninfoMapper.xml

@@ -32,6 +32,9 @@
         <if test="reportGenerationTime !=null and reportGenerationTime !='' ">
             and reportGenerationTime = #{reportGenerationTime}
         </if>
+        <if test="id != null and id!=''">
+            and id=#{id}
+        </if>
     </select>