update 会员管理 商品管理 页面查询条件显示修改

health-admin/src/main/java/com/bzd/web/controller/hygl/jf/SHyglJfglOrderinfoController.java

@@ -4,6 +4,7 @@ import com.bzd.common.annotation.Log;
 import com.bzd.common.config.dao.PageData;
 import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
+import com.bzd.common.core.domain.entity.SysUser;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
 import com.bzd.system.service.PharmaceuticalService;
@@ -109,7 +110,21 @@ public class SHyglJfglOrderinfoController extends BaseController {
         Integer integer = sHyglJfglOrderinfoService.SHyglJfglOrderinfoRemove(pd);
         return toAjax(integer);
     }
-
+    /**
+     * 兑换记录表 数据修改
+     *
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("hygl:jf:edit")
+    @GetMapping("/checkProduct")
+    public String checkProduct(ModelMap mmap) throws Exception {
+        PageData pd = this.getPageData();
+        SysUser user = getSysUser();
+        pd.put("user", user.getUserId());
+        mmap.putAll(pd);
+        return prefix+ "/SHyglJfglOrderinfoHxSp";
+    }
     /**
     * 兑换记录表 数据修改
     *

health-admin/src/main/resources/templates/hygl/SHyglEquitiesList.html

@@ -43,51 +43,40 @@
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
-                        <ul>
-                            <li>
-                                权益的唯一标识符:<input type="text" class="styled-input" name="benefitUniqueIdentifier" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的名称:<input type="text" class="styled-input" name="benefitName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的描述:<input type="text" class="styled-input" name="benefitDescription" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的用途:<input type="text" class="styled-input" name="benefitPurpose" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的类型:<input type="text" class="styled-input" name="benefitType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的状态:<input type="text" class="styled-input" name="benefitStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权益的详细说明:<input type="text" class="styled-input" name="benefitDetails" autocomplete="off"/>
-                            </li>
-                            <li>
-                                总库存:<input type="text" class="styled-input" name="totalStock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                剩余库存:<input type="text" class="styled-input" name="remainingStock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                审核状态:<input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人的用户名:<input type="text" class="styled-input" name="createdByUsername" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生成时间:<input type="text" class="styled-input" name="creationTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                操作记录:<input type="text" class="styled-input" name="operationLog" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
+                        <div class="col-sm-12">
+                            <div class="form-group">
+                                <!--is-required 增加星号 显示为必填-->
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">权益的名称:</label>
+                                        <input type="text" class="styled-input" name="benefitName" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">权益的ID:</label>
+                                        <input type="text" class="styled-input" name="id" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">权益的状态:</label>
+                                        <select name="benefitStatus"  th:with="type=${@dict.getType('sys_select_yhgl_qytz')}" class="styled-input">
+                                            <option value="">全部</option>
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                            ></option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
                     </div>
 
                 </form>
@@ -97,18 +86,12 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
                     <i class="fa fa-plus"></i> 新增
                 </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/hygl/SHyglMembertagList.html

@@ -47,27 +47,6 @@
                             <li>
                                 疾病名称:<input type="text" class="styled-input" name="diseaseName" autocomplete="off"/>
                             </li>
-                            <li>
-                                会员数量:<input type="text" class="styled-input" name="memberCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                占比:<input type="text" class="styled-input" name="proportion" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="creator" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updateTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                删除标记（0: 未删除, 1: 已删除）:<input type="text" class="styled-input" name="deleteFlag" 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>
@@ -77,25 +56,6 @@
 
                 </form>
             </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -158,8 +118,6 @@
                     { field: 'creator', title: '创建人', align: 'center' },
                     { field: 'updateTime', title: '更新时间', align: 'center' },
                     { field: 'status', title: '状态', align: 'center' },
-                    { field: 'deleteFlag', title: '删除标记（0: 未删除, 1: 已删除）', align: 'center' },
-
                 {
                     title: '操作',
                     align: 'center',

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglMemberpointsinfoList.html

@@ -42,37 +42,27 @@
                 <form id="SHyglJfglMemberpointsinfo-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
-                        <ul>
-                            <li>
-                                会员卡号:<input type="text" class="styled-input" name="memberCardNo" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员姓名:<input type="text" class="styled-input" name="memberName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                手机号码:<input type="text" class="styled-input" name="phoneNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                领取门店:<input type="text" class="styled-input" name="pickupStore" autocomplete="off"/>
-                            </li>
-                            <li>
-                                剩余积分:<input type="text" class="styled-input" name="remainingPoints" autocomplete="off"/>
-                            </li>
-                            <li>
-                                积分调整:<input type="text" class="styled-input" name="pointsAdjustment" autocomplete="off"/>
-                            </li>
-                            <li>
-                                积分调整原因:<input type="text" class="styled-input" name="pointsAdjustmentReason" autocomplete="off"/>
-                            </li>
-                            <li>
-                                积分变动时间:<input type="text" class="styled-input" name="pointsChangeTime" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <!--is-required 增加星号 显示为必填-->
+                                        <div class="col-sm-6">
+                                            <div class="input-group">
+                                                <label class="control-label">手机或会员卡号:</label>
+                                                <input type="text" class="styled-input" placeholder="请输入手机或会员卡号" name="query" autocomplete="off"/>
+                                            </div>
+                                        </div>
+                                        <div class="col-sm-6">
+                                            <div class="input-group">
+                                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
+                                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
                     </div>
 
                 </form>
@@ -88,12 +78,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoAdd.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('兑换记录表新增')" />
+    <th:block th:include="include :: header('核销商品')" />
     <th:block th:include="include :: ztree-css" />
 </head>
 <body class="white-bg">
@@ -11,120 +11,14 @@
             <div class="col-sm-12">
                 <div class="form-group">
                     <!--is-required 增加星号 显示为必填-->
-                            <label class="col-sm-3 control-label">订单ID:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="orderID" id="orderID" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">商品名:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="productName" id="productName" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">商品类型:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="productType" id="productType" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">订单总价:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="orderTotalPrice" id="orderTotalPrice" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">外部积分支付:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="externalPointsPaid" id="externalPointsPaid" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">是否特价订单:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="isPromotionOrder" id="isPromotionOrder" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">兑换数量:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="redemptionQuantity" id="redemptionQuantity" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">兑换渠道:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="redemptionChannel" id="redemptionChannel" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">支付方式:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="paymentMethod" id="paymentMethod" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">兑换状态:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="redemptionStatus" id="redemptionStatus" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">下单时间:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="orderTime" id="orderTime" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">会员手机号/卡号:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="memberPhoneOrCardNo" id="memberPhoneOrCardNo" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">用户身份:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="userRole" id="userRole" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">自提/兑换门店:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="pickupOrRedemptionStore" id="pickupOrRedemptionStore" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">推荐兑换员工:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="recommendingEmployee" id="recommendingEmployee" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">推荐兑换门店:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="recommendingStore" id="recommendingStore" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">核销门店:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="verificationStore" id="verificationStore" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">核销人:</label>
-                            <div class="col-sm-3">
-                                <div class="input-group">
-                                    <input name="verifiedBy" id="verifiedBy" class="styled-input" type="text" maxlength="255" >
-                                </div>
-                            </div>
-                            <label class="col-sm-3 control-label">核销时间:</label>
+
+                            <label class="col-sm-3 control-label">兑换码:</label>
                             <div class="col-sm-3">
                                 <div class="input-group">
-                                    <input name="verificationTime" id="verificationTime" class="styled-input" type="text" maxlength="255" >
+                                    <input name="exchangeCode" id="exchangeCode" class="styled-input" type="text" maxlength="255" >
                                 </div>
                             </div>
+
                 </div>
             </div>
 
@@ -142,7 +36,7 @@
     }
 
     function add() {
-           var orderID = $("input[name='orderID']").val();
+           var exchangeCode = $("input[name='exchangeCode']").val();
            var productName = $("input[name='productName']").val();
            var productType = $("input[name='productType']").val();
            var orderTotalPrice = $("input[name='orderTotalPrice']").val();
@@ -167,7 +61,7 @@
             type : "POST",
             url : ctx + "hygl/shygljfglorderinfo/sHyglJfglOrderinfoAdd",
             data : {
-                "orderID": orderID,
+                "exchangeCode": exchangeCode,
                 "productName": productName,
                 "productType": productType,
                 "orderTotalPrice": orderTotalPrice,

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoHxSp.html

@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('核销商品')" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-user-resetPwd">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">兑换码：</label>
+            <div class="col-sm-8">
+                <input class="form-control" type="text"  name="exchangeCode" />
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+
+<script>
+    $("#form-user-resetPwd").validate({
+        rules:{
+            oldPassword:{
+                required:true,
+                remote: {
+                    url: ctx + "/hygl/shygljfglorderinfo/checkProduct",
+                    type: "get",
+                    dataType: "json",
+                    data: {
+                        exchangeCode: function() {
+                            return $("input[name='exchangeCode']").val();
+                        }
+                    }
+                }
+            },
+
+        },
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        var chrtype = [[${#strings.defaultString(@config.getKey('sys.account.chrtype'), 0)}]];
+        var password = $("#exchangeCode").val();
+        if ($.validate.form() && checkpwd(chrtype, password)) {
+            $.operate.save(ctx + "/hygl/shygljfglorderinfo/checkProduct", $('#form-user-resetPwd').serialize());
+        }
+    }
+</script>
+</body>
+
+</html>

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglOrderinfoList.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="format-detection" content="telephone=no">
-    <th:block th:include="include :: header('兑换记录表')" />
+    <th:block th:include="include :: header('兑换记录')" />
     <th:block th:include="include :: layout-latest-css" />
     <th:block th:include="include :: ztree-css" />
 </head>
@@ -15,16 +15,6 @@
         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 {
@@ -42,93 +32,94 @@
                 <form id="SHyglJfglOrderinfo-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
                         <ul>
                             <li>
-                                订单ID:<input type="text" class="styled-input" name="orderID" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品名:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品类型:<input type="text" class="styled-input" name="productType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                订单总价:<input type="text" class="styled-input" name="orderTotalPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                外部积分支付:<input type="text" class="styled-input" name="externalPointsPaid" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否特价订单:<input type="text" class="styled-input" name="isPromotionOrder" autocomplete="off"/>
-                            </li>
-                            <li>
-                                兑换数量:<input type="text" class="styled-input" name="redemptionQuantity" autocomplete="off"/>
-                            </li>
-                            <li>
-                                兑换渠道:<input type="text" class="styled-input" name="redemptionChannel" autocomplete="off"/>
-                            </li>
-                            <li>
-                                支付方式:<input type="text" class="styled-input" name="paymentMethod" autocomplete="off"/>
-                            </li>
-                            <li>
-                                兑换状态:<input type="text" class="styled-input" name="redemptionStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                下单时间:<input type="text" class="styled-input" name="orderTime" autocomplete="off"/>
+                                订单号:<input type="text" class="styled-input" placeholder="请输入订单号" name="orderID" autocomplete="off"/>
                             </li>
                             <li>
-                                会员手机号/卡号:<input type="text" class="styled-input" name="memberPhoneOrCardNo" autocomplete="off"/>
+                                商品类型 <select name="productType"  th:with="type=${@dict.getType('sys_select_product_type')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
                             <li>
-                                用户身份:<input type="text" class="styled-input" name="userRole" autocomplete="off"/>
+                                兑换渠道
+                                <select name="redemptionChannel"  th:with="type=${@dict.getType('sys_select_jfdh_qd')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
                             <li>
-                                自提/兑换门店:<input type="text" class="styled-input" name="pickupOrRedemptionStore" autocomplete="off"/>
+                                特价订单
+                                <select name="specialOrder"  th:with="type=${@dict.getType('sys_select_jfdhtj_order')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
                             <li>
-                                推荐兑换员工:<input type="text" class="styled-input" name="recommendingEmployee" autocomplete="off"/>
-                            </li>
-                            <li>
-                                推荐兑换门店:<input type="text" class="styled-input" name="recommendingStore" autocomplete="off"/>
+                                <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="verificationStore" autocomplete="off"/>
+                                自提码:<input type="text" class="styled-input"  placeholder="请输入自提码" name="redemptionChannel" autocomplete="off"/>
                             </li>
+
                             <li>
-                                核销人:<input type="text" class="styled-input" name="verifiedBy" autocomplete="off"/>
+                                核销门店:<input type="text" class="styled-input"  placeholder="请输入核销门店" name="verificationStore" autocomplete="off"/>
                             </li>
                             <li>
-                                核销时间:<input type="text" class="styled-input" name="verificationTime" autocomplete="off"/>
+                                兑换状态
+                                <select name="redemptionStatus"  th:with="type=${@dict.getType('sys_select_jfdh_status')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+
+                            <li class="select-time">
+                                <label>下单时间: </label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="xdbeginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="xdendTime"/>
                             </li>
+
+
                         </ul>
                     </div>
 
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            手机号<input type="text" class="styled-input"  placeholder="请输入手机号" name="memberPhoneOrCardNo" autocomplete="off"/>
+                        </li>
+                        <li>
+                            积分区间:
+                            <input type="number" style="width: 92px;" class="styled-input"  placeholder="最大" name="pointsMax" autocomplete="off"/>
+                            ~
+                            <input type="number" style="width: 92px;" class="styled-input"  placeholder="最小" name="pointsMin" autocomplete="off"/>
+                        </li>
+                    </ul>
+                </div>
                 </form>
             </div>
-
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
+                <a class="btn btn-success" onclick="checkProduct()" shiro:hasPermission="system:user:add">
+                    <i class="fa fa-plus"></i> 核销商品
+                </a>
             </div>
-
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -172,7 +163,7 @@
             importTemplateUrl: prefix + "/importTemplate",*/
             sortName: "id",
             sortOrder: "asc",
