update 会员管理,营销管理, 商品管理,质量管理,销售管修改页面和新怎页面字段调整理问题调整和xml中添加id条件查询

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

@@ -6,6 +6,7 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.PharmaceuticalService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,7 @@ public class SHyglEquitiesController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("benefitUniqueIdentifier", IdUtils.randomUUID());//随机生成 权益的唯一标识符
             Integer result = sHyglEquitiesService.addSHyglEquities(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

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

@@ -111,7 +111,7 @@ public class SHyglJfglOrderinfoController extends BaseController {
         return toAjax(integer);
     }
     /**
-     * 兑换记录表 数据修改
+     * 兑换记录表 核销商页面
      *
      * @return
      * @throws Exception
@@ -125,6 +125,7 @@ public class SHyglJfglOrderinfoController extends BaseController {
         mmap.putAll(pd);
         return prefix+ "/SHyglJfglOrderinfoHxSp";
     }
+
     /**
     * 兑换记录表 数据修改
     *

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

@@ -6,6 +6,7 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.PharmaceuticalService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@ public class SHyglJfglPointAdjustmentController extends BaseController {
     @ResponseBody
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
+        pd.put("applicationNumber", IdUtils.randomUUID());
+        pd.put("approvalStatus", "待审核");
+
         try {
             Integer result = sHyglJfglPointAdjustmentService.addSHyglJfglPointAdjustment(pd);
             if (result == 1) {

health-admin/src/main/java/com/bzd/web/controller/zlgl/SZlglCfdjSaleprescriptioninfoController.java

@@ -6,6 +6,7 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.PharmaceuticalService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,8 @@ public class SZlglCfdjSaleprescriptioninfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("saleDocumentNumber", IdUtils.randomUUID());//销售单号
+            pd.put("prescriptionNumber", IdUtils.randomUUID());//销售单号
             Integer result = sZlglCfdjSaleprescriptioninfoService.addSZlglCfdjSaleprescriptioninfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

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

@@ -8,10 +8,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SHyglEquities-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>权益的唯一标识符:</label>
-                <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符"  id="benefitUniqueIdentifier" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>权益的名称:</label>
                 <input name="benefitName" placeholder="权益的名称"  id="benefitName" class="styled-input" type="text">
@@ -52,9 +49,9 @@
                 <label>创建人的用户名:</label>
                 <input name="createdByUsername" placeholder="创建人的用户名"  id="createdByUsername" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生成时间:</label>
-                <input name="creationTime" placeholder="生成时间"  id="creationTime" class="styled-input" type="text">
+                <input name="creationTime" placeholder="生成时间"  id="creationTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>操作记录:</label>

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

@@ -13,13 +13,13 @@
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
-                <label>权益的唯一标识符:</label>
-                <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符" th:value="${benefitUniqueIdentifier}" class="styled-input" type="text">
+                <label>权益标识符:</label>
+                <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符" th:value="${benefitUniqueIdentifier}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
-                <label>权益的名称:</label>
-                <input name="benefitName" placeholder="权益的名称" th:value="${benefitName}" class="styled-input" type="text">
-            </div>
+            <label>权益的名称:</label>
+            <input name="benefitName" placeholder="权益的名称" th:value="${benefitName}" class="styled-input" type="text" >
+        </div>
             <div class="customize-form-group">
                 <label>权益的描述:</label>
                 <input name="benefitDescription" placeholder="权益的描述" th:value="${benefitDescription}" class="styled-input" type="text">
@@ -56,14 +56,11 @@
                 <label>创建人的用户名:</label>
                 <input name="createdByUsername" placeholder="创建人的用户名" th:value="${createdByUsername}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生成时间:</label>
-                <input name="creationTime" placeholder="生成时间" th:value="${creationTime}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>操作记录:</label>
-                <input name="operationLog" placeholder="操作记录" th:value="${operationLog}" class="styled-input" type="text">
+                <input name="creationTime" placeholder="生成时间" th:value="${creationTime}" class="time-input time-input2" type="text">
             </div>
+
         </div>
     </form>
 </div>

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

@@ -48,7 +48,7 @@
 
             <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> 新增
+                    <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> 修改

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

@@ -12,10 +12,10 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>权益的唯一标识符:</label>
-                        <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符" th:value="${benefitUniqueIdentifier}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>权益标识符:</label>
+                <input name="benefitUniqueIdentifier" placeholder="权益的唯一标识符" th:value="${benefitUniqueIdentifier}" class="styled-input" type="text" disabled="true">
+            </div>
                     <div class="customize-form-group">
                             <label>权益的名称:</label>
                         <input name="benefitName" placeholder="权益的名称" th:value="${benefitName}" class="styled-input" type="text">
@@ -56,9 +56,9 @@
                             <label>创建人的用户名:</label>
                         <input name="createdByUsername" placeholder="创建人的用户名" th:value="${createdByUsername}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>生成时间:</label>
-                        <input name="creationTime" placeholder="生成时间" th:value="${creationTime}" class="styled-input" type="text">
+                        <input name="creationTime" placeholder="生成时间" th:value="${creationTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>操作记录:</label>

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

@@ -8,10 +8,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SHyglHyxxJzyxMarketingplaninfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>计划的唯一标识符:</label>
-                <input name="planUniqueIdentifier" placeholder="计划的唯一标识符"  id="planUniqueIdentifier" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>计划的名称:</label>
                 <input name="planName" placeholder="计划的名称"  id="planName" class="styled-input" type="text">
@@ -28,13 +25,13 @@
                 <label>推广计划所使用的渠道:</label>
                 <input name="promotionChannels" placeholder="推广计划所使用的渠道"  id="promotionChannels" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>计划的开始日期:</label>
-                <input name="startDate" placeholder="计划的开始日期"  id="startDate" class="styled-input" type="text">
+                <input name="startDate" placeholder="计划的开始日期"  id="startDate" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>具体任务的执行时间:</label>
-                <input name="taskExecutionTime" placeholder="具体任务的执行时间"  id="taskExecutionTime" class="styled-input" type="text">
+                <input name="taskExecutionTime" placeholder="具体任务的执行时间"  id="taskExecutionTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>计划所属的分组名称:</label>

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

@@ -13,10 +13,6 @@
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
-                <label>计划的唯一标识符:</label>
-                <input name="planUniqueIdentifier" placeholder="计划的唯一标识符" th:value="${planUniqueIdentifier}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>计划的名称:</label>
                 <input name="planName" placeholder="计划的名称" th:value="${planName}" class="styled-input" type="text">
             </div>
@@ -32,13 +28,13 @@
                 <label>推广计划所使用的渠道:</label>
                 <input name="promotionChannels" placeholder="推广计划所使用的渠道" th:value="${promotionChannels}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>计划的开始日期:</label>
-                <input name="startDate" placeholder="计划的开始日期" th:value="${startDate}" class="styled-input" type="text">
+                <input name="startDate" placeholder="计划的开始日期" th:value="${startDate}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>具体任务的执行时间:</label>
-                <input name="taskExecutionTime" placeholder="具体任务的执行时间" th:value="${taskExecutionTime}" class="styled-input" type="text">
+                <input name="taskExecutionTime" placeholder="具体任务的执行时间" th:value="${taskExecutionTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>计划所属的分组名称:</label>

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

@@ -96,12 +96,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/SHyglHyxxJzyxMarketingplaninfoPageEdit.html

@@ -12,10 +12,7 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>计划的唯一标识符:</label>
-                        <input name="planUniqueIdentifier" placeholder="计划的唯一标识符" th:value="${planUniqueIdentifier}" class="styled-input" type="text">
-                    </div>
+
                     <div class="customize-form-group">
                             <label>计划的名称:</label>
                         <input name="planName" placeholder="计划的名称" th:value="${planName}" class="styled-input" type="text">
@@ -32,13 +29,13 @@
                             <label>推广计划所使用的渠道:</label>
                         <input name="promotionChannels" placeholder="推广计划所使用的渠道" th:value="${promotionChannels}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>计划的开始日期:</label>
-                        <input name="startDate" placeholder="计划的开始日期" th:value="${startDate}" class="styled-input" type="text">
+                        <input name="startDate" placeholder="计划的开始日期" th:value="${startDate}" class="time-input time-input2" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>具体任务的执行时间:</label>
-                        <input name="taskExecutionTime" placeholder="具体任务的执行时间" th:value="${taskExecutionTime}" class="styled-input" type="text">
+                        <input name="taskExecutionTime" placeholder="具体任务的执行时间" th:value="${taskExecutionTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>计划所属的分组名称:</label>

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

@@ -20,26 +20,22 @@
                 <label>占比:</label>
                 <input name="proportion" placeholder="占比"  id="proportion" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
                 <input name="creator" placeholder="创建人"  id="creator" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updateTime" placeholder="更新时间"  id="updateTime" class="styled-input" type="text">
+                <input name="updateTime" placeholder="更新时间"  id="updateTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
                 <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>删除标记（0: 未删除, 1: 已删除）:</label>
-                <input name="deleteFlag" placeholder="删除标记（0: 未删除, 1: 已删除）"  id="deleteFlag" class="styled-input" type="text">
-            </div>
         </div>
     </form>
 </div>

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

@@ -24,26 +24,23 @@
                 <label>占比:</label>
                 <input name="proportion" placeholder="占比" th:value="${proportion}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
                 <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
+                <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
                 <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>删除标记（0: 未删除, 1: 已删除）:</label>
-                <input name="deleteFlag" placeholder="删除标记（0: 未删除, 1: 已删除）" th:value="${deleteFlag}" class="styled-input" type="text">
-            </div>
+
         </div>
     </form>
 </div>

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

@@ -28,7 +28,7 @@
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>疾病名称: </label>
-                            <input type="text" class="styled-input" name="diseaseName" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="疾病名称" name="diseaseName" autocomplete="off"/>
                         </div>
                     </div>
                 </form>

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

@@ -24,26 +24,23 @@
                             <label>占比:</label>
                         <input name="proportion" placeholder="占比" th:value="${proportion}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>创建人:</label>
                         <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>更新时间:</label>
-                        <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
+                        <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>状态:</label>
                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
-                            <label>删除标记（0: 未删除, 1: 已删除）:</label>
-                        <input name="deleteFlag" placeholder="删除标记（0: 未删除, 1: 已删除）" th:value="${deleteFlag}" class="styled-input" type="text">
-                    </div>
+
         </div>
     </form>
 </div>

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

@@ -18,7 +18,7 @@
             </div>
             <div class="customize-form-group">
                 <label>手机号码:</label>
-                <input name="phoneNumber" placeholder="手机号码"  id="phoneNumber" class="styled-input" type="text">
+                <input name="phoneNumber" placeholder="手机号码"  id="phoneNumber" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>领取门店:</label>
@@ -30,15 +30,15 @@
             </div>
             <div class="customize-form-group">
                 <label>积分调整:</label>
-                <input name="pointsAdjustment" placeholder="积分调整"  id="pointsAdjustment" class="styled-input" type="text">
+                <input name="pointsAdjustment" placeholder="积分调整"  id="pointsAdjustment" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>积分调整原因:</label>
                 <input name="pointsAdjustmentReason" placeholder="积分调整原因"  id="pointsAdjustmentReason" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>积分变动时间:</label>
-                <input name="pointsChangeTime" placeholder="积分变动时间"  id="pointsChangeTime" class="styled-input" type="text">
+                <input name="pointsChangeTime" placeholder="积分变动时间"  id="pointsChangeTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -22,7 +22,7 @@
             </div>
             <div class="customize-form-group">
                 <label>手机号码:</label>
-                <input name="phoneNumber" placeholder="手机号码" th:value="${phoneNumber}" class="styled-input" type="text">
+                <input name="phoneNumber" placeholder="手机号码" th:value="${phoneNumber}" class="styled-input"  type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>领取门店:</label>
@@ -34,15 +34,15 @@
             </div>
             <div class="customize-form-group">
                 <label>积分调整:</label>
-                <input name="pointsAdjustment" placeholder="积分调整" th:value="${pointsAdjustment}" class="styled-input" type="text">
+                <input name="pointsAdjustment" placeholder="积分调整" th:value="${pointsAdjustment}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>积分调整原因:</label>
                 <input name="pointsAdjustmentReason" placeholder="积分调整原因" th:value="${pointsAdjustmentReason}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>积分变动时间:</label>
-                <input name="pointsChangeTime" placeholder="积分变动时间" th:value="${pointsChangeTime}" class="styled-input" type="text">
+                <input name="pointsChangeTime" placeholder="积分变动时间" th:value="${pointsChangeTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -98,7 +98,7 @@
             columns: [{
                 checkbox: true
             },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+                  { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'memberCardNo', title: '会员卡号', align: 'center' },
                     { field: 'memberName', title: '会员姓名', align: 'center' },
                     { field: 'phoneNumber', title: '手机号码', align: 'center' },
@@ -138,6 +138,7 @@
         _refresh();
     }
     function edit_page(id){
+        debugger
         table.set();
         var url = "/404.html";
         if ($.common.isNotEmpty(id)) {

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

@@ -22,7 +22,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>手机号码:</label>
-                        <input name="phoneNumber" placeholder="手机号码" th:value="${phoneNumber}" class="styled-input" type="text">
+                        <input name="phoneNumber" placeholder="手机号码" th:value="${phoneNumber}" class="styled-input"  type="number" maxlength="11">
                     </div>
                     <div class="customize-form-group">
                             <label>领取门店:</label>
@@ -34,15 +34,15 @@
                     </div>
                     <div class="customize-form-group">
                             <label>积分调整:</label>
-                        <input name="pointsAdjustment" placeholder="积分调整" th:value="${pointsAdjustment}" class="styled-input" type="text">
+                        <input name="pointsAdjustment" placeholder="积分调整" th:value="${pointsAdjustment}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>积分调整原因:</label>
                         <input name="pointsAdjustmentReason" placeholder="积分调整原因" th:value="${pointsAdjustmentReason}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>积分变动时间:</label>
-                        <input name="pointsChangeTime" placeholder="积分变动时间" th:value="${pointsChangeTime}" class="styled-input" type="text">
+                        <input name="pointsChangeTime" placeholder="积分变动时间" th:value="${pointsChangeTime}" class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>

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

@@ -8,10 +8,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SHyglJfglOrderinfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>订单ID:</label>
-                <input name="orderID" placeholder="订单ID"  id="orderID" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>商品名:</label>
                 <input name="productName" placeholder="商品名"  id="productName" class="styled-input" type="text">
@@ -34,7 +31,7 @@
             </div>
             <div class="customize-form-group">
                 <label>兑换数量:</label>
-                <input name="redemptionQuantity" placeholder="兑换数量"  id="redemptionQuantity" class="styled-input" type="text">
+                <input name="redemptionQuantity" placeholder="兑换数量"  id="redemptionQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>兑换渠道:</label>
@@ -48,9 +45,9 @@
                 <label>兑换状态:</label>
                 <input name="redemptionStatus" placeholder="兑换状态"  id="redemptionStatus" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>会员手机号/卡号:</label>
@@ -80,9 +77,9 @@
                 <label>核销人:</label>
                 <input name="verifiedBy" placeholder="核销人"  id="verifiedBy" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>核销时间:</label>
-                <input name="verificationTime" placeholder="核销时间"  id="verificationTime" class="styled-input" type="text">
+                <input name="verificationTime" placeholder="核销时间"  id="verificationTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>特价订单:</label>
@@ -94,7 +91,7 @@
             </div>
             <div class="customize-form-group">
                 <label>积分:</label>
-                <input name="points" placeholder="积分"  id="points" class="styled-input" type="text">
+                <input name="points" placeholder="积分"  id="points" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -12,10 +12,7 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-            <div class="customize-form-group">
-                <label>订单ID:</label>
-                <input name="orderID" placeholder="订单ID" th:value="${orderID}" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>商品名:</label>
                 <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
@@ -84,9 +81,9 @@
                 <label>核销人:</label>
                 <input name="verifiedBy" placeholder="核销人" th:value="${verifiedBy}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>核销时间:</label>
-                <input name="verificationTime" placeholder="核销时间" th:value="${verificationTime}" class="styled-input" type="text">
+                <input name="verificationTime" placeholder="核销时间" th:value="${verificationTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>特价订单:</label>
@@ -98,7 +95,7 @@
             </div>
             <div class="customize-form-group">
                 <label>积分:</label>
-                <input name="points" placeholder="积分" th:value="${points}" class="styled-input" type="text">
+                <input name="points" placeholder="积分" th:value="${points}" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -5,7 +5,7 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-user-resetPwd">
+    <form class="customize-search-form" id="form-SHyglJfglOrderinfoHxSp-Hx">
         <div class="form-group">
             <label class="col-sm-3 control-label">兑换码：</label>
             <div class="col-sm-8">
@@ -17,33 +17,28 @@
 <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());
+        if ($.validate.form()) {
+            add();
         }
     }
+
+    function add() {
+        var data = $("#form-SHyglJfglOrderinfoHxSp-Hx").serializeArray();
+        $.ajax({
+            cache : true,
+            type : "POST",
+            url : ctx + "hygl/?/?",//待完善接口
+            data : data,
+            async : false,
+            error : function(request) {
+                $.modal.alertError("系统错误");
+            },
+            success : function(data) {
+                $.operate.successCallback(data);
+            }
+        });
+    }
 </script>
 </body>
 

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

@@ -69,16 +69,17 @@
                                     ></option>
                                 </select>
                         </div>
+                        <div class="customize-form-group">
+                            <label>手机号:</label>
+                            <input type="text" class="styled-input"  placeholder="请输入手机号" name="memberPhoneOrCardNo" autocomplete="off"/>
+                        </div>
                         <div class="customize-form-group select-time">
                             <label for="startTime">下单时间:</label>
                             <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
                             <span>-</span>
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
                         </div>
-                        <div class="customize-form-group">
-                            <label>手机号:</label>
-                            <input type="text" class="styled-input"  placeholder="请输入手机号" name="memberPhoneOrCardNo" autocomplete="off"/>
-                        </div>
+
                         <div class="customize-form-group">
                             <label>积分区间:</label>
                             <input type="number" style="width: 92px;" class="styled-input"  placeholder="最大" name="pointsMax" autocomplete="off"/>

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

@@ -13,10 +13,6 @@
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
-                            <label>订单ID:</label>
-                        <input name="orderID" placeholder="订单ID" th:value="${orderID}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
                             <label>商品名:</label>
                         <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
                     </div>
@@ -84,9 +80,9 @@
                             <label>核销人:</label>
                         <input name="verifiedBy" placeholder="核销人" th:value="${verifiedBy}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>核销时间:</label>
-                        <input name="verificationTime" placeholder="核销时间" th:value="${verificationTime}" class="styled-input" type="text">
+                        <input name="verificationTime" placeholder="核销时间" th:value="${verificationTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>特价订单:</label>

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

@@ -9,40 +9,28 @@
     <form id="form-SHyglJfglPointAdjustment-add" class="customize-search-form">
         <div class="customize-form-group-container">
             <div class="customize-form-group">
-                <label>申请单编号:</label>
-                <input name="applicationNumber" placeholder="申请单编号"  id="applicationNumber" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>调整数量:</label>
-                <input name="adjustmentQuantity" placeholder="调整数量"  id="adjustmentQuantity" class="styled-input" type="text">
+                <input name="adjustmentQuantity" placeholder="调整数量"  id="adjustmentQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>申请人:</label>
                 <input name="applicant" placeholder="申请人"  id="applicant" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>申请时间:</label>
-                <input name="applicationTime" placeholder="申请时间"  id="applicationTime" class="styled-input" type="text">
+                <input name="applicationTime" placeholder="申请时间"  id="applicationTime"  class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>审批人:</label>
                 <input name="approver" placeholder="审批人"  id="approver" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>审批时间:</label>
-                <input name="approvalTime" placeholder="审批时间"  id="approvalTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>审批状态:</label>
-                <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回"  id="approvalStatus" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>会员卡号:</label>
                 <input name="memberCardNumber" placeholder="会员卡号"  id="memberCardNumber" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>会员手机号:</label>
-                <input name="memberPhone" placeholder="会员手机号"  id="memberPhone" class="styled-input" type="text">
+                <input name="memberPhone" placeholder="会员手机号"  id="memberPhone" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>会员姓名:</label>
@@ -50,7 +38,7 @@
             </div>
             <div class="customize-form-group">
                 <label>积分调整:</label>
-                <input name="pointsAdjusted" placeholder="积分调整"  id="pointsAdjusted" class="styled-input" type="text">
+                <input name="pointsAdjusted" placeholder="积分调整"  id="pointsAdjusted" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调整原因:</label>

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

@@ -12,29 +12,26 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-            <div class="customize-form-group">
-                <label>申请单编号:</label>
-                <input name="applicationNumber" placeholder="申请单编号" th:value="${applicationNumber}" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>调整数量:</label>
-                <input name="adjustmentQuantity" placeholder="调整数量" th:value="${adjustmentQuantity}" class="styled-input" type="text">
+                <input name="adjustmentQuantity" placeholder="调整数量" th:value="${adjustmentQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>申请人:</label>
-                <input name="applicant" placeholder="申请人" th:value="${applicant}" class="styled-input" type="text">
+                <input name="applicant" placeholder="申请人" th:value="${applicant}"   class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group  select-time ">
                 <label>申请时间:</label>
-                <input name="applicationTime" placeholder="申请时间" th:value="${applicationTime}" class="styled-input" type="text">
+                <input name="applicationTime" placeholder="申请时间" th:value="${applicationTime}" style="width: auto" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>审批人:</label>
                 <input name="approver" placeholder="审批人" th:value="${approver}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>审批时间:</label>
-                <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="styled-input" type="text">
+                <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>审批状态:</label>
@@ -46,7 +43,7 @@
             </div>
             <div class="customize-form-group">
                 <label>会员手机号:</label>
-                <input name="memberPhone" placeholder="会员手机号" th:value="${memberPhone}" class="styled-input" type="text">
+                <input name="memberPhone" placeholder="会员手机号" th:value="${memberPhone}" type="number" class="styled-input" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>会员姓名:</label>
@@ -54,7 +51,7 @@
             </div>
             <div class="customize-form-group">
                 <label>积分调整:</label>
-                <input name="pointsAdjusted" placeholder="积分调整" th:value="${pointsAdjusted}" class="styled-input" type="text">
+                <input name="pointsAdjusted" placeholder="积分调整" th:value="${pointsAdjusted}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调整原因:</label>

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

@@ -34,7 +34,7 @@
                                 <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 th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
                                     ></option>
                                 </select>
                         </div>
@@ -43,10 +43,10 @@
                             <input type="text" class="styled-input" name="approver" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group select-time">
-                            <label for="startTime">申请时间:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label>申请时间:</label>
+                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime">
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime">
                         </div>
                     </div>
                 </form>

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

@@ -24,19 +24,20 @@
                             <label>申请人:</label>
                         <input name="applicant" placeholder="申请人" th:value="${applicant}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
+                        <label>审批时间:</label>
+                        <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="time-input time-input2" type="text">
+                    </div>
+
+                    <div class="customize-form-group select-time">
                             <label>申请时间:</label>
-                        <input name="applicationTime" placeholder="申请时间" th:value="${applicationTime}" class="styled-input" type="text">
+                        <input name="applicationTime" placeholder="申请时间" th:value="${applicationTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>审批人:</label>
                         <input name="approver" placeholder="审批人" th:value="${approver}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                            <label>审批时间:</label>
-                        <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
                             <label>审批状态:</label>
                         <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回" th:value="${approvalStatus}" class="styled-input" type="text">
                     </div>
@@ -54,7 +55,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>积分调整:</label>
-                        <input name="pointsAdjusted" placeholder="积分调整" th:value="${pointsAdjusted}" class="styled-input" type="text">
+                        <input name="pointsAdjusted" placeholder="积分调整" th:value="${pointsAdjusted}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>调整原因:</label>

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

@@ -9,32 +9,38 @@
     <form id="form-SHyglHyyxMouldmessage-add" class="customize-search-form">
         <div class="customize-form-group-container">
             <div class="customize-form-group">
-                <label>短信名称:</label>
-                <input name="smsName" placeholder="短信名称"  id="smsName" class="styled-input" type="text">
+                <label class="col-sm-4 control-label is-required">短信名称:</label>
+                <input name="smsName" placeholder="短信名称"  id="smsName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
-                <label>短信平台:</label>
-                <input name="smsPlatform" placeholder="短信平台"  id="smsPlatform" class="styled-input" type="text">
+                <label class="col-sm-4 control-label is-required">短信平台:</label>
+                <input name="smsPlatform" placeholder="短信平台名称"  id="smsPlatform" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
-                <label>三方模版ID:</label>
-                <input name="thirdPartyTemplateId" placeholder="三方模版ID"  id="thirdPartyTemplateId" class="styled-input" type="text">
+                <label  class="col-sm-4 control-label is-required">三方模版ID:</label>
+                <input name="thirdPartyTemplateId" placeholder="三方模版ID"  id="thirdPartyTemplateId" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
-                <label>模板类型:</label>
-                <input name="templateType" placeholder="模板类型"  id="templateType" class="styled-input" type="text">
+                <label class="col-sm-4 control-label is-required">模板类型:</label>
+                <input name="templateType" placeholder="模板类型"  id="templateType" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
-                <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <label class="col-sm-4 control-label is-required">短信状态</label>
+                <select name="status"  th:with="type=${@dict.getType('sys_select_yhgl_hyyx_dxzt')}" class="styled-input" required>
+                    <option value="">全部</option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
+                    ></option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>短信内容:</label>
-                <input name="smsContent" placeholder="短信内容"  id="smsContent" class="styled-input" type="text">
+                <textarea name="smsContent" rows="10" cols="30" placeholder="短信内容" class="styled-input">
+                    在这里输入你的文本...
+                </textarea>
             </div>
             <div class="customize-form-group">
                 <label>短信变量:</label>

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

@@ -29,16 +29,23 @@
                 <input name="templateType" placeholder="模板类型" th:value="${templateType}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态:</label>
-                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                <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>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
             </div>
+
             <div class="customize-form-group">
                 <label>短信内容:</label>
-                <input name="smsContent" placeholder="短信内容" th:value="${smsContent}" class="styled-input" type="text">
+                <textarea name="smsContent" rows="10" cols="30" placeholder="短信内容" th:value="${smsContent}" class="styled-input">
+                    在这里输入你的文本...
+                </textarea>
             </div>
             <div class="customize-form-group">
                 <label>短信变量:</label>

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

@@ -32,9 +32,9 @@
                             <label>状态:</label>
                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>短信内容:</label>

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

@@ -18,27 +18,27 @@
             </div>
             <div class="customize-form-group">
                 <label>总人数:</label>
-                <input name="totalPeopleCount" placeholder="总人数"  id="totalPeopleCount" class="styled-input" type="text">
+                <input name="totalPeopleCount" placeholder="总人数"  id="totalPeopleCount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成功人数:</label>
-                <input name="successPeopleCount" placeholder="成功人数"  id="successPeopleCount" class="styled-input" type="text">
+                <input name="successPeopleCount" placeholder="成功人数"  id="successPeopleCount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>失败人数:</label>
-                <input name="failurePeopleCount" placeholder="失败人数"  id="failurePeopleCount" class="styled-input" type="text">
+                <input name="failurePeopleCount" placeholder="失败人数"  id="failurePeopleCount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>更新方式:</label>
                 <input name="updateMethod" placeholder="更新方式"  id="updateMethod" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updateTime" placeholder="更新时间"  id="updateTime" class="styled-input" type="text">
+                <input name="updateTime" placeholder="更新时间"  id="updateTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>

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

@@ -22,27 +22,27 @@
             </div>
             <div class="customize-form-group">
                 <label>总人数:</label>
-                <input name="totalPeopleCount" placeholder="总人数" th:value="${totalPeopleCount}" class="styled-input" type="text">
+                <input name="totalPeopleCount" placeholder="总人数" th:value="${totalPeopleCount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成功人数:</label>
-                <input name="successPeopleCount" placeholder="成功人数" th:value="${successPeopleCount}" class="styled-input" type="text">
+                <input name="successPeopleCount" placeholder="成功人数" th:value="${successPeopleCount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>失败人数:</label>
-                <input name="failurePeopleCount" placeholder="失败人数" th:value="${failurePeopleCount}" class="styled-input" type="text">
+                <input name="failurePeopleCount" placeholder="失败人数" th:value="${failurePeopleCount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>更新方式:</label>
                 <input name="updateMethod" placeholder="更新方式" th:value="${updateMethod}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
+                <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>

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

@@ -22,27 +22,27 @@
                     </div>
                     <div class="customize-form-group">
                             <label>总人数:</label>
-                        <input name="totalPeopleCount" placeholder="总人数" th:value="${totalPeopleCount}" class="styled-input" type="text">
+                        <input name="totalPeopleCount" placeholder="总人数" th:value="${totalPeopleCount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>成功人数:</label>
-                        <input name="successPeopleCount" placeholder="成功人数" th:value="${successPeopleCount}" class="styled-input" type="text">
+                        <input name="successPeopleCount" placeholder="成功人数" th:value="${successPeopleCount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>失败人数:</label>
-                        <input name="failurePeopleCount" placeholder="失败人数" th:value="${failurePeopleCount}" class="styled-input" type="text">
+                        <input name="failurePeopleCount" placeholder="失败人数" th:value="${failurePeopleCount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>更新方式:</label>
                         <input name="updateMethod" placeholder="更新方式" th:value="${updateMethod}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>更新时间:</label>
-                        <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="styled-input" type="text">
+                        <input name="updateTime" placeholder="更新时间" th:value="${updateTime}" class="time-input time-input2" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>创建人:</label>

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

@@ -28,7 +28,7 @@
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>门店名称: </label>
-                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入门店名称" name="storeName" autocomplete="off"/>
                         </div>
                     </div>
                 </form>

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

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品图片:</label>
@@ -18,19 +18,19 @@
             </div>
             <div class="customize-form-group">
                 <label>销售价:</label>
-                <input name="salesPrice" placeholder="销售价"  id="salesPrice" class="styled-input" type="text">
+                <input name="salesPrice" placeholder="销售价"  id="salesPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>兑换价格:</label>
-                <input name="exchangePrice" placeholder="兑换价格"  id="exchangePrice" class="styled-input" type="text">
+                <input name="exchangePrice" placeholder="兑换价格"  id="exchangePrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>库存:</label>
-                <input name="stock" placeholder="库存"  id="stock" class="styled-input" type="text">
+                <input name="stock" placeholder="库存"  id="stock" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>商品类型:</label>

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

@@ -14,7 +14,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品图片:</label>
@@ -22,19 +22,19 @@
             </div>
             <div class="customize-form-group">
                 <label>销售价:</label>
-                <input name="salesPrice" placeholder="销售价" th:value="${salesPrice}" class="styled-input" type="text">
+                <input name="salesPrice" placeholder="销售价" th:value="${salesPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>兑换价格:</label>
-                <input name="exchangePrice" placeholder="兑换价格" th:value="${exchangePrice}" class="styled-input" type="text">
+                <input name="exchangePrice" placeholder="兑换价格" th:value="${exchangePrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>库存:</label>
-                <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="text">
+                <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>商品类型:</label>

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

@@ -32,11 +32,12 @@
                         </div>
                         <div class="customize-form-group">
                                 <label>前台类目</label>
-                                <select name="foregroundCategory"  class="styled-input">
+                                <select name="productType"  class="styled-input">
                                     <option value="">全部</option>
-                                    <option value="1">类目1</option>
-                                    <option value="2">类目2</option>
-                                    <option value="3">类目3</option>
+                                    <option value="感冒藥">感冒药</option>
+                                    <option value="胃药">胃药</option>
+                                    <option value="神经科">神经科</option>
+                                    <option value="其他">其他</option>
                                 </select>
                         </div>
                     </div>

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

@@ -14,7 +14,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
                             <label>商品名称:</label>
-                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text" required>
                     </div>
                     <div class="customize-form-group">
                             <label>商品图片:</label>
@@ -22,19 +22,19 @@
                     </div>
                     <div class="customize-form-group">
                             <label>销售价:</label>
-                        <input name="salesPrice" placeholder="销售价" th:value="${salesPrice}" class="styled-input" type="text">
+                        <input name="salesPrice" placeholder="销售价" th:value="${salesPrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>兑换价格:</label>
-                        <input name="exchangePrice" placeholder="兑换价格" th:value="${exchangePrice}" class="styled-input" type="text">
+                        <input name="exchangePrice" placeholder="兑换价格" th:value="${exchangePrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>库存:</label>
-                        <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="text">
+                        <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="number">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>商品类型:</label>

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

@@ -18,7 +18,7 @@
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品类目:</label>

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

@@ -14,7 +14,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>门店名称:</label>
-                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品编码:</label>

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

@@ -39,17 +39,17 @@
                                 <label>可售状态</label>
                                 <select name="saleStatus"  class="styled-input">
                                     <option value="">全部</option>
-                                    <option value="1">可售</option>
-                                    <option value="2">停售</option>
+                                    <option value="可售">可售</option>
+                                    <option value="停售">停售</option>
                                 </select>
                         </div>
                         <div class="customize-form-group">
                                 <label>营销分类</label>
                                 <select name="marketingType"  class="styled-input">
                                     <option value="">全部</option>
-                                    <option value="1">网络营销</option>
-                                    <option value="2">线下营销</option>
-                                    <option value="3">电话营销</option>
+                                    <option value="网络营销">网络营销</option>
+                                    <option value="线下营销">线下营销</option>
+                                    <option value="电话营销">电话营销</option>
                                 </select>
                         </div>
                     </div>

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

@@ -14,7 +14,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
                             <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text" required>
                     </div>
                     <div class="customize-form-group">
                             <label>商品编码:</label>

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

@@ -18,7 +18,7 @@
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>规格:</label>
@@ -38,7 +38,7 @@
             </div>
             <div class="customize-form-group">
                 <label>零售价（元）:</label>
-                <input name="retailPrice" placeholder="零售价（元）"  id="retailPrice" class="styled-input" type="text">
+                <input name="retailPrice" placeholder="零售价（元）"  id="retailPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>禁止调拨:</label>
@@ -82,7 +82,7 @@
             </div>
             <div class="customize-form-group">
                 <label>最小陈列量:</label>
-                <input name="minimumDisplayQuantity" placeholder="最小陈列量"  id="minimumDisplayQuantity" class="styled-input" type="text">
+                <input name="minimumDisplayQuantity" placeholder="最小陈列量"  id="minimumDisplayQuantity" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -42,7 +42,7 @@
             </div>
             <div class="customize-form-group">
                 <label>零售价（元）:</label>
-                <input name="retailPrice" placeholder="零售价（元）" th:value="${retailPrice}" class="styled-input" type="text">
+                <input name="retailPrice" placeholder="零售价（元）" th:value="${retailPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>禁止调拨:</label>
@@ -86,7 +86,7 @@
             </div>
             <div class="customize-form-group">
                 <label>最小陈列量:</label>
-                <input name="minimumDisplayQuantity" placeholder="最小陈列量" th:value="${minimumDisplayQuantity}" class="styled-input" type="text">
+                <input name="minimumDisplayQuantity" placeholder="最小陈列量" th:value="${minimumDisplayQuantity}" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -124,7 +124,7 @@
             </div>
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
+                    <i class="fa fa-download"></i> 导出(暂不可用)
                 </a>
             </div>
             <div class="col-sm-12 select-table table-striped">

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

@@ -42,7 +42,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>零售价（元）:</label>
-                        <input name="retailPrice" placeholder="零售价（元）" th:value="${retailPrice}" class="styled-input" type="text">
+                        <input name="retailPrice" placeholder="零售价（元）" th:value="${retailPrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>禁止调拨:</label>
@@ -86,7 +86,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>最小陈列量:</label>
-                        <input name="minimumDisplayQuantity" placeholder="最小陈列量" th:value="${minimumDisplayQuantity}" class="styled-input" type="text">
+                        <input name="minimumDisplayQuantity" placeholder="最小陈列量" th:value="${minimumDisplayQuantity}" class="styled-input" type="number">
                     </div>
         </div>
     </form>

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

@@ -14,11 +14,11 @@
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品价格:</label>
-                <input name="productPrice" placeholder="商品价格"  id="productPrice" class="styled-input" type="text">
+                <input name="productPrice" placeholder="商品价格"  id="productPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>支付分门槛:</label>

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

@@ -22,7 +22,7 @@
             </div>
             <div class="customize-form-group">
                 <label>商品价格:</label>
-                <input name="productPrice" placeholder="商品价格" th:value="${productPrice}" class="styled-input" type="text">
+                <input name="productPrice" placeholder="商品价格" th:value="${productPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>支付分门槛:</label>

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

@@ -22,7 +22,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>商品价格:</label>
-                        <input name="productPrice" placeholder="商品价格" th:value="${productPrice}" class="styled-input" type="text">
+                        <input name="productPrice" placeholder="商品价格" th:value="${productPrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>支付分门槛:</label>

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

@@ -14,7 +14,7 @@
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
-                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>规格:</label>
@@ -38,7 +38,7 @@
             </div>
             <div class="customize-form-group">
                 <label>零售价/元:</label>
-                <input name="retailPrice" placeholder="零售价/元"  id="retailPrice" class="styled-input" type="text">
+                <input name="retailPrice" placeholder="零售价/元"  id="retailPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>经营属性:</label>
@@ -50,15 +50,15 @@
             </div>
             <div class="customize-form-group">
                 <label>最低限价:</label>
-                <input name="minimumPrice" placeholder="最低限价"  id="minimumPrice" class="styled-input" type="text">
+                <input name="minimumPrice" placeholder="最低限价"  id="minimumPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>生产许可证号/备案凭证编号:</label>
                 <input name="productionLicenseNumber" placeholder="生产许可证号/备案凭证编号"  id="productionLicenseNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生产许可证号有效期:</label>
-                <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期"  id="productionLicenseValidUntil" class="styled-input" type="text">
+                <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期"  id="productionLicenseValidUntil" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>拆零单位:</label>
@@ -96,41 +96,41 @@
                 <label>批准文号:</label>
                 <input name="approvalNumber" placeholder="批准文号"  id="approvalNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号有效期:</label>
-                <input name="approvalNumberValidUntil" placeholder="批准文号有效期"  id="approvalNumberValidUntil" class="styled-input" type="text">
+                <input name="approvalNumberValidUntil" placeholder="批准文号有效期"  id="approvalNumberValidUntil" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>批准文号2:</label>
                 <input name="approvalNumberTwo" placeholder="批准文号2"  id="approvalNumberTwo" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号2有效期:</label>
-                <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期"  id="approvalNumberTwoValidUntil" class="styled-input" type="text">
+                <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期"  id="approvalNumberTwoValidUntil" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>批准文号3:</label>
                 <input name="approvalNumberThree" placeholder="批准文号3"  id="approvalNumberThree" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号3有效期:</label>
-                <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期"  id="approvalNumberThreeValidUntil" class="styled-input" type="text">
+                <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期"  id="approvalNumberThreeValidUntil" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>注册证号:</label>
                 <input name="registrationNumber" placeholder="注册证号"  id="registrationNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>注册证号有效期:</label>
-                <input name="registrationNumberValidUntil" placeholder="注册证号有效期"  id="registrationNumberValidUntil" class="styled-input" type="text">
+                <input name="registrationNumberValidUntil" placeholder="注册证号有效期"  id="registrationNumberValidUntil" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>注册证号2:</label>
                 <input name="registrationNumberTwo" placeholder="注册证号2"  id="registrationNumberTwo" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>注册证号2有效期:</label>
-                <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期"  id="registrationNumberTwoValidUntil" class="styled-input" type="text">
+                <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期"  id="registrationNumberTwoValidUntil" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -42,7 +42,7 @@
             </div>
             <div class="customize-form-group">
                 <label>零售价/元:</label>
-                <input name="retailPrice" placeholder="零售价/元" th:value="${retailPrice}" class="styled-input" type="text">
+                <input name="retailPrice" placeholder="零售价/元" th:value="${retailPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>经营属性:</label>
@@ -54,15 +54,15 @@
             </div>
             <div class="customize-form-group">
                 <label>最低限价:</label>
-                <input name="minimumPrice" placeholder="最低限价" th:value="${minimumPrice}" class="styled-input" type="text">
+                <input name="minimumPrice" placeholder="最低限价" th:value="${minimumPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>生产许可证号/备案凭证编号:</label>
                 <input name="productionLicenseNumber" placeholder="生产许可证号/备案凭证编号" th:value="${productionLicenseNumber}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生产许可证号有效期:</label>
-                <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期" th:value="${productionLicenseValidUntil}" class="styled-input" type="text">
+                <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期" th:value="${productionLicenseValidUntil}"class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>拆零单位:</label>
@@ -100,41 +100,41 @@
                 <label>批准文号:</label>
                 <input name="approvalNumber" placeholder="批准文号" th:value="${approvalNumber}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号有效期:</label>
-                <input name="approvalNumberValidUntil" placeholder="批准文号有效期" th:value="${approvalNumberValidUntil}" class="styled-input" type="text">
+                <input name="approvalNumberValidUntil" placeholder="批准文号有效期" th:value="${approvalNumberValidUntil}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>批准文号2:</label>
                 <input name="approvalNumberTwo" placeholder="批准文号2" th:value="${approvalNumberTwo}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号2有效期:</label>
-                <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期" th:value="${approvalNumberTwoValidUntil}" class="styled-input" type="text">
+                <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期" th:value="${approvalNumberTwoValidUntil}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>批准文号3:</label>
                 <input name="approvalNumberThree" placeholder="批准文号3" th:value="${approvalNumberThree}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>批准文号3有效期:</label>
-                <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期" th:value="${approvalNumberThreeValidUntil}" class="styled-input" type="text">
+                <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期" th:value="${approvalNumberThreeValidUntil}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>注册证号:</label>
                 <input name="registrationNumber" placeholder="注册证号" th:value="${registrationNumber}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>注册证号有效期:</label>
-                <input name="registrationNumberValidUntil" placeholder="注册证号有效期" th:value="${registrationNumberValidUntil}" class="styled-input" type="text">
+                <input name="registrationNumberValidUntil" placeholder="注册证号有效期" th:value="${registrationNumberValidUntil}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>注册证号2:</label>
                 <input name="registrationNumberTwo" placeholder="注册证号2" th:value="${registrationNumberTwo}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>注册证号2有效期:</label>
-                <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期" th:value="${registrationNumberTwoValidUntil}" class="styled-input" type="text">
+                <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期" th:value="${registrationNumberTwoValidUntil}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -18,7 +18,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>商品名称:</label>
-                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text" required>
                     </div>
                     <div class="customize-form-group">
                             <label>规格:</label>
@@ -42,7 +42,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>零售价/元:</label>
-                        <input name="retailPrice" placeholder="零售价/元" th:value="${retailPrice}" class="styled-input" type="text">
+                        <input name="retailPrice" placeholder="零售价/元" th:value="${retailPrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>经营属性:</label>
@@ -54,15 +54,15 @@
                     </div>
                     <div class="customize-form-group">
                             <label>最低限价:</label>
-                        <input name="minimumPrice" placeholder="最低限价" th:value="${minimumPrice}" class="styled-input" type="text">
+                        <input name="minimumPrice" placeholder="最低限价" th:value="${minimumPrice}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>生产许可证号/备案凭证编号:</label>
                         <input name="productionLicenseNumber" placeholder="生产许可证号/备案凭证编号" th:value="${productionLicenseNumber}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>生产许可证号有效期:</label>
-                        <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期" th:value="${productionLicenseValidUntil}" class="styled-input" type="text">
+                        <input name="productionLicenseValidUntil" placeholder="生产许可证号有效期" th:value="${productionLicenseValidUntil}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>拆零单位:</label>
@@ -100,41 +100,41 @@
                             <label>批准文号:</label>
                         <input name="approvalNumber" placeholder="批准文号" th:value="${approvalNumber}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>批准文号有效期:</label>
-                        <input name="approvalNumberValidUntil" placeholder="批准文号有效期" th:value="${approvalNumberValidUntil}" class="styled-input" type="text">
+                        <input name="approvalNumberValidUntil" placeholder="批准文号有效期" th:value="${approvalNumberValidUntil}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>批准文号2:</label>
                         <input name="approvalNumberTwo" placeholder="批准文号2" th:value="${approvalNumberTwo}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>批准文号2有效期:</label>
-                        <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期" th:value="${approvalNumberTwoValidUntil}" class="styled-input" type="text">
+                        <input name="approvalNumberTwoValidUntil" placeholder="批准文号2有效期" th:value="${approvalNumberTwoValidUntil}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>批准文号3:</label>
                         <input name="approvalNumberThree" placeholder="批准文号3" th:value="${approvalNumberThree}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>批准文号3有效期:</label>
-                        <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期" th:value="${approvalNumberThreeValidUntil}" class="styled-input" type="text">
+                        <input name="approvalNumberThreeValidUntil" placeholder="批准文号3有效期" th:value="${approvalNumberThreeValidUntil}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>注册证号:</label>
                         <input name="registrationNumber" placeholder="注册证号" th:value="${registrationNumber}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>注册证号有效期:</label>
-                        <input name="registrationNumberValidUntil" placeholder="注册证号有效期" th:value="${registrationNumberValidUntil}" class="styled-input" type="text">
+                        <input name="registrationNumberValidUntil" placeholder="注册证号有效期" th:value="${registrationNumberValidUntil}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>注册证号2:</label>
                         <input name="registrationNumberTwo" placeholder="注册证号2" th:value="${registrationNumberTwo}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>注册证号2有效期:</label>
-                        <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期" th:value="${registrationNumberTwoValidUntil}" class="styled-input" type="text">
+                        <input name="registrationNumberTwoValidUntil" placeholder="注册证号2有效期" th:value="${registrationNumberTwoValidUntil}" class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>

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

@@ -30,11 +30,11 @@
             </div>
             <div class="customize-form-group">
                 <label>退货数量:</label>
-                <input name="returnQuantity" placeholder="退货数量"  id="returnQuantity" class="styled-input" type="text">
+                <input name="returnQuantity" placeholder="退货数量"  id="returnQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>应退金额/元:</label>
-                <input name="refundAmount" placeholder="应退金额/元"  id="refundAmount" class="styled-input" type="text">
+                <input name="refundAmount" placeholder="应退金额/元"  id="refundAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>生产批号/批次号:</label>

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

@@ -34,11 +34,11 @@
             </div>
             <div class="customize-form-group">
                 <label>退货数量:</label>
-                <input name="returnQuantity" placeholder="退货数量" th:value="${returnQuantity}" class="styled-input" type="text">
+                <input name="returnQuantity" placeholder="退货数量" th:value="${returnQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>应退金额/元:</label>
-                <input name="refundAmount" placeholder="应退金额/元" th:value="${refundAmount}" class="styled-input" type="text">
+                <input name="refundAmount" placeholder="应退金额/元" th:value="${refundAmount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>生产批号/批次号:</label>

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

@@ -44,12 +44,12 @@
                 <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-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/xsgl/SXsglReturnproductinfoPageEdit.html

@@ -34,11 +34,11 @@
                     </div>
                     <div class="customize-form-group">
                             <label>退货数量:</label>
-                        <input name="returnQuantity" placeholder="退货数量" th:value="${returnQuantity}" class="styled-input" type="text">
+                        <input name="returnQuantity" placeholder="退货数量" th:value="${returnQuantity}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>应退金额/元:</label>
-                        <input name="refundAmount" placeholder="应退金额/元" th:value="${refundAmount}" class="styled-input" type="text">
+                        <input name="refundAmount" placeholder="应退金额/元" th:value="${refundAmount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>生产批号/批次号:</label>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkglValueaddedcardAdd.html

@@ -14,7 +14,7 @@
             </div>
             <div class="customize-form-group">
                 <label>开卡手机号:</label>
-                <input name="openCardPhone" placeholder="开卡手机号"  id="openCardPhone" class="styled-input" type="text">
+                <input name="openCardPhone" placeholder="开卡手机号"  id="openCardPhone" class="styled-input" type="number" xlength="11">
             </div>
             <div class="customize-form-group">
                 <label>储值卡类型:</label>
@@ -26,15 +26,15 @@
             </div>
             <div class="customize-form-group">
                 <label>余额/元:</label>
-                <input name="balance" placeholder="余额/元"  id="balance" class="styled-input" type="text">
+                <input name="balance" placeholder="余额/元"  id="balance" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后交易时间:</label>
-                <input name="lastTransactionTime" placeholder="最后交易时间"  id="lastTransactionTime" class="styled-input" type="text">
+                <input name="lastTransactionTime" placeholder="最后交易时间"  id="lastTransactionTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>有效期至:</label>
-                <input name="validUntil" placeholder="有效期至"  id="validUntil" class="styled-input" type="text">
+                <input name="validUntil" placeholder="有效期至"  id="validUntil" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkglValueaddedcardEdit.html

@@ -18,7 +18,7 @@
             </div>
             <div class="customize-form-group">
                 <label>开卡手机号:</label>
-                <input name="openCardPhone" placeholder="开卡手机号" th:value="${openCardPhone}" class="styled-input" type="text">
+                <input name="openCardPhone" placeholder="开卡手机号" th:value="${openCardPhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>储值卡类型:</label>
@@ -32,13 +32,13 @@
                 <label>余额/元:</label>
                 <input name="balance" placeholder="余额/元" th:value="${balance}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后交易时间:</label>
-                <input name="lastTransactionTime" placeholder="最后交易时间" th:value="${lastTransactionTime}" class="styled-input" type="text">
+                <input name="lastTransactionTime" placeholder="最后交易时间" th:value="${lastTransactionTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>有效期至:</label>
-                <input name="validUntil" placeholder="有效期至" th:value="${validUntil}" class="styled-input" type="text">
+                <input name="validUntil" placeholder="有效期至" th:value="${validUntil}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkglValueaddedcardPageEdit.html

@@ -18,7 +18,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>开卡手机号:</label>
-                        <input name="openCardPhone" placeholder="开卡手机号" th:value="${openCardPhone}" class="styled-input" type="text">
+                        <input name="openCardPhone" placeholder="开卡手机号" th:value="${openCardPhone}" class="styled-input" type="number" maxlength="11">
                     </div>
                     <div class="customize-form-group">
                             <label>储值卡类型:</label>
@@ -30,15 +30,15 @@
                     </div>
                     <div class="customize-form-group">
                             <label>余额/元:</label>
-                        <input name="balance" placeholder="余额/元" th:value="${balance}" class="styled-input" type="text">
+                        <input name="balance" placeholder="余额/元" th:value="${balance}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>最后交易时间:</label>
-                        <input name="lastTransactionTime" placeholder="最后交易时间" th:value="${lastTransactionTime}" class="styled-input" type="text">
+                        <input name="lastTransactionTime" placeholder="最后交易时间" th:value="${lastTransactionTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>有效期至:</label>
-                        <input name="validUntil" placeholder="有效期至" th:value="${validUntil}" class="styled-input" type="text">
+                        <input name="validUntil" placeholder="有效期至" th:value="${validUntil}" class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkxfTransactionrecordAdd.html

@@ -8,9 +8,9 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SYxglCzkCzkxfTransactionrecord-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>交易时间:</label>
-                <input name="transactionTime" placeholder="交易时间"  id="transactionTime" class="styled-input" type="text">
+                <input name="transactionTime" placeholder="交易时间"  id="transactionTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>交易门店:</label>
@@ -26,11 +26,11 @@
             </div>
             <div class="customize-form-group">
                 <label>付款金额/元:</label>
-                <input name="paymentAmount" placeholder="付款金额/元"  id="paymentAmount" class="styled-input" type="text">
+                <input name="paymentAmount" placeholder="付款金额/元"  id="paymentAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>充值金额/元:</label>
-                <input name="rechargeAmount" placeholder="充值金额/元"  id="rechargeAmount" class="styled-input" type="text">
+                <input name="rechargeAmount" placeholder="充值金额/元"  id="rechargeAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>营业员:</label>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkxfTransactionrecordEdit.html

@@ -12,9 +12,9 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>交易时间:</label>
-                <input name="transactionTime" placeholder="交易时间" th:value="${transactionTime}" class="styled-input" type="text">
+                <input name="transactionTime" placeholder="交易时间" th:value="${transactionTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>交易门店:</label>

health-admin/src/main/resources/templates/yxgl/SYxglCzkCzkxfTransactionrecordPageEdit.html

@@ -12,9 +12,9 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>交易时间:</label>
-                        <input name="transactionTime" placeholder="交易时间" th:value="${transactionTime}" class="styled-input" type="text">
+                        <input name="transactionTime" placeholder="交易时间" th:value="${transactionTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>交易门店:</label>
@@ -30,11 +30,11 @@
                     </div>
                     <div class="customize-form-group">
                             <label>付款金额/元:</label>
-                        <input name="paymentAmount" placeholder="付款金额/元" th:value="${paymentAmount}" class="styled-input" type="text">
+                        <input name="paymentAmount" placeholder="付款金额/元" th:value="${paymentAmount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>充值金额/元:</label>
-                        <input name="rechargeAmount" placeholder="充值金额/元" th:value="${rechargeAmount}" class="styled-input" type="text">
+                        <input name="rechargeAmount" placeholder="充值金额/元" th:value="${rechargeAmount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>营业员:</label>

health-admin/src/main/resources/templates/yxgl/SYxglKjglHxjlRecordAdd.html

@@ -22,7 +22,7 @@
             </div>
             <div class="customize-form-group">
                 <label>抵扣金额:</label>
-                <input name="deductionAmount" placeholder="抵扣金额"  id="deductionAmount" class="styled-input" type="text">
+                <input name="deductionAmount" placeholder="抵扣金额"  id="deductionAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>优惠券类型:</label>
@@ -32,9 +32,9 @@
                 <label>折扣率:</label>
                 <input name="discountRate" placeholder="折扣率"  id="discountRate" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>领券时间:</label>
-                <input name="getTime" placeholder="领券时间"  id="getTime" class="styled-input" type="text">
+                <input name="getTime" placeholder="领券时间"  id="getTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>领取门店:</label>
@@ -44,9 +44,9 @@
                 <label>领取门店MDM编码:</label>
                 <input name="issuingStoreMDMCode" placeholder="领取门店MDM编码"  id="issuingStoreMDMCode" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>核销时间:</label>
-                <input name="redemptionTime" placeholder="核销时间"  id="redemptionTime" class="styled-input" type="text">
+                <input name="redemptionTime" placeholder="核销时间"  id="redemptionTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>核销状态:</label>
@@ -66,23 +66,23 @@
             </div>
             <div class="customize-form-group">
                 <label>核销人:</label>
-                <input name="redemptionUser" placeholder="核销人"  id="redemptionUser" class="styled-input" type="text">
+                <input name="redemptionUser" placeholder="核销人"  id="redemptionUser" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>ERP会员卡号:</label>
                 <input name="erpMemberCardNo" placeholder="ERP会员卡号"  id="erpMemberCardNo" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>核销用户id:</label>
-                <input name="canceUserId" placeholder="核销用户id"  id="canceUserId" class="styled-input" type="text">
-            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>核销用户id:</label>-->
+<!--                <input name="canceUserId" placeholder="核销用户id"  id="canceUserId" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>使用人:</label>
                 <input name="usedBy" placeholder="使用人"  id="usedBy" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>手机号:</label>
-                <input name="phoneNumber" placeholder="手机号"  id="phoneNumber" class="styled-input" type="text">
+                <input name="phoneNumber" placeholder="手机号"  id="phoneNumber" class="styled-input" type="number" xlength="11">
             </div>
             <div class="customize-form-group">
                 <label>订单号:</label>

health-admin/src/main/resources/templates/yxgl/SYxglKjglHxjlRecordEdit.html

@@ -14,7 +14,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>优惠券名称:</label>
-                <input name="couponName" placeholder="优惠券名称" th:value="${couponName}" class="styled-input" type="text">
+                <input name="couponName" placeholder="优惠券名称" th:value="${couponName}" class="styled-input" type="text" >
             </div>
             <div class="customize-form-group">
                 <label>优惠券编号:</label>
@@ -36,9 +36,9 @@
                 <label>折扣率:</label>
                 <input name="discountRate" placeholder="折扣率" th:value="${discountRate}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>领券时间:</label>
-                <input name="getTime" placeholder="领券时间" th:value="${getTime}" class="styled-input" type="text">
+                <input name="getTime" placeholder="领券时间" th:value="${getTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>领取门店:</label>
@@ -48,9 +48,9 @@
                 <label>领取门店MDM编码:</label>
                 <input name="issuingStoreMDMCode" placeholder="领取门店MDM编码" th:value="${issuingStoreMDMCode}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>核销时间:</label>
-                <input name="redemptionTime" placeholder="核销时间" th:value="${redemptionTime}" class="styled-input" type="text">
+                <input name="redemptionTime" placeholder="核销时间" th:value="${redemptionTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>核销状态:</label>
@@ -86,7 +86,7 @@
             </div>
             <div class="customize-form-group">
                 <label>手机号:</label>
-                <input name="phoneNumber" placeholder="手机号" th:value="${phoneNumber}" class="styled-input" type="text">
+                <input name="phoneNumber" placeholder="手机号" th:value="${phoneNumber}" class="styled-input" type="number" xlength="11">
             </div>
             <div class="customize-form-group">
                 <label>订单号:</label>

health-admin/src/main/resources/templates/yxgl/SYxglKjglHxjlRecordPageEdit.html

@@ -26,7 +26,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>抵扣金额:</label>
-                        <input name="deductionAmount" placeholder="抵扣金额" th:value="${deductionAmount}" class="styled-input" type="text">
+                        <input name="deductionAmount" placeholder="抵扣金额" th:value="${deductionAmount}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>优惠券类型:</label>
@@ -36,9 +36,9 @@
                             <label>折扣率:</label>
                         <input name="discountRate" placeholder="折扣率" th:value="${discountRate}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>领券时间:</label>
-                        <input name="getTime" placeholder="领券时间" th:value="${getTime}" class="styled-input" type="text">
+                        <input name="getTime" placeholder="领券时间" th:value="${getTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>领取门店:</label>
@@ -48,9 +48,9 @@
                             <label>领取门店MDM编码:</label>
                         <input name="issuingStoreMDMCode" placeholder="领取门店MDM编码" th:value="${issuingStoreMDMCode}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>核销时间:</label>
-                        <input name="redemptionTime" placeholder="核销时间" th:value="${redemptionTime}" class="styled-input" type="text">
+                        <input name="redemptionTime" placeholder="核销时间" th:value="${redemptionTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>核销状态:</label>
@@ -76,10 +76,10 @@
                             <label>ERP会员卡号:</label>
                         <input name="erpMemberCardNo" placeholder="ERP会员卡号" th:value="${erpMemberCardNo}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
-                            <label>核销用户id:</label>
-                        <input name="canceUserId" placeholder="核销用户id" th:value="${canceUserId}" class="styled-input" type="text">
-                    </div>
+<!--                    <div class="customize-form-group">-->
+<!--                            <label>核销用户id:</label>-->
+<!--                        <input name="canceUserId" placeholder="核销用户id" th:value="${canceUserId}" class="styled-input" type="text">-->
+<!--                    </div>-->
                     <div class="customize-form-group">
                             <label>使用人:</label>
                         <input name="usedBy" placeholder="使用人" th:value="${usedBy}" class="styled-input" type="text">

health-admin/src/main/resources/templates/yxgl/SYxglPosterinfoAdd.html

@@ -16,9 +16,9 @@
                 <label>状态:</label>
                 <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime"  class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglPosterinfoEdit.html

@@ -20,9 +20,9 @@
                 <label>状态:</label>
                 <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}"  class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglPosterinfoPageEdit.html

@@ -20,9 +20,9 @@
                             <label>状态:</label>
                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}"  class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>

health-admin/src/main/resources/templates/yxgl/SYxglPromotioninfoAdd.html

@@ -16,9 +16,9 @@
                 <label>活动名称:</label>
                 <input name="activityName" placeholder="活动名称"  id="activityName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>活动时间:</label>
-                <input name="activityTime" placeholder="活动时间"  id="activityTime" class="styled-input" type="text">
+                <input name="activityTime" placeholder="活动时间"  id="activityTime"  class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>促销类型:</label>
@@ -52,14 +52,7 @@
                 <label>活动状态:</label>
                 <input name="activityStatus" placeholder="活动状态"  id="activityStatus" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="creator" placeholder="创建人"  id="creator" class="styled-input" type="text">
-            </div>
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/yxgl/SYxglPromotioninfoEdit.html

@@ -20,9 +20,9 @@
                 <label>活动名称:</label>
                 <input name="activityName" placeholder="活动名称" th:value="${activityName}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>活动时间:</label>
-                <input name="activityTime" placeholder="活动时间" th:value="${activityTime}" class="styled-input" type="text">
+                <input name="activityTime" placeholder="活动时间" th:value="${activityTime}"  class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>促销类型:</label>
@@ -56,14 +56,8 @@
                 <label>活动状态:</label>
                 <input name="activityStatus" placeholder="活动状态" th:value="${activityStatus}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
-            </div>
+            <div class="customize-form-group select-time">
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/yxgl/SYxglPromotioninfoPageEdit.html

@@ -20,9 +20,9 @@
                             <label>活动名称:</label>
                         <input name="activityName" placeholder="活动名称" th:value="${activityName}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>活动时间:</label>
-                        <input name="activityTime" placeholder="活动时间" th:value="${activityTime}" class="styled-input" type="text">
+                        <input name="activityTime" placeholder="活动时间" th:value="${activityTime}"  class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>促销类型:</label>
@@ -56,9 +56,9 @@
                             <label>活动状态:</label>
                         <input name="activityStatus" placeholder="活动状态" th:value="${activityStatus}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                        <input name="createTime" placeholder="创建时间" th:value="${createTime}"  class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>创建人:</label>

health-admin/src/main/resources/templates/yxgl/SYxglZhspCombinationproductAdd.html

@@ -16,9 +16,9 @@
                 <label>组合商品编码:</label>
                 <input name="groupCode" placeholder="组合商品编码"  id="groupCode" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生效时间:</label>
-                <input name="effectiveTime" placeholder="生效时间"  id="effectiveTime" class="styled-input" type="text">
+                <input name="effectiveTime" placeholder="生效时间"  id="effectiveTime"  class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
@@ -34,20 +34,13 @@
             </div>
             <div class="customize-form-group">
                 <label>单品总量:</label>
-                <input name="totalQuantity" placeholder="单品总量"  id="totalQuantity" class="styled-input" type="text">
+                <input name="totalQuantity" placeholder="单品总量"  id="totalQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>组合价格（元）:</label>
-                <input name="comboPrice" placeholder="组合价格（元）"  id="comboPrice" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="creator" placeholder="创建人"  id="creator" class="styled-input" type="text">
+                <input name="comboPrice" placeholder="组合价格（元）"  id="comboPrice" class="styled-input" type="number">
             </div>
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/yxgl/SYxglZhspCombinationproductEdit.html

@@ -20,9 +20,9 @@
                 <label>组合商品编码:</label>
                 <input name="groupCode" placeholder="组合商品编码" th:value="${groupCode}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生效时间:</label>
-                <input name="effectiveTime" placeholder="生效时间" th:value="${effectiveTime}" class="styled-input" type="text">
+                <input name="effectiveTime" placeholder="生效时间" th:value="${effectiveTime}"  class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
@@ -44,14 +44,7 @@
                 <label>组合价格（元）:</label>
                 <input name="comboPrice" placeholder="组合价格（元）" th:value="${comboPrice}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
-            </div>
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/yxgl/SYxglZhspCombinationproductPageEdit.html

@@ -20,9 +20,9 @@
                             <label>组合商品编码:</label>
                         <input name="groupCode" placeholder="组合商品编码" th:value="${groupCode}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>生效时间:</label>
-                        <input name="effectiveTime" placeholder="生效时间" th:value="${effectiveTime}" class="styled-input" type="text">
+                        <input name="effectiveTime" placeholder="生效时间" th:value="${effectiveTime}"  class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>状态:</label>
@@ -44,14 +44,7 @@
                             <label>组合价格（元）:</label>
                         <input name="comboPrice" placeholder="组合价格（元）" th:value="${comboPrice}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建人:</label>
-                        <input name="creator" placeholder="创建人" th:value="${creator}" class="styled-input" type="text">
-                    </div>
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/zlgl/SZlglCfdjSaleprescriptioninfoAdd.html

@@ -8,29 +8,29 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SZlglCfdjSaleprescriptioninfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>销售单号:</label>
-                <input name="saleDocumentNumber" placeholder="销售单号"  id="saleDocumentNumber" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+<!--            <div class="customize-form-group">-->
+<!--                <label>销售单号:</label>-->
+<!--                <input name="saleDocumentNumber" placeholder="销售单号"  id="saleDocumentNumber" class="styled-input" type="text">-->
+<!--            </div>-->
+            <div class="customize-form-group select-time">
                 <label>销售时间:</label>
-                <input name="saleTime" placeholder="销售时间"  id="saleTime" class="styled-input" type="text">
+                <input name="saleTime" placeholder="销售时间"  id="saleTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>登记时间:</label>
-                <input name="registrationTime" placeholder="登记时间"  id="registrationTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>处方单号:</label>
-                <input name="prescriptionNumber" placeholder="处方单号"  id="prescriptionNumber" class="styled-input" type="text">
+                <input name="registrationTime" placeholder="登记时间"  id="registrationTime" class="time-input time-input2" type="text">
             </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>处方单号:</label>-->
+<!--                <input name="prescriptionNumber" placeholder="处方单号"  id="prescriptionNumber" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>类型:</label>
                 <input name="type" placeholder="类型"  id="type" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>处方日期:</label>
-                <input name="prescriptionDate" placeholder="处方日期"  id="prescriptionDate" class="styled-input" type="text">
+                <input name="prescriptionDate" placeholder="处方日期"  id="prescriptionDate" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>医疗机构名称:</label>

health-admin/src/main/resources/templates/zlgl/SZlglCfdjSaleprescriptioninfoEdit.html

@@ -14,27 +14,27 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>销售单号:</label>
-                <input name="saleDocumentNumber" placeholder="销售单号" th:value="${saleDocumentNumber}" class="styled-input" type="text">
+                <input name="saleDocumentNumber" placeholder="销售单号" th:value="${saleDocumentNumber}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>销售时间:</label>
-                <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="styled-input" type="text">
+                <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>登记时间:</label>
-                <input name="registrationTime" placeholder="登记时间" th:value="${registrationTime}" class="styled-input" type="text">
+                <input name="registrationTime" placeholder="登记时间" th:value="${registrationTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>处方单号:</label>
-                <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text">
+                <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>类型:</label>
                 <input name="type" placeholder="类型" th:value="${type}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>处方日期:</label>
-                <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="styled-input" type="text">
+                <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>医疗机构名称:</label>

health-admin/src/main/resources/templates/zlgl/SZlglCfdjSaleprescriptioninfoPageEdit.html

@@ -14,27 +14,27 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
                             <label>销售单号:</label>
-                        <input name="saleDocumentNumber" placeholder="销售单号" th:value="${saleDocumentNumber}" class="styled-input" type="text">
+                        <input name="saleDocumentNumber" placeholder="销售单号" th:value="${saleDocumentNumber}" class="styled-input" type="text" disabled="true">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>销售时间:</label>
-                        <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="styled-input" type="text">
+                        <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="time-input time-input2" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>登记时间:</label>
-                        <input name="registrationTime" placeholder="登记时间" th:value="${registrationTime}" class="styled-input" type="text">
+                        <input name="registrationTime" placeholder="登记时间" th:value="${registrationTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>处方单号:</label>
-                        <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text">
+                        <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text" disabled="true">
                     </div>
                     <div class="customize-form-group">
                             <label>类型:</label>
                         <input name="type" placeholder="类型" th:value="${type}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>处方日期:</label>
-                        <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="styled-input" type="text">
+                        <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}"  class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>医疗机构名称:</label>

health-system/src/main/resources/mapper/bbfx/SBbfxKcbbInventoryShortageDetailMapper.xml

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

health-system/src/main/resources/mapper/bbfx/SBbfxKcbbJgkcmxMapper.xml

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

health-system/src/main/resources/mapper/cgxs/SCgxsCfdjPrescriptionRecordMapper.xml

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

health-system/src/main/resources/mapper/cgxs/SCgxsTgypTgypdjMapper.xml

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

health-system/src/main/resources/mapper/daas/SDaasChannelManagementMapper.xml

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

health-system/src/main/resources/mapper/ddgl/SDdglFpglDsfzfkpMapper.xml

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

health-system/src/main/resources/mapper/ddgl/SDdglFpglInvoiceinfoMapper.xml

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

health-system/src/main/resources/mapper/ddgl/SDdglOrderStoreMapper.xml

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

health-system/src/main/resources/mapper/fwgl/SFwglServercommissionrewardinfoMapper.xml

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

health-system/src/main/resources/mapper/fwgl/SFwglServerinfoMapper.xml

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

health-system/src/main/resources/mapper/fwgl/SFwglServerorderinfoMapper.xml

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

health-system/src/main/resources/mapper/fwgl/SFwglServicepackageinfoMapper.xml

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

health-system/src/main/resources/mapper/fwgl/SFwglServicetypeinfoMapper.xml

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

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

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

health-system/src/main/resources/mapper/gkdggl/SGkdgglCustomerOrderAuditMapper.xml

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

health-system/src/main/resources/mapper/hygl/SHyglEquitiesMapper.xml

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

health-system/src/main/resources/mapper/hygl/SHyglHyxxJzyxMarketingplaninfoMapper.xml

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

health-system/src/main/resources/mapper/hygl/SHyglMembertagMapper.xml

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

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

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

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

@@ -68,6 +68,9 @@
         <if test="verbeginTime != null and verbeginTime!='' and verendTime != null and verendTime!=''">
             and verificationTime between #{verbeginTime} and #{verendTime}
         </if>
+        <if test="id !=null and id !='' ">
+            and id = #{id}
+        </if>
     </select>
 
 

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

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