-            modalName: "兑换记录表",
+            modalName: "核销商品",
             fitColumns: true,
             striped: true,
             autoRowHeight: true,
@@ -184,7 +175,7 @@
                 checkbox: true
             },
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
-                    { field: 'orderID', title: '订单ID', align: 'center' },
+                    { field: 'orderID', title: '订单号', align: 'center' },
                     { field: 'productName', title: '商品名', align: 'center' },
                     { field: 'productType', title: '商品类型', align: 'center' },
                     { field: 'orderTotalPrice', title: '订单总价', align: 'center' },
@@ -263,6 +254,13 @@
             return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
         }
     }
+
+    function checkProduct() {
+        var url = ctx + 'hygl/shygljfglorderinfo/checkProduct';
+        $.modal.open("核销商品", url, '600', '220');
+    }
+
+
 </script>
 </body>
 

health-admin/src/main/resources/templates/hygl/jf/SHyglJfglPointAdjustmentList.html

@@ -42,54 +42,48 @@
                 <form id="SHyglJfglPointAdjustment-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
                         <ul>
                             <li>
-                                申请单编号:<input type="text" class="styled-input" name="applicationNumber" autocomplete="off"/>
+                                <label>申请单编号</label>
+                               <input type="text" class="styled-input" name="applicationNumber" autocomplete="off"/>
                             </li>
                             <li>
-                                调整数量:<input type="text" class="styled-input" name="adjustmentQuantity" autocomplete="off"/>
-                            </li>
-                            <li>
-                                申请人:<input type="text" class="styled-input" name="applicant" autocomplete="off"/>
-                            </li>
-                            <li>
-                                申请时间:<input type="text" class="styled-input" name="applicationTime" autocomplete="off"/>
+                                <label>审批状态</label>
+                                <select name="approvalStatus"  th:with="type=${@dict.getType('sys_select_yhgl_jfgl_check_status')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
                             <li>
                                 审批人:<input type="text" class="styled-input" name="approver" autocomplete="off"/>
                             </li>
-                            <li>
-                                审批时间:<input type="text" class="styled-input" name="approvalTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                审批状态：待审核，审核通过，驳回:<input type="text" class="styled-input" name="approvalStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员卡号:<input type="text" class="styled-input" name="memberCardNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员手机号:<input type="text" class="styled-input" name="memberPhone" autocomplete="off"/>
-                            </li>
-                            <li>
-                                会员姓名:<input type="text" class="styled-input" name="memberName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                积分调整:<input type="text" class="styled-input" name="pointsAdjusted" autocomplete="off"/>
-                            </li>
-                            <li>
-                                调整原因:<input type="text" class="styled-input" name="adjustmentReason" autocomplete="off"/>
+                            <li class="select-time">
+                                <label>申请时间: </label>
+                                <input type="text" class="time-input styled-input" id="sqstartTime" placeholder="开始时间" name="sqbeginTime"/>
+                                -
+                                <input type="text" class="time-input styled-input" id="sqendTime" placeholder="结束时间" name="sqendTime"/>
                             </li>
+
                             <li>
-                                调整单类型:<input type="text" class="styled-input" name="adjustmentType" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                             </li>
                         </ul>
                     </div>
-
+                    <div class="select-list" >
+                        <ul>
+                            <li class="select-time">
+                                <label>审批时间: </label>
+                                <input type="text" class="time-input styled-input" id="spstartTime" placeholder="开始时间" name="spbeginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input styled-input" id="spendTime" placeholder="结束时间" name="spendTime"/>
+                            </li>
+                        </ul>
+                    </div>
                 </form>
             </div>
 
@@ -103,12 +97,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxMouldmessageList.html

@@ -47,26 +47,20 @@
                             <li>
                                 短信名称:<input type="text" class="styled-input" name="smsName" autocomplete="off"/>
                             </li>
+
                             <li>
-                                短信平台:<input type="text" class="styled-input" name="smsPlatform" autocomplete="off"/>
-                            </li>
-                            <li>
-                                三方模版ID:<input type="text" class="styled-input" name="thirdPartyTemplateId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模板类型:<input type="text" class="styled-input" name="templateType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                短信内容:<input type="text" class="styled-input" name="smsContent" autocomplete="off"/>
+                                <label>短信状态</label>
+                                <select name="status"  th:with="type=${@dict.getType('sys_select_yhgl_hyyx_dxzt')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
-                            <li>
-                                短信变量:<input type="text" class="styled-input" name="smsVariables" autocomplete="off"/>
+                            <li class="select-time">
+                                <label>创建时间: </label>
+                                <input type="text" class="time-input styled-input" id="cstartTime" placeholder="开始时间" name="cbeginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input styled-input" id="cendTime" placeholder="结束时间" name="cendTime"/>
                             </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>
@@ -88,12 +82,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/hygl/yx/SHyglHyyxPeoplemanagementList.html

@@ -48,28 +48,18 @@
                                 人群名称:<input type="text" class="styled-input" name="peopleName" autocomplete="off"/>
                             </li>
                             <li>
-                                人群定义:<input type="text" class="styled-input" name="peopleDefinition" autocomplete="off"/>
+                                <label>更新方式</label>
+                                <select name="updateMethod"  th:with="type=${@dict.getType('sys_select_yhgl_hyyx_gxfs')}" class="styled-input">
+                                    <option value="">全部</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                                    ></option>
+                                </select>
                             </li>
-                            <li>
-                                总人数:<input type="text" class="styled-input" name="totalPeopleCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                成功人数:<input type="text" class="styled-input" name="successPeopleCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                失败人数:<input type="text" class="styled-input" name="failurePeopleCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新方式:<input type="text" class="styled-input" name="updateMethod" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updateTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="creator" autocomplete="off"/>
+                            <li class="select-time">
+                                <label>创建时间: </label>
+                                <input type="text" class="time-input styled-input" id="cstartTime" placeholder="开始时间" name="cbeginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input styled-input" id="cendTime" placeholder="结束时间" name="cendTime"/>
                             </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>
@@ -91,12 +81,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">
@@ -173,9 +157,6 @@
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
                             var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
                             return actions.join('');
                         } else {
                             return "";

health-admin/src/main/resources/templates/spgl/SSpglJfspProductinfoList.html

@@ -47,27 +47,17 @@
                             <li>
                                 商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
                             </li>
+
                             <li>
-                                商品图片:<input type="text" class="styled-input" name="productImage" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售价:<input type="text" class="styled-input" name="salesPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                兑换价格:<input type="text" class="styled-input" name="exchangePrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                库存:<input type="text" class="styled-input" name="stock" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品类型:<input type="text" class="styled-input" name="productType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售状态:<input type="text" class="styled-input" name="salesStatus" autocomplete="off"/>
+                                <label>前台类目</label>
+                                <select name="foregroundCategory"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="1">类目1</option>
+                                    <option value="2">类目2</option>
+                                    <option value="3">类目3</option>
+                                </select>
                             </li>
+
                             <li style="text-align: center">
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -88,12 +78,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/spgl/SSpglMdjymlStoreproductinfoList.html

@@ -44,9 +44,7 @@
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
-                            <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
-                            </li>
+
                             <li>
                                 商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
                             </li>
@@ -57,7 +55,21 @@
                                 商品类目:<input type="text" class="styled-input" name="productCategory" autocomplete="off"/>
                             </li>
                             <li>
-                                可售状态:<input type="text" class="styled-input" name="saleStatus" autocomplete="off"/>
+                                <label>可售状态</label>
+                                <select name="saleStatus"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="1">可售</option>
+                                    <option value="2">停售</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>营销分类</label>
+                                <select name="marketingType"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="1">网络营销</option>
+                                    <option value="2">线下营销</option>
+                                    <option value="3">电话营销</option>
+                                </select>
                             </li>
                             <li style="text-align: center">
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -79,12 +91,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/spgl/SSpglMdspStoreproductdetailsList.html

@@ -40,95 +40,175 @@
         <div class="row">
             <div class="col-sm-12 search-collapse" >
                 <form id="SSpglMdspStoreproductdetails-form">
+
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
-                        <ul>
-                            <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                规格:<input type="text" class="styled-input" name="specification" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产厂家:<input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                            </li>
-                            <li>
-                                通用名称:<input type="text" class="styled-input" name="genericName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品品牌:<input type="text" class="styled-input" name="brandName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                零售价（元）:<input type="text" class="styled-input" name="retailPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止调拨:<input type="text" class="styled-input" name="prohibitTransfer" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止请货:<input type="text" class="styled-input" name="prohibitOrder" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止销售:<input type="text" class="styled-input" name="prohibitSale" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止返厂:<input type="text" class="styled-input" name="prohibitReturnFactory" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止返仓:<input type="text" class="styled-input" name="prohibitReturnWarehouse" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止配送:<input type="text" class="styled-input" name="prohibitDelivery" autocomplete="off"/>
-                            </li>
-                            <li>
-                                禁止采购:<input type="text" class="styled-input" name="prohibitPurchase" autocomplete="off"/>
-                            </li>
-                            <li>
-                                配置类型:<input type="text" class="styled-input" name="configurationType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                经营属性:<input type="text" class="styled-input" name="operationAttribute" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售属性:<input type="text" class="styled-input" name="salesAttribute" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最小陈列量:<input type="text" class="styled-input" name="minimumDisplayQuantity" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
 
-                </form>
+                        <div class="col-sm-12">
+                            <div class="form-group">
+                                <!--is-required 增加星号 显示为必填-->
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">&nbsp;商&nbsp;&nbsp;&nbsp;&nbsp;品&nbsp;  :</label>
+                                        <input type="text" class="styled-input" placeholder="通用名/商品名/助记码/条形码" name="productName" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">&nbsp;片&nbsp;&nbsp;&nbsp;&nbsp;区&nbsp;  :</label>
+                                        <input type="text" class="styled-input" placeholder="请输入经营分类" name="genericName" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">&nbsp;门&nbsp;&nbsp;&nbsp;&nbsp;店&nbsp;  :</label>
+                                        <input type="text" class="styled-input" placeholder="请输入批准文号" name="genericName" autocomplete="off"/>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="col-sm-12">
+                            <hr>
+                        <div class="col-sm-4">
+                            <div class="input-group">
+                                <label class="control-label">经营属性:</label>
+                                <select name="managementAttribute"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="1">网络</option>
+                                    <option value="2">线下</option>
+                                    <option value="3">门店</option>
+                                </select>
+                            </div>
+                        </div>
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                    <label class="control-label">销售属性:</label>
+                                    <select name="salesAttributes"  class="styled-input">
+                                        <option value="">全部</option>
+                                        <option value="1">网络</option>
+                                        <option value="2">线下</option>
+                                        <option value="3">电话</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                    <label class="control-label">营销分类:</label>
+                                    <select name="marketingType"  class="styled-input">
+                                        <option value="">全部</option>
+                                        <option value="1">网络营销</option>
+                                        <option value="2">线下营销</option>
+                                        <option value="3">电话营销</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-12">
+                            <hr>
+                            <div class="form-group">
+                                <!--is-required 增加星号 显示为必填-->
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+
+                                        <label class="control-label">禁止调拨:</label>
+                                        <select name="jzdb"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">禁止请货:</label>
+                                        <select name="jzqh"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">禁止返厂:</label>
+                                        <select name="jzfc"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                        <div class="col-sm-12">
+                            <hr>
+                            <div class="form-group">
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">禁止返仓:</label>
+                                        <select name="jzfancang"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">禁止配送:</label>
+                                        <select name="jzpeisong"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-4">
+                                    <div class="input-group">
+                                        <label class="control-label">禁止采购:</label>
+                                        <select name="jzcaiogu"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="input-group">
+                                        <hr>
+                                        <label class="control-label">最小陈列量:</label>
+                                        <input type="number" class="styled-input" placeholder="最低" name="minQuantity" autocomplete="off"/>
+                                        <span>~</span>
+                                        <input type="number" class="styled-input" placeholder="最高" name="maxQuantity" autocomplete="off"/>
+
+                                    </div>
+                                </div>
+
+                                <div class="col-sm-6">
+                                    <div class="input-group">
+                                        <hr>
+                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
+                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
             </div>
 
+                </form>
+            </div>
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
-
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>

health-admin/src/main/resources/templates/spgl/SSpglProductattributesList.html

@@ -42,6 +42,8 @@
                 <form id="SSpglProductattributes-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
                         <ul>
                             <li>
@@ -50,17 +52,9 @@
                             <li>
                                 商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
                             </li>
-                            <li>
-                                商品价格:<input type="text" class="styled-input" name="productPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                支付分门槛:<input type="text" class="styled-input" name="paymentScoreThreshold" autocomplete="off"/>
-                            </li>
-                            <li>
-                                租赁上限:<input type="text" class="styled-input" name="rentalLimit" 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-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>
@@ -68,7 +62,6 @@
 
                 </form>
             </div>
-
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
                     <i class="fa fa-plus"></i> 新增
@@ -79,12 +72,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/spgl/SSpglProductdetailsList.html

@@ -9,29 +9,7 @@
 </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">
@@ -42,121 +20,132 @@
                 <form id="SSpglProductdetails-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
+                    <h4>查询条件</h4>
+                    <hr>
                     <div class="select-list" >
-                        <ul>
-                            <li>
-                                商品编码:<input type="text" class="styled-input" name="productCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品名称:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                规格:<input type="text" class="styled-input" name="specification" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产厂家:<input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                            </li>
-                            <li>
-                                通用名称:<input type="text" class="styled-input" name="genericName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品分类:<input type="text" class="styled-input" name="productCategory" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品品牌:<input type="text" class="styled-input" name="brandName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                零售价/元:<input type="text" class="styled-input" name="retailPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                销售属性:<input type="text" class="styled-input" name="salesAttributes" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最低限价:<input type="text" class="styled-input" name="minimumPrice" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产许可证号/备案凭证编号:<input type="text" class="styled-input" name="productionLicenseNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产许可证号有效期:<input type="text" class="styled-input" name="productionLicenseValidUntil" autocomplete="off"/>
-                            </li>
-                            <li>
-                                拆零单位:<input type="text" class="styled-input" name="unitOfDispensing" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否可拆零:<input type="text" class="styled-input" name="isDispensable" autocomplete="off"/>
-                            </li>
-                            <li>
-                                拆零比例:<input type="text" class="styled-input" name="dispensingRatio" autocomplete="off"/>
-                            </li>
-                            <li>
-                                本位码:<input type="text" class="styled-input" name="uniqueCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                上市许可持有人:<input type="text" class="styled-input" name="marketingAuthorizationHolder" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方类别:<input type="text" class="styled-input" name="prescriptionCategory" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方类别二级:<input type="text" class="styled-input" name="prescriptionCategorySecondLevel" autocomplete="off"/>
-                            </li>
-                            <li>
-                                处方类别三级:<input type="text" class="styled-input" name="prescriptionCategoryThirdLevel" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号:<input type="text" class="styled-input" name="approvalNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号有效期:<input type="text" class="styled-input" name="approvalNumberValidUntil" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号2:<input type="text" class="styled-input" name="approvalNumberTwo" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号2有效期:<input type="text" class="styled-input" name="approvalNumberTwoValidUntil" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号3:<input type="text" class="styled-input" name="approvalNumberThree" autocomplete="off"/>
-                            </li>
-                            <li>
-                                批准文号3有效期:<input type="text" class="styled-input" name="approvalNumberThreeValidUntil" autocomplete="off"/>
-                            </li>
-                            <li>
-                                注册证号:<input type="text" class="styled-input" name="registrationNumber" autocomplete="off"/>
-                            </li>
-                            <li>
-                                注册证号有效期:<input type="text" class="styled-input" name="registrationNumberValidUntil" autocomplete="off"/>
-                            </li>
-                            <li>
-                                注册证号2:<input type="text" class="styled-input" name="registrationNumberTwo" autocomplete="off"/>
-                            </li>
-                            <li>
-                                注册证号2有效期:<input type="text" class="styled-input" name="registrationNumberTwoValidUntil" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
+                        <div class="col-sm-12">
+                        <div class="form-group">
+                            <!--is-required 增加星号 显示为必填-->
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <label class="control-label">商品名称:</label>
+                                    <input type="text" class="styled-input" placeholder="通用名/商品名/助记码/条形码" name="productName" autocomplete="off"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <label class="control-label">营销分类:</label>
+                                    <select name="marketingType"  class="styled-input">
+                                        <option value="">全部</option>
+                                        <option value="1">网络营销</option>
+                                        <option value="2">线下营销</option>
+                                        <option value="3">电话营销</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <label class="control-label">批准文号:</label>
+                                    <input type="text" class="styled-input" placeholder="请输入批准文号" name="genericName" autocomplete="off"/>
+                                </div>
+                            </div>
+                            <div class="col-sm-3">
+                                <div class="input-group">
+                                    <label class="control-label">注册证号:</label>
+                                    <input type="text" class="styled-input" placeholder="请输入注册证号" name="genericName" autocomplete="off"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                        <div class="col-sm-12">
+                            <hr>
+                            <div class="form-group">
+                                <!--is-required 增加星号 显示为必填-->
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">处方类别:</label>
+                                        <input type="text" class="styled-input" placeholder="请输入处方类别" name="genericName" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">经营范围:</label>
+                                        <input type="text" class="styled-input" placeholder="请输入经营范围" name="genericName" autocomplete="off"/>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">经营属性:</label>
+                                        <select name="managementAttribute"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">网络</option>
+                                            <option value="2">线下</option>
+                                            <option value="3">门店</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">销售属性:</label>
+                                        <select name="salesAttributes"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">网络</option>
+                                            <option value="2">线下</option>
+                                            <option value="3">电话</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-sm-12">
+                            <hr>
+                            <div class="form-group">
+                                <!--is-required 增加星号 显示为必填-->
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">是否可零售:</label>
+                                        <select name="sfkls"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">是否冷链药品:</label>
+                                        <select name="sfllyp"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <label class="control-label">是否特管药品:</label>
+                                        <select name="sftgyp"  class="styled-input">
+                                            <option value="">全部</option>
+                                            <option value="1">是</option>
+                                            <option value="0">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="col-sm-3">
+                                    <div class="input-group">
+                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
+                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
 
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>

health-system/src/main/resources/mapper/hygl/jf/SHyglJfglMemberpointsinfoMapper.xml

@@ -29,6 +29,10 @@
         <if test="pointsChangeTime !=null and pointsChangeTime !='' ">
             and pointsChangeTime = #{pointsChangeTime}
         </if>
+        <if test="query != null and query != ''">
+            AND (memberCardNo LIKE CONCAT('%', #{query}, '%')
+            OR phoneNumber = #{query})
+        </if>
     </select>
 
 

health-system/src/main/resources/mapper/hygl/jf/SHyglJfglOrderinfoMapper.xml

@@ -125,6 +125,9 @@
         <if test="verificationTime !=null and verificationTime !='' ">
             verificationTime = #{verificationTime},
         </if>
+            <if test="exchangeCode !=null and exchangeCode !='' ">
+                exchangeCode = #{exchangeCode},
+            </if>
         </trim>
         <if test="up != null and up!=''">
             <if test="id != null and id!=''">
@@ -204,6 +207,9 @@
         <if test="verificationTime !=null and verificationTime !='' ">
             verificationTime,
         </if>
+            <if test="exchangeCode !=null and exchangeCode !='' ">
+                exchangeCode,
+            </if>
         </trim>
         <trim prefix=" VALUES (" suffix=")" prefixOverrides="," suffixOverrides=",">
         <if test="orderID !=null and orderID !='' ">
@@ -263,6 +269,9 @@
         <if test="verificationTime !=null and verificationTime !='' ">
              #{verificationTime},
         </if>
+            <if test="exchangeCode !=null and exchangeCode !='' ">
+                #{exchangeCode},
+            </if>
         </trim>
 
     </insert>

health-system/src/main/resources/mapper/spgl/SSpglJfspProductinfoMapper.xml

@@ -29,6 +29,9 @@
         <if test="salesStatus !=null and salesStatus !='' ">
             and salesStatus = #{salesStatus}
         </if>
+        <if test="foregroundCategory !=null and foregroundCategory !='' ">
+            and foregroundCategory = #{foregroundCategory}
+        </if>
     </select>