update 所有列表页面 质量管理

              			门店运营管理
              			订单管理
              			下载管理
              			健康管理
              			顾客订购管理
              			常规销售

health-admin/src/main/java/com/bzd/web/controller/cgxs/SCgxsCfdjPrescriptionRecordController.java

@@ -6,8 +6,12 @@ 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.DateUtils;
+import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.PharmaceuticalService;
+import org.apache.catalina.User;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.helpers.Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -54,6 +58,11 @@ public class SCgxsCfdjPrescriptionRecordController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("createdDate", DateUtils.getTime());
+            pd.put("saleTime", DateUtils.getTime());
+            pd.put("saleOrderNumber", IdUtils.randomUUID());
+            pd.put("createdBy", getSysUser().getLoginName());
+
             Integer result = sCgxsCfdjPrescriptionRecordService.addSCgxsCfdjPrescriptionRecord(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/cgxs/SCgxsTgypTgypdjController.java

@@ -6,6 +6,8 @@ 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.DateUtils;
+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 +56,10 @@ public class SCgxsTgypTgypdjController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("createdDate", DateUtils.getTime());
+            pd.put("createdBy", getLoginName());
+            pd.put("saleOrderNumber", IdUtils.fastUUID());
+
             Integer result = sCgxsTgypTgypdjService.addSCgxsTgypTgypdj(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/ddgl/SDdglOrderStoreController.java

@@ -6,14 +6,18 @@ 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.DateUtils;
+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;
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import com.bzd.system.service.ddgl.SDdglOrderStoreService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +58,18 @@ public class SDdglOrderStoreController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("orderId", IdUtils.randomUUID());
+            pd.put("orderStatus","待上传处方");
+            pd.put("deliveryStatus","待派单");
+            pd.put("systemLoginUserId", getSysUser().getUserId()) ;
+            pd.put("memberName",getSysUser().getLoginName());
+            pd.put("memberId",getSysUser().getUserId());
+            pd.put("channelOrderNo",IdUtils.randomUUID());
+            pd.put("psoSaleOrderNo",IdUtils.randomUUID());
+            pd.put("settlementId",IdUtils.randomUUID());
+            pd.put("settlementCode",IdUtils.randomUUID());
+            pd.put("consumptionTime", DateUtils.getTime());
+            pd.put("orderDate",DateUtils.getTime());
             Integer result = sDdglOrderStoreService.addSDdglOrderStore(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/jkgl/SJkglGyhyHyflCategoryinfoController.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.DateUtils;
 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 SJkglGyhyHyflCategoryinfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+              pd.put("creationDate", DateUtils.getTime());
             Integer result = sJkglGyhyHyflCategoryinfoService.addSJkglGyhyHyflCategoryinfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/jkgl/SJkglGyhyYjtjActivityinfoController.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.DateUtils;
 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 SJkglGyhyYjtjActivityinfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("creationDate", DateUtils.getTime());
             Integer result = sJkglGyhyYjtjActivityinfoService.addSJkglGyhyYjtjActivityinfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/jkgl/SJkglRegistrationinfoController.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.DateUtils;
 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 SJkglRegistrationinfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("creationDate", DateUtils.getTime());
             Integer result = sJkglRegistrationinfoService.addSJkglRegistrationinfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/jkgl/SJkglYpwxServiceprojectinfoController.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.DateUtils;
 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 SJkglYpwxServiceprojectinfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("creationDate", DateUtils.getTime());
             Integer result = sJkglYpwxServiceprojectinfoService.addSJkglYpwxServiceprojectinfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

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

@@ -6,6 +6,8 @@ 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.DateUtils;
+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 +56,9 @@ public class SMdyyglMdygxxStoreemployeeinfoController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("employeeCode", IdUtils.fastUUID());//员工编码
+            pd.put("jdDate", DateUtils.getTime());//建党日期
+
             Integer result = sMdyyglMdygxxStoreemployeeinfoService.addSMdyyglMdygxxStoreemployeeinfo(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/ypdg/SYpdgChineseDecoctionstController.java

@@ -6,6 +6,8 @@ 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.DateUtils;
+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 +56,13 @@ public class SYpdgChineseDecoctionstController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("createdDate", DateUtils.getTime());
+            pd.put("createdBy", getSysUser().getLoginName());
+            pd.put("demandOrderNumber", DateUtils.getTime());
+            pd.put("thirdOrderId", IdUtils.randomUUID());
+            pd.put("platformUserId", IdUtils.fastUUID());
+            pd.put("businessId", IdUtils.fastUUID());
+            pd.put("orderStatus", "待录方");
             Integer result = sYpdgChineseDecoctionstService.addSYpdgChineseDecoctionst(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

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

@@ -8,37 +8,30 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SCgxsCfdjPrescriptionRecord-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期"  id="createdDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>销售单号:</label>
-                <input name="saleOrderNumber" placeholder="销售单号"  id="saleOrderNumber" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+
+
+            <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="registerTime" placeholder="登记时间"  id="registerTime" class="styled-input" type="text">
+                <input name="registerTime" placeholder="登记时间"  id="registerTime" 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">
+                <input name="prescriptionNumber" placeholder="处方单号"  id="prescriptionNumber" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>类型:</label>
-                <input name="type" placeholder="类型"  id="type" class="styled-input" type="text">
+                <select name="types"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </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/cgxs/SCgxsCfdjPrescriptionRecordEdit.html

@@ -13,33 +13,36 @@
                 <label>创建人:</label>
                 <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>销售单号:</label>
                 <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
             </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-input2 time-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>登记时间:</label>
-                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
+                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" 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">
+                <select name="types"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${types}"></option>
+                </select>
             </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/cgxs/SCgxsCfdjPrescriptionRecordList.html

@@ -23,18 +23,14 @@
                 <form id="SCgxsCfdjPrescriptionRecord-form" class="customize-search-form">
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>销售单号:</label>
-                            <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
+                            <label>销售单号: </label>
+                            <input type="text" class="styled-input" placeholder="请输入处方单号" name="saleOrderNumber" autocomplete="off"/>
                         </div>
-                            <!--<li>
-                                销售时间:</label>
-                            <input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
-                            </li>-->
                         <div class="customize-form-group select-time">
-                            <label for="startTime">销售日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label for="beginTime">销售日期:</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>
@@ -50,12 +46,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" style="width: 100%; overflow-x: auto;">
@@ -123,7 +114,7 @@
                     { field: 'saleTime', title: '销售时间', align: 'center' },
                     { field: 'registerTime', title: '登记时间', align: 'center' },
                     { field: 'prescriptionNumber', title: '处方单号', align: 'center' },
-                    { field: 'type', title: '类型', align: 'center' },
+                    { field: 'types', title: '类型', align: 'center' },
                     { field: 'prescriptionDate', title: '处方日期', align: 'center' },
                     { field: 'medicalInstitutionName', title: '医疗机构名称', align: 'center' },
                     { field: 'doctorName', title: '医生姓名', align: 'center' },
@@ -140,10 +131,6 @@
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
                             return actions.join('');
                         } else {
                             return "";

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

@@ -9,62 +9,65 @@
 
         <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="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建日期:</label>
-                        <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>销售单号:</label>
-                        <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>销售时间:</label>
-                        <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>登记时间:</label>
-                        <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>处方单号:</label>
-                        <input name="prescriptionNumber" placeholder="处方单号" th:value="${prescriptionNumber}" class="styled-input" type="text">
-                    </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">
-                            <label>处方日期:</label>
-                        <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>医疗机构名称:</label>
-                        <input name="medicalInstitutionName" placeholder="医疗机构名称" th:value="${medicalInstitutionName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>医生姓名:</label>
-                        <input name="doctorName" placeholder="医生姓名" th:value="${doctorName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>顾客信息:</label>
-                        <input name="customerInfo" placeholder="顾客信息" th:value="${customerInfo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>审方药师:</label>
-                        <input name="reviewPharmacist" placeholder="审方药师" th:value="${reviewPharmacist}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调配员:</label>
-                        <input name="dispenser" placeholder="调配员" th:value="${dispenser}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>复核员:</label>
-                        <input name="verifier" placeholder="复核员" th:value="${verifier}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建日期:</label>
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>销售单号:</label>
+                <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>销售时间:</label>
+                <input name="saleTime" placeholder="销售时间" th:value="${saleTime}" class="time-input2 time-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>登记时间:</label>
+                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" 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" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>类型:</label>
+                <select name="types"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${types}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group select-time">
+                <label>处方日期:</label>
+                <input name="prescriptionDate" placeholder="处方日期" th:value="${prescriptionDate}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>医疗机构名称:</label>
+                <input name="medicalInstitutionName" placeholder="医疗机构名称" th:value="${medicalInstitutionName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>医生姓名:</label>
+                <input name="doctorName" placeholder="医生姓名" th:value="${doctorName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>顾客信息:</label>
+                <input name="customerInfo" placeholder="顾客信息" th:value="${customerInfo}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>审方药师:</label>
+                <input name="reviewPharmacist" placeholder="审方药师" th:value="${reviewPharmacist}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>调配员:</label>
+                <input name="dispenser" placeholder="调配员" th:value="${dispenser}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>复核员:</label>
+                <input name="verifier" placeholder="复核员" th:value="${verifier}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -8,25 +8,9 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SCgxsTgypTgypdj-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期"  id="createdDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>销售日期:</label>
-                <input name="saleDate" placeholder="销售日期"  id="saleDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>销售单号:</label>
-                <input name="saleOrderNumber" placeholder="销售单号"  id="saleOrderNumber" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>登记时间:</label>
-                <input name="registerTime" placeholder="登记时间"  id="registerTime" class="styled-input" type="text">
+                <input name="registerTime" placeholder="登记时间"  id="registerTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>顾客姓名:</label>
@@ -34,7 +18,10 @@
             </div>
             <div class="customize-form-group">
                 <label>性别:</label>
-                <input name="gender" placeholder="性别"  id="gender" class="styled-input" type="text">
+                <select name="gender"  th:with="type=${@dict.getType('sys_user_sex')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>身份证号:</label>
@@ -42,7 +29,7 @@
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
-                <input name="contactPhone" placeholder="联系电话"  id="contactPhone" class="styled-input" type="text">
+                <input name="contactPhone" placeholder="联系电话"  id="contactPhone" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>营业员:</label>

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

@@ -11,11 +11,11 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>销售日期:</label>
@@ -23,11 +23,11 @@
             </div>
             <div class="customize-form-group">
                 <label>销售单号:</label>
-                <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
+                <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>登记时间:</label>
-                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
+                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>顾客姓名:</label>
@@ -35,7 +35,10 @@
             </div>
             <div class="customize-form-group">
                 <label>性别:</label>
-                <input name="gender" placeholder="性别" th:value="${gender}" class="styled-input" type="text">
+                <select name="gender"  th:with="type=${@dict.getType('sys_user_sex')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${gender}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>身份证号:</label>
@@ -43,7 +46,7 @@
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
-                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
+                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>营业员:</label>

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

@@ -24,7 +24,7 @@
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>销售单号:</label>
-                            <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入销售单号" name="saleOrderNumber" autocomplete="off"/>
                         </div>
                             <!--<li>
                                 销售时间:</label>
@@ -50,12 +50,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -9,54 +9,57 @@
 
         <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="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建日期:</label>
-                        <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>销售日期:</label>
-                        <input name="saleDate" placeholder="销售日期" th:value="${saleDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>销售单号:</label>
-                        <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>登记时间:</label>
-                        <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>顾客姓名:</label>
-                        <input name="customerName" placeholder="顾客姓名" th:value="${customerName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>性别:</label>
-                        <input name="gender" placeholder="性别" th:value="${gender}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>身份证号:</label>
-                        <input name="idNumber" placeholder="身份证号" th:value="${idNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>联系电话:</label>
-                        <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>营业员:</label>
-                        <input name="salesperson" placeholder="营业员" th:value="${salesperson}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>药品编号:</label>
-                        <input name="medicineCode" placeholder="药品编号" th:value="${medicineCode}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建日期:</label>
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>销售日期:</label>
+                <input name="saleDate" placeholder="销售日期" th:value="${saleDate}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>销售单号:</label>
+                <input name="saleOrderNumber" placeholder="销售单号" th:value="${saleOrderNumber}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>登记时间:</label>
+                <input name="registerTime" placeholder="登记时间" th:value="${registerTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>顾客姓名:</label>
+                <input name="customerName" placeholder="顾客姓名" th:value="${customerName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>性别:</label>
+                <select name="gender"  th:with="type=${@dict.getType('sys_user_sex')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${gender}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>身份证号:</label>
+                <input name="idNumber" placeholder="身份证号" th:value="${idNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>联系电话:</label>
+                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>营业员:</label>
+                <input name="salesperson" placeholder="营业员" th:value="${salesperson}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>药品编号:</label>
+                <input name="medicineCode" placeholder="药品编号" th:value="${medicineCode}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpList.html

@@ -38,11 +38,11 @@
                         </div>
                         <div class="customize-form-group">
                                 <label>订单类型</label>
-                                <select name="orderType"  class="styled-input">
-                                    <option value="">全部</option>
-                                    <option value="正向单">正向单</option>
-                                    <option value="逆向单">逆向单</option>
-                                </select>
+                            <select name="orderType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ddlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                     </div>
                 </form>

health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoAdd.html

@@ -14,15 +14,15 @@
             </div>
             <div class="customize-form-group">
                 <label>发票代码:</label>
-                <input name="invoiceCode" placeholder="发票代码"  id="invoiceCode" class="styled-input" type="text">
+                <input name="invoiceCode" placeholder="发票代码"  id="invoiceCode" class="styled-input" type="text" >
             </div>
             <div class="customize-form-group">
                 <label>发票号码:</label>
-                <input name="invoiceNumber" placeholder="发票号码"  id="invoiceNumber" class="styled-input" type="text">
+                <input name="invoiceNumber" placeholder="发票号码"  id="invoiceNumber" class="styled-input" type="text" >
             </div>
             <div class="customize-form-group">
                 <label>发票金额:</label>
-                <input name="invoiceAmount" placeholder="发票金额"  id="invoiceAmount" class="styled-input" type="text">
+                <input name="invoiceAmount" placeholder="发票金额"  id="invoiceAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>渠道店铺:</label>
@@ -30,27 +30,45 @@
             </div>
             <div class="customize-form-group">
                 <label>订单发票类型</label>
-                <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)"  id="orderInvoiceType" class="styled-input" type="text">
+<!--                <select name="orderInvoiceType"  class="styled-input">-->
+<!--                    <option value="线上">线上</option>-->
+<!--                    <option value="线下">线下</option>-->
+<!--                </select>-->
+                <select name="orderInvoiceType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ddfplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>发票类型:</label>
-                <input name="invoiceType" placeholder="发票类型"  id="invoiceType" class="styled-input" type="text">
+<!--                <select name="invoiceType"  class="styled-input">-->
+<!--                    <option value="电子发票">电子发票</option>-->
+<!--                    <option value="纸质发票">纸质发票</option>-->
+<!--                </select>-->
+                <select name="invoiceType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_fplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>抬头类型:</label>
-                <input name="headerType" placeholder="抬头类型"  id="headerType" class="styled-input" type="text">
+<!--                <select name="headerType"  class="styled-input">-->
+<!--                    <option value="个人">个人</option>-->
+<!--                    <option value="企业">企业</option>-->
+<!--                </select>-->
+                <select name="headerType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ttlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>抬头名称:</label>
                 <input name="headerName" placeholder="抬头名称"  id="headerName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>开票类型:</label>
-                <input name="billingType" placeholder="开票类型"  id="billingType" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+
+            <div class="customize-form-group select-time">
                 <label>开票时间:</label>
-                <input name="billingTime" placeholder="开票时间"  id="billingTime" class="styled-input" type="text">
+                <input name="billingTime" placeholder="开票时间"  id="billingTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>邮寄信息:</label>
@@ -58,39 +76,57 @@
             </div>
             <div class="customize-form-group">
                 <label>开票金额:</label>
-                <input name="billingAmount" placeholder="开票金额"  id="billingAmount" class="styled-input" type="text">
+                <input name="billingAmount" placeholder="开票金额"  id="billingAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店铺名称:</label>
-                <input name="storeName" placeholder="店铺名称"  id="storeName" class="styled-input" type="text">
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="styled-input">
             </div>
             <div class="customize-form-group">
                 <label>审核类型:</label>
-                <input name="auditType" placeholder="审核类型"  id="auditType" class="styled-input" type="text">
+<!--                <select name="auditType"  class="styled-input">-->
+<!--                    <option value="特殊企业">特殊企业</option>-->
+<!--                    <option value="逾期开票">逾期开票</option>-->
+<!--                </select>-->
+                <select name="auditType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>审核状态:</label>
-                <input name="auditStatus" placeholder="审核状态"  id="auditStatus" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>暂无数据</label>
-                <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)"  id="noData" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>合并订单号:</label>
-                <input name="mergeOrderNo" placeholder="合并订单号"  id="mergeOrderNo" class="styled-input" type="text">
-            </div>
+<!--                <select name="auditStatus"  class="styled-input">-->
+<!--                    <option value="通过">通过</option>-->
+<!--                    <option value="驳回">驳回</option>-->
+<!--                </select>-->
+                <select name="auditStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            ></option>
+                </select>
+            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>合并订单号:</label>-->
+<!--                <input name="mergeOrderNo" placeholder="合并订单号"  id="mergeOrderNo" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>订单号:</label>
                 <input name="orderNo" placeholder="订单号"  id="orderNo" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>开票状态:</label>
-                <input name="billingStatus" placeholder="开票状态"  id="billingStatus" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+<!--                <select name="billingStatus"  class="styled-input">-->
+<!--                    <option value="待开票">待开票</option>-->
+<!--                    <option value="开票中">开票中</option>-->
+<!--                    <option value="开票异常">开票异常</option>-->
+<!--                </select>-->
+                <select name="billingStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kpzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${billingStatus}"></option>
+                </select>
+            </div>
+            <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>
@@ -121,6 +157,26 @@
             }
         });
     }
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
 </script>
 </body>
 </html>

health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoEdit.html

@@ -11,15 +11,15 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>平台订单号:</label>
-                <input name="platformOrderNo" placeholder="平台订单号" th:value="${platformOrderNo}" class="styled-input" type="text">
+                <input name="platformOrderNo" placeholder="平台订单号" th:value="${platformOrderNo}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>发票代码:</label>
-                <input name="invoiceCode" placeholder="发票代码" th:value="${invoiceCode}" class="styled-input" type="text">
+                <input name="invoiceCode" placeholder="发票代码" th:value="${invoiceCode}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>发票号码:</label>
-                <input name="invoiceNumber" placeholder="发票号码" th:value="${invoiceNumber}" class="styled-input" type="text">
+                <input name="invoiceNumber" placeholder="发票号码" th:value="${invoiceNumber}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>发票金额:</label>
@@ -31,27 +31,32 @@
             </div>
             <div class="customize-form-group">
                 <label>订单发票类型:</label>
-                <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)" th:value="${orderInvoiceType}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>发票类型:</label>
-                <input name="invoiceType" placeholder="发票类型" th:value="${invoiceType}" class="styled-input" type="text">
+                <select name="orderInvoiceType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ddfplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${orderInvoiceType}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>抬头类型:</label>
-                <input name="headerType" placeholder="抬头类型" th:value="${headerType}" class="styled-input" type="text">
+                <select name="headerType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ttlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${headerType}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>抬头名称:</label>
                 <input name="headerName" placeholder="抬头名称" th:value="${headerName}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>开票类型:</label>
-                <input name="billingType" placeholder="开票类型" th:value="${billingType}" class="styled-input" type="text">
+                <label>发票类型:</label>
+                <select name="billingType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_fplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${billingType}"></option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>开票时间:</label>
-                <input name="billingTime" placeholder="开票时间" th:value="${billingTime}" class="styled-input" type="text">
+                <input name="billingTime" placeholder="开票时间" th:value="${billingTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>邮寄信息:</label>
@@ -63,35 +68,36 @@
             </div>
             <div class="customize-form-group">
                 <label>店铺名称:</label>
-                <input name="storeName" placeholder="店铺名称" th:value="${storeName}" class="styled-input" type="text">
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" th:value="${storeName}" type="text" placeholder="请选择门店" class="styled-input">
             </div>
             <div class="customize-form-group">
                 <label>审核类型:</label>
-                <input name="auditType" placeholder="审核类型" th:value="${auditType}" class="styled-input" type="text">
+                <select name="auditType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${auditType}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>审核状态:</label>
-                <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>暂无数据:</label>
-                <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)" th:value="${noData}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>合并订单号:</label>
-                <input name="mergeOrderNo" placeholder="合并订单号" th:value="${mergeOrderNo}" class="styled-input" type="text">
+                <select name="auditStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${auditStatus}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>订单号:</label>
-                <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text">
+                <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>开票状态:</label>
-                <input name="billingStatus" placeholder="开票状态" th:value="${billingStatus}" class="styled-input" type="text">
+                <select name="billingStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kpzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${billingStatus}"></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>
     </form>
@@ -126,4 +132,24 @@
             edit();
         }
     }
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
 </script>

health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoList.html

@@ -23,41 +23,60 @@
                 <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>订单号:</label>
-                            <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
+                            <label>订单号: </label>
+                            <input type="text" class="styled-input"  placeholder="请输入订单号" name="orderNo" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>发票类型:</label>
-                            <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
+                            <label>抬头类型: </label>
+                            <select name="headerType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ttlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
-                            <label>抬头类型:</label>
-                            <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
+                            <label>发票类型: </label>
+                            <select name="billingType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_fplx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
-                            <label>开票类型:</label>
-                            <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>店铺名称:</label>
-                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
+                            <label>店铺名称: </label>
+                            <input type="text" class="styled-input" placeholder="请输入店铺名称" name="storeName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>审核类型:</label>
-                            <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
+                            <select name="auditType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>审核状态:</label>
-                            <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
+                            <select name="auditStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shzt')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>开票状态:</label>
-                            <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
+                            <select name="billingStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kpzt')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                       ></option>
+                            </select>
                         </div>
-                        <div class="customize-form-group">
-                            <label>创建时间:</label>
-                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </div>
+                        <div class="customize-form-group select-time">
+                            <label>创建时间: </label>
+                            <input type="text" class="time-input time-input2" id="beginTime" placeholder="开始时间" name="beginTime">
+                            <span>-</span>
+                            <input type="text" class="time-input time-input2" id="endTime" placeholder="结束时间" name="endTime">
+                        </div>
+
                     </div>
                 </form>
             </div>
@@ -72,9 +91,9 @@
                 <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-primary single disabled" onclick="" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-success"></i>批量开发票
-                </a>
+<!--                <a class="btn btn-primary single disabled" onclick="" shiro:hasPermission="system:user:edit">-->
+<!--                    <i class="fa fa-success"></i>批量开发票-->
+<!--                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
                 <table id="bootstrap-table" class="fixed-layout-table"></table>

health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoPageEdit.html

@@ -9,90 +9,96 @@
 
         <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="platformOrderNo" placeholder="平台订单号" th:value="${platformOrderNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>发票代码:</label>
-                        <input name="invoiceCode" placeholder="发票代码" th:value="${invoiceCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>发票号码:</label>
-                        <input name="invoiceNumber" placeholder="发票号码" th:value="${invoiceNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>发票金额:</label>
-                        <input name="invoiceAmount" placeholder="发票金额" th:value="${invoiceAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道店铺:</label>
-                        <input name="channelStore" placeholder="渠道店铺" th:value="${channelStore}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单发票类型:</label>
-                        <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)" th:value="${orderInvoiceType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>发票类型:</label>
-                        <input name="invoiceType" placeholder="发票类型" th:value="${invoiceType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>抬头类型:</label>
-                        <input name="headerType" placeholder="抬头类型" th:value="${headerType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>抬头名称:</label>
-                        <input name="headerName" placeholder="抬头名称" th:value="${headerName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>开票类型:</label>
-                        <input name="billingType" placeholder="开票类型" th:value="${billingType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>开票时间:</label>
-                        <input name="billingTime" placeholder="开票时间" th:value="${billingTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>邮寄信息:</label>
-                        <input name="mailingInfo" placeholder="邮寄信息" th:value="${mailingInfo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>开票金额:</label>
-                        <input name="billingAmount" placeholder="开票金额" th:value="${billingAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>店铺名称:</label>
-                        <input name="storeName" placeholder="店铺名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>审核类型:</label>
-                        <input name="auditType" placeholder="审核类型" th:value="${auditType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>审核状态:</label>
-                        <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>暂无数据:</label>
-                        <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)" th:value="${noData}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>合并订单号:</label>
-                        <input name="mergeOrderNo" placeholder="合并订单号" th:value="${mergeOrderNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单号:</label>
-                        <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>开票状态:</label>
-                        <input name="billingStatus" placeholder="开票状态" th:value="${billingStatus}" 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="platformOrderNo" placeholder="平台订单号" th:value="${platformOrderNo}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>发票代码:</label>
+                <input name="invoiceCode" placeholder="发票代码" th:value="${invoiceCode}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>发票号码:</label>
+                <input name="invoiceNumber" placeholder="发票号码" th:value="${invoiceNumber}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>发票金额:</label>
+                <input name="invoiceAmount" placeholder="发票金额" th:value="${invoiceAmount}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道店铺:</label>
+                <input name="channelStore" placeholder="渠道店铺" th:value="${channelStore}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>订单发票类型:</label>
+                <select name="orderInvoiceType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ddfplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${orderInvoiceType}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>抬头类型:</label>
+                <select name="headerType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ttlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${headerType}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>抬头名称:</label>
+                <input name="headerName" placeholder="抬头名称" th:value="${headerName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>发票类型:</label>
+                <select name="billingType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_fplx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${billingType}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group select-time">
+                <label>开票时间:</label>
+                <input name="billingTime" placeholder="开票时间" th:value="${billingTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>邮寄信息:</label>
+                <input name="mailingInfo" placeholder="邮寄信息" th:value="${mailingInfo}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>开票金额:</label>
+                <input name="billingAmount" placeholder="开票金额" th:value="${billingAmount}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>店铺名称:</label>
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" th:value="${storeName}" type="text" placeholder="请选择门店" class="styled-input">
+            </div>
+            <div class="customize-form-group">
+                <label>审核类型:</label>
+                <select name="auditType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${auditType}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>审核状态:</label>
+                <select name="auditStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${auditStatus}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>订单号:</label>
+                <input name="orderNo" placeholder="订单号" th:value="${orderNo}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>开票状态:</label>
+                <select name="billingStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kpzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${billingStatus}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建时间:</label>
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/ddgl/SDdglFpglinvoice.html

@@ -23,41 +23,65 @@
                 <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>订单号:</label>
-                            <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
+                            <label>订单号: </label>
+                            <input type="text" class="styled-input"  placeholder="请输入订单号" name="orderNo" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>发票类型:</label>
                             <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>抬头类型:</label>
-                            <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
+                            <label>抬头类型: </label>
+                            <select name="headerType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_ttlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
-                            <label>开票类型:</label>
-                            <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
+                            <label>开票类型: </label>
+
+                            <select name="billingType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kplx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
-                            <label>店铺名称:</label>
-                            <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
+                            <label>店铺名称: </label>
+                            <input type="text" class="styled-input" placeholder="请输入店铺名称" name="storeName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>审核类型:</label>
-                            <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
+
+                            <select name="auditType" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>审核状态:</label>
-                            <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
+                            <select name="auditStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_shzt')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>开票状态:</label>
-                            <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
+                            <select name="billingStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_ddgl_kpzt')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
+                        </div>
+                        <div class="customize-form-group select-time">
+                            <label>创建时间: </label>
+                            <input type="text" class="time-input time-input2" id="beginTime" placeholder="开始时间" name="beginTime">
+                            <span>-</span>
+                            <input type="text" class="time-input time-input2" id="endTime" placeholder="结束时间" name="endTime">
                         </div>
-                        <div class="customize-form-group">
-                            <label>创建时间:</label>
-                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
-                            </div>
                     </div>
                 </form>
             </div>
@@ -118,10 +142,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                    { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [{ field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'platformOrderNo', title: '平台订单号', align: 'center' },
                     { field: 'invoiceCode', title: '发票代码', align: 'center' },
                     { field: 'invoiceNumber', title: '发票号码', align: 'center' },

health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreAdd.html

@@ -8,85 +8,55 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SDdglOrderStore-add" class="customize-search-form">
         <div class="customize-form-group-container">
+
             <div class="customize-form-group">
-                <label>订单号:</label>
-                <input name="orderId" placeholder="订单号"  id="orderId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>配送类型:</label>
-                <input name="deliveryType" placeholder="配送类型"  id="deliveryType" class="styled-input" type="text">
+                <label>配送类型</label>
+                <select name="deliveryType"  class="styled-input">
+                    <option value="">全部</option>
+                    <option value="自提">自提</option>
+                    <option value="非自提">非自提</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>手机号:</label>
-                <input name="mobileNumber" placeholder="手机号"  id="mobileNumber" class="styled-input" type="text">
+                <input name="mobileNumber" placeholder="手机号"  id="mobileNumber" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>渠道名称:</label>
-                <input name="channelName" placeholder="渠道名称"  id="channelName" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>渠道单号:</label>
-                <input name="channelOrderNo" placeholder="渠道单号"  id="channelOrderNo" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>PSO销售单号:</label>
-                <input name="psoSaleOrderNo" placeholder="PSO销售单号"  id="psoSaleOrderNo" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>订单状态:</label>
-                <input name="orderStatus" placeholder="订单状态"  id="orderStatus" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>配送状态:</label>
-                <input name="deliveryStatus" placeholder="配送状态"  id="deliveryStatus" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>订单日期:</label>
-                <input name="orderDate" placeholder="订单日期"  id="orderDate" class="styled-input" type="text">
+                <select name="channelName"  class="styled-input">
+                    <option value="">全部</option>
+                    <option value="药急送">药急送</option>
+                    <option value="美团外卖">美团外卖</option>
+                    <option value="京东到家">京东到家</option>
+                    <option value="天猫商城">天猫商城</option>
+                    <option value="饿了么">饿了么</option>
+                </select>
             </div>
+
             <div class="customize-form-group">
                 <label>门店名称:</label>
-                <input name="storeName" placeholder="门店名称"  id="storeName" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>消费时间:</label>
-                <input name="consumptionTime" placeholder="消费时间"  id="consumptionTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>会员ID:</label>
-                <input name="memberId" placeholder="会员ID"  id="memberId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>会员名称:</label>
-                <input name="memberName" placeholder="会员名称"  id="memberName" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>系统登录人Id:</label>
-                <input name="systemLoginUserId" placeholder="系统登录人Id"  id="systemLoginUserId" class="styled-input" type="text">
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="styled-input">
             </div>
             <div class="customize-form-group">
                 <label>下单人:</label>
                 <input name="orderPlacer" placeholder="下单人"  id="orderPlacer" 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">
-            </div>
-            <div class="customize-form-group">
-                <label>结账单id:</label>
-                <input name="settlementId" placeholder="结账单id"  id="settlementId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>结账单code:</label>
-                <input name="settlementCode" placeholder="结账单code"  id="settlementCode" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后支付时间:</label>
-                <input name="finalPaymentTime" placeholder="最后完成支付的支付时间"  id="finalPaymentTime" class="styled-input" type="text">
-            </div>
+                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="time-input time-input2" type="text">
+            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>结账单id:</label>-->
+<!--                <input name="settlementId" placeholder="结账单id"  id="settlementId" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>结账单code:</label>-->
+<!--                <input name="settlementCode" placeholder="结账单code"  id="settlementCode" class="styled-input" type="text">-->
+<!--            </div>-->
+
             <div class="customize-form-group">
                 <label>药品总数量:</label>
-                <input name="totalDrugQuantity" placeholder="药品总数量"  id="totalDrugQuantity" class="styled-input" type="text">
+                <input name="totalDrugQuantity" placeholder="药品总数量"  id="totalDrugQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>卡号:</label>
@@ -101,16 +71,24 @@
                 <input name="orderAddress" placeholder="下单地址"  id="orderAddress" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单类型:</label>
-                <input name="orderType" placeholder="订单类型"  id="orderType" class="styled-input" type="text">
+                <label>订单类型</label>
+                <select name="orderType"  class="styled-input">
+                    <option value="">全部</option>
+                    <option value="正向单">正向单</option>
+                    <option value="逆向单">逆向单</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>订单来源:</label>
-                <input name="orderSource" placeholder="订单来源"  id="orderSource" class="styled-input" type="text">
+                <select name="orderSource"  class="styled-input"  th:with="type=${@dict.getType('sys_select_order_sources')}">
+                    <option value="">全部</option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${orderSource}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>订单总金额:</label>
-                <input name="totalAmount" placeholder="订单总金额"  id="totalAmount" class="styled-input" type="text">
+                <input name="totalAmount" placeholder="订单总金额"  id="totalAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>订单费用外送费:</label>
@@ -124,9 +102,9 @@
                 <label>外送提货方式:</label>
                 <input name="deliveryPickupMethod" placeholder="外送提货方式"  id="deliveryPickupMethod" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>外送提货时间:</label>
-                <input name="deliveryPickupTime" placeholder="外送提货时间"  id="deliveryPickupTime" class="styled-input" type="text">
+                <input name="deliveryPickupTime" placeholder="外送提货时间"  id="deliveryPickupTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>备注:</label>
@@ -161,6 +139,29 @@
             }
         });
     }
+
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
+
 </script>
 </body>
 </html>

health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreEdit.html

@@ -11,31 +11,27 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>订单号:</label>
-                <input name="orderId" placeholder="订单号" th:value="${orderId}" class="styled-input" type="text">
+                <input name="orderId" placeholder="订单号" th:value="${orderId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>配送类型:</label>
-                <input name="deliveryType" placeholder="配送类型" th:value="${deliveryType}" class="styled-input" type="text">
+                <input name="deliveryType" placeholder="配送类型" th:value="${deliveryType}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>手机号:</label>
-                <input name="mobileNumber" placeholder="手机号" th:value="${mobileNumber}" class="styled-input" type="text">
+                <input name="mobileNumber" placeholder="手机号" th:value="${mobileNumber}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>渠道名称:</label>
-                <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
+                <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text " disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>渠道单号:</label>
-                <input name="channelOrderNo" placeholder="渠道单号" th:value="${channelOrderNo}" class="styled-input" type="text">
+                <input name="channelOrderNo" placeholder="渠道单号" th:value="${channelOrderNo}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>PSO销售单号:</label>
-                <input name="psoSaleOrderNo" placeholder="PSO销售单号" th:value="${psoSaleOrderNo}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>订单状态:</label>
-                <input name="orderStatus" placeholder="订单状态" th:value="${orderStatus}" class="styled-input" type="text">
+                <input name="psoSaleOrderNo" placeholder="PSO销售单号" th:value="${psoSaleOrderNo}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>配送状态:</label>
@@ -47,53 +43,22 @@
             </div>
             <div class="customize-form-group">
                 <label>门店名称:</label>
-                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>消费时间:</label>
-                <input name="consumptionTime" placeholder="消费时间" th:value="${consumptionTime}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>会员ID:</label>
-                <input name="memberId" placeholder="会员ID" th:value="${memberId}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>会员名称:</label>
-                <input name="memberName" placeholder="会员名称" th:value="${memberName}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>系统登录人Id:</label>
-                <input name="systemLoginUserId" placeholder="系统登录人Id" th:value="${systemLoginUserId}" class="styled-input" type="text">
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text" disabled="true">
+
             </div>
             <div class="customize-form-group">
                 <label>下单人:</label>
                 <input name="orderPlacer" placeholder="下单人" th:value="${orderPlacer}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>结账单id:</label>
-                <input name="settlementId" placeholder="结账单id" th:value="${settlementId}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>结账单code:</label>
-                <input name="settlementCode" placeholder="结账单code" th:value="${settlementCode}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后支付时间:</label>
-                <input name="finalPaymentTime" placeholder="最后完成支付的支付时间" th:value="${finalPaymentTime}" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>药品总数量:</label>
                 <input name="totalDrugQuantity" placeholder="药品总数量" th:value="${totalDrugQuantity}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>卡号:</label>
-                <input name="cardNumber" placeholder="卡号" th:value="${cardNumber}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>发货地址:</label>
                 <input name="shippingAddress" placeholder="发货地址" th:value="${shippingAddress}" class="styled-input" type="text">
             </div>
@@ -103,31 +68,27 @@
             </div>
             <div class="customize-form-group">
                 <label>订单类型:</label>
-                <input name="orderType" placeholder="订单类型" th:value="${orderType}" class="styled-input" type="text">
+                <select name="orderType"  class="styled-input" th:value="${orderType}">
+                    <option value="线上">线上</option>
+                    <option value="线下">线下</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>订单来源:</label>
                 <input name="orderSource" placeholder="订单来源" th:value="${orderSource}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>订单总金额:</label>
-                <input name="totalAmount" placeholder="订单总金额" th:value="${totalAmount}" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>订单费用外送费:</label>
                 <input name="deliveryFee" placeholder="订单费用外送费" th:value="${deliveryFee}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>退款金额:</label>
-                <input name="refundAmount" placeholder="退款金额" th:value="${refundAmount}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>外送提货方式:</label>
                 <input name="deliveryPickupMethod" placeholder="外送提货方式" th:value="${deliveryPickupMethod}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>外送提货时间:</label>
-                <input name="deliveryPickupTime" placeholder="外送提货时间" th:value="${deliveryPickupTime}" class="styled-input" type="text">
+                <input name="deliveryPickupTime" placeholder="外送提货时间" th:value="${deliveryPickupTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>备注:</label>

health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreList.html

@@ -73,12 +73,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

health-admin/src/main/resources/templates/ddgl/SDdglOrderStorePageEdit.html

@@ -9,130 +9,88 @@
 
         <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="orderId" placeholder="订单号" th:value="${orderId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>配送类型:</label>
-                        <input name="deliveryType" placeholder="配送类型" th:value="${deliveryType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>手机号:</label>
-                        <input name="mobileNumber" placeholder="手机号" th:value="${mobileNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道名称:</label>
-                        <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道单号:</label>
-                        <input name="channelOrderNo" placeholder="渠道单号" th:value="${channelOrderNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>PSO销售单号:</label>
-                        <input name="psoSaleOrderNo" placeholder="PSO销售单号" th:value="${psoSaleOrderNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单状态:</label>
-                        <input name="orderStatus" placeholder="订单状态" th:value="${orderStatus}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>配送状态:</label>
-                        <input name="deliveryStatus" placeholder="配送状态" th:value="${deliveryStatus}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单日期:</label>
-                        <input name="orderDate" placeholder="订单日期" th:value="${orderDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>消费时间:</label>
-                        <input name="consumptionTime" placeholder="消费时间" th:value="${consumptionTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>会员ID:</label>
-                        <input name="memberId" placeholder="会员ID" th:value="${memberId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>会员名称:</label>
-                        <input name="memberName" placeholder="会员名称" th:value="${memberName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>系统登录人Id:</label>
-                        <input name="systemLoginUserId" placeholder="系统登录人Id" th:value="${systemLoginUserId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单人:</label>
-                        <input name="orderPlacer" placeholder="下单人" th:value="${orderPlacer}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单时间:</label>
-                        <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>结账单id:</label>
-                        <input name="settlementId" placeholder="结账单id" th:value="${settlementId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>结账单code:</label>
-                        <input name="settlementCode" placeholder="结账单code" th:value="${settlementCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后支付时间:</label>
-                        <input name="finalPaymentTime" placeholder="最后完成支付的支付时间" th:value="${finalPaymentTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>药品总数量:</label>
-                        <input name="totalDrugQuantity" placeholder="药品总数量" th:value="${totalDrugQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>卡号:</label>
-                        <input name="cardNumber" placeholder="卡号" th:value="${cardNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>发货地址:</label>
-                        <input name="shippingAddress" placeholder="发货地址" th:value="${shippingAddress}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单地址:</label>
-                        <input name="orderAddress" placeholder="下单地址" th:value="${orderAddress}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单类型:</label>
-                        <input name="orderType" placeholder="订单类型" th:value="${orderType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单来源:</label>
-                        <input name="orderSource" placeholder="订单来源" th:value="${orderSource}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单总金额:</label>
-                        <input name="totalAmount" placeholder="订单总金额" th:value="${totalAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单费用外送费:</label>
-                        <input name="deliveryFee" placeholder="订单费用外送费" th:value="${deliveryFee}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>退款金额:</label>
-                        <input name="refundAmount" placeholder="退款金额" th:value="${refundAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>外送提货方式:</label>
-                        <input name="deliveryPickupMethod" placeholder="外送提货方式" th:value="${deliveryPickupMethod}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>外送提货时间:</label>
-                        <input name="deliveryPickupTime" placeholder="外送提货时间" th:value="${deliveryPickupTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>备注:</label>
-                        <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>订单号:</label>
+                <input name="orderId" placeholder="订单号" th:value="${orderId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>配送类型:</label>
+                <input name="deliveryType" placeholder="配送类型" th:value="${deliveryType}" class="styled-input" type="text" disabled="true">
+
+            </div>
+            <div class="customize-form-group">
+                <label>手机号:</label>
+                <input name="mobileNumber" placeholder="手机号" th:value="${mobileNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道名称:</label>
+                <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text " disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道单号:</label>
+                <input name="channelOrderNo" placeholder="渠道单号" th:value="${channelOrderNo}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>PSO销售单号:</label>
+                <input name="psoSaleOrderNo" placeholder="PSO销售单号" th:value="${psoSaleOrderNo}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>配送状态:</label>
+                <input name="deliveryStatus" placeholder="配送状态" th:value="${deliveryStatus}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>订单日期:</label>
+                <input name="orderDate" placeholder="订单日期" th:value="${orderDate}" class="time-input time-input2" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>下单人:</label>
+                <input name="orderPlacer" placeholder="下单人" th:value="${orderPlacer}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>下单时间:</label>
+                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>药品总数量:</label>
+                <input name="totalDrugQuantity" placeholder="药品总数量" th:value="${totalDrugQuantity}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>发货地址:</label>
+                <input name="shippingAddress" placeholder="发货地址" th:value="${shippingAddress}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>下单地址:</label>
+                <input name="orderAddress" placeholder="下单地址" th:value="${orderAddress}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>订单类型:</label>
+                <input name="orderType" placeholder="订单类型" th:value="${orderType}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>订单来源:</label>
+                <input name="orderSource" placeholder="订单来源" th:value="${orderSource}" class="styled-input" type="text">
+            </div>
+
+            <div class="customize-form-group">
+                <label>订单费用外送费:</label>
+                <input name="deliveryFee" placeholder="订单费用外送费" th:value="${deliveryFee}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>外送提货方式:</label>
+                <input name="deliveryPickupMethod" placeholder="外送提货方式" th:value="${deliveryPickupMethod}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>外送提货时间:</label>
+                <input name="deliveryPickupTime" placeholder="外送提货时间" th:value="${deliveryPickupTime}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>备注:</label>
+                <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/dtp/archives/archivesList.html

@@ -125,9 +125,7 @@
 				fixedColumns: true,
 				//fixedNumber: 3,
 				fixedRightNumber: 1,
-		        columns: [{
-		            checkbox: true
-		        },
+		        columns: [
 				{field: 'name', title: '姓名', align: 'center'},
 				{field: 'gender', title: '性别', align: 'center'},
 				{field: 'age', title: '年龄', align: 'center'},

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

@@ -111,9 +111,9 @@
                     { field: 'createdDate', title: '创建日期', align: 'center' },
                     { field: 'recipientPhone', title: '收货人手机号', align: 'center' },
                     { field: 'recipientName', title: '收货人姓名', align: 'center' },
-                    { field: 'orderStatus', title: '订单状态', align: 'center' },/*1待审核, 2审核, 3驳回*/
+                    { field: 'orderStatus', title: '定购状态', align: 'center' },
                     { field: 'operator', title: '操作人', align: 'center' },
-                    { field: 'depositPaymentStatus', title: '定金支付状态', align: 'center' }]/*定金支付状态：1支付中，2未支付，3支付完成*/
+                    { field: 'depositPaymentStatus', title: '定金支付状态', align: 'center' }]
         };
         $.table.init(options);
     }

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

@@ -27,7 +27,11 @@
             </div>
             <div class="customize-form-group">
                 <label>权益的状态:</label>
-                <input name="benefitStatus" placeholder="权益的状态"  id="benefitStatus" class="styled-input" type="text">
+                <select name="benefitStatus"  th:with="type=${@dict.getType('sys_select_qygl_qyzt')}" class="styled-input">
+
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>权益的详细说明:</label>

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

@@ -27,8 +27,13 @@
                             <input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>券码:</label>
-                            <input type="text" class="styled-input" name="couponCode" autocomplete="off"/>
+                            <label>状态: </label>
+                            <select name="status"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="创建中">创建中</option>
+                                <option value="未开始">未开始</option>
+                                <option value="进行中">进行中</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>店员工号:</label>
@@ -36,37 +41,35 @@
                         </div>
                         <div class="customize-form-group select-time">
                                 <label>发生时间:</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                                <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>
-                    <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </div>
+                            <label>券码: </label>
+                            <input type="text" class="styled-input" name="couponCode" autocomplete="off"/>
+                        </div>
                     </div>
                 </form>
             </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
+<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">-->
+<!--                    <i class="fa fa-plus"></i> 新增-->
+<!--                </a>-->
+<!--                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
+<!--                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">-->
+<!--                    <i class="fa fa-upload"></i> 导入-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
+<!--            </div>-->
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
                 <table id="bootstrap-table" class="fixed-layout-table"></table>
@@ -77,7 +80,6 @@
 
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: layout-latest-js" />
-<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 <th:block th:include="include :: ztree-js" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];
@@ -123,10 +125,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [ { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'commissionSource', title: '提成来源', align: 'center' },
                     { field: 'rewardType', title: '奖励类型', align: 'center' },
                     { field: 'occurrenceTime', title: '发生时间', align: 'center' },
@@ -147,12 +146,7 @@
                     formatter: function(value, row, index) {
                         if (row.id) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

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

@@ -8,13 +8,15 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SJkglGyhyHyflCategoryinfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>分类名称:</label>
-                <input name="categoryName" placeholder="分类名称"  id="categoryName" class="styled-input" type="text">
+                <select name="categoryName"  class="styled-input">
+                    <option value="待确定">待确定</option>
+                    <option value="高血压">高血压</option>
+                    <option value="呼气类">呼气类</option>
+                    <option value="保健类">保健类</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>包含合约:</label>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>分类名称:</label>

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

@@ -34,7 +34,13 @@
                         </div>
                         <div class="customize-form-group">
                             <label>分类名称:</label>
-                            <input type="text" class="styled-input" name="categoryName" autocomplete="off"/>
+                            <select name="categoryName"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="待确定">待确定</option>
+                                <option value="高血压">高血压</option>
+                                <option value="呼气类">呼气类</option>
+                                <option value="保健类">保健类</option>
+                            </select>
                         </div>
                     </div>
                 </form>
@@ -50,12 +56,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
                             <label>创建日期:</label>
-                        <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                        <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
                     </div>
                     <div class="customize-form-group">
                             <label>分类名称:</label>

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

@@ -8,45 +8,60 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SJkglGyhyHyglContractinfo-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="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text">
+                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>合约分类:</label>
-                <input name="contractCategory" placeholder="合约分类"  id="contractCategory" class="styled-input" type="text">
+                <select name="contractCategory"  class="styled-input">
+                    <option value="待确定">待确定</option>
+                    <option value="高血压">高血压</option>
+                    <option value="呼气类">呼气类</option>
+                    <option value="保健类">保健类</option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>合约有效时间:</label>
-                <input name="contractValidPeriod" placeholder="合约有效时间"  id="contractValidPeriod" class="styled-input" type="text">
+                <input name="contractValidPeriod" placeholder="合约有效时间"  id="contractValidPeriod" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>签约有效时间:</label>
-                <input name="signingValidPeriod" placeholder="签约有效时间"  id="signingValidPeriod" class="styled-input" type="text">
+                <input name="signingValidPeriod" placeholder="签约有效时间"  id="signingValidPeriod" 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">
+                <select name="status"  class="styled-input">
+                    <option value="创建中">创建中</option>
+                    <option value="未开始">未开始</option>
+                    <option value="进行中">进行中</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>合约性质:</label>
-                <input name="contractNature" placeholder="合约性质"  id="contractNature" class="styled-input" type="text">
+                <select name="contractNature"  class="styled-input">
+                    <option value="总部合约">总部合约</option>
+                    <option value="项目部合约">项目部合约</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否配置药品维系:</label>
-                <input name="isDrugMaintenanceConfigured" placeholder="是否配置药品维系"  id="isDrugMaintenanceConfigured" class="styled-input" type="text">
+                <select name="isDrugMaintenanceConfigured"  class="styled-input">
+                    <option value="是">是</option>
+                    <option value="否">否</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>参与人次:</label>
-                <input name="participationCount" placeholder="参与人次"  id="participationCount" class="styled-input" type="text">
+                <input name="participationCount" placeholder="参与人次"  id="participationCount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>核销人次:</label>
-                <input name="verificationCount" placeholder="核销人次"  id="verificationCount" class="styled-input" type="text">
+                <input name="verificationCount" placeholder="核销人次"  id="verificationCount" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -11,23 +11,23 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
+                <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>合约分类:</label>
                 <input name="contractCategory" placeholder="合约分类" th:value="${contractCategory}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>合约有效时间:</label>
-                <input name="contractValidPeriod" placeholder="合约有效时间" th:value="${contractValidPeriod}" class="styled-input" type="text">
+                <input name="contractValidPeriod" placeholder="合约有效时间" th:value="${contractValidPeriod}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>签约有效时间:</label>
-                <input name="signingValidPeriod" placeholder="签约有效时间" th:value="${signingValidPeriod}" class="styled-input" type="text">
+                <input name="signingValidPeriod" placeholder="签约有效时间" th:value="${signingValidPeriod}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>

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

@@ -31,38 +31,49 @@
                             <input type="text" class="styled-input" name="theme" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>状态:</label>
+                            <label>状态: </label>
                             <input type="text" class="styled-input" name="status" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group select-time">
-                            <label for="startTime">创建日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label for="beginTime">创建日期:</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 class="customize-form-group">
-                            <label>合约分类:</label>
-                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
+                            <label>合约分类: </label>
+                            <select name="contractCategory"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="待确定">待确定</option>
+                                <option value="高血压">高血压</option>
+                                <option value="呼气类">呼气类</option>
+                                <option value="保健类">保健类</option>
+                            </select>
                         </div>
+<!--                        <div class="customize-form-group">-->
+<!--                            <label>升级尊享: </label>-->
+<!--                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>-->
+<!--                        </div>-->
                         <div class="customize-form-group">
-                            <label>升级尊享:</label>
-                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>合约性质:</label>
-                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>合约模板:</label>
-                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
-                        </div>
-                    </div>
-                    <div class="customize-form-group-container">
-                        <div class="customize-form-group">
-                            <label>删除合约:</label>
-                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
+                            <label>合约性质: </label>
+                            <select name="contractNature"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="总部合约">总部合约</option>
+                                <option value="项目部合约">项目部合约</option>
+                            </select>
                         </div>
+
                     </div>
+<!--                    <div class="customize-form-group-container">-->
+<!--                        <div class="customize-form-group">-->
+<!--                            <label>删除合约: </label>-->
+<!--                            <select name="contractNature"  class="styled-input">-->
+<!--                                <option value="">全部</option>-->
+<!--                                <option value="未删除">未删除</option>-->
+<!--                                <option value="已删除">已删除</option>-->
+<!--                            </select>-->
+<!--                        </div>-->
+<!--                    </div>-->
                 </form>
             </div>
 
@@ -76,12 +87,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -14,7 +14,7 @@
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text">
+                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>合约分类:</label>

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

@@ -27,22 +27,37 @@
                             <input type="text" class="styled-input" name="theme" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            <label>状态: </label>
+                            <select name="status"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="创建中">创建中</option>
+                                <option value="未开始">未开始</option>
+                                <option value="进行中">进行中</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
-                            <label>合约性质:</label>
-                            <input type="text" class="styled-input" name="contractNature" autocomplete="off"/>
+                            <label>合约性质: </label>
+                            <select name="contractNature"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="总部合约">总部合约</option>
+                                <option value="项目部合约">项目部合约</option>
+                            </select>
                         </div>
                         <div class="customize-form-group select-time">
-                            <label for="startTime">创建日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <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 class="customize-form-group">
-                            <label>合约分类:</label>
-                            <input type="text" class="styled-input" name="contractCategory" autocomplete="off"/>
+                            <label>合约分类: </label>
+                            <select name="contractCategory"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="待确定">待确定</option>
+                                <option value="高血压">高血压</option>
+                                <option value="呼气类">呼气类</option>
+                                <option value="保健类">保健类</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>商品名称:</label>
@@ -52,10 +67,7 @@
                             <label>商品编码:</label>
                             <input type="text" class="styled-input" name="endTime" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>删除合约:</label>
-                            <input type="text" class="styled-input" name="signingStartTime" autocomplete="off"/>
-                            </div>
+
                     </div>
                 </form>
             </div>
@@ -70,10 +82,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
+                <a class="btn btn-warning" onclick="" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>

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

@@ -8,21 +8,18 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SJkglGyhyYjtjActivityinfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text">
+                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text" required>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>开始时间:</label>
-                <input name="startTime" placeholder="开始时间"  id="startTime" class="styled-input" type="text">
+                <input name="startTime" placeholder="开始时间"  id="startTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>结束时间:</label>
-                <input name="endTime" placeholder="结束时间"  id="endTime" class="styled-input" type="text">
+                <input name="endTime" placeholder="结束时间"  id="endTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>使用合约:</label>
@@ -30,15 +27,19 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="已停用">已停用</option>
+                    <option value="已结束">已结束</option>
+                    <option value="进行中">进行中</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>邀请人数:</label>
-                <input name="invitedCount" placeholder="邀请人数"  id="invitedCount" class="styled-input" type="text">
+                <input name="invitedCount" placeholder="邀请人数"  id="invitedCount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成功人数:</label>
-                <input name="successCount" placeholder="成功人数"  id="successCount" class="styled-input" type="text">
+                <input name="successCount" placeholder="成功人数"  id="successCount" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -9,21 +9,21 @@
 
         <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="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="time-input time-input2" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
                 <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>开始时间:</label>
-                <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="styled-input" type="text">
+                <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>结束时间:</label>
-                <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="styled-input" type="text">
+                <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>使用合约:</label>
@@ -31,15 +31,15 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>邀请人数:</label>
-                <input name="invitedCount" placeholder="邀请人数" th:value="${invitedCount}" class="styled-input" type="text">
+                <input name="invitedCount" placeholder="邀请人数" th:value="${invitedCount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成功人数:</label>
-                <input name="successCount" placeholder="成功人数" th:value="${successCount}" class="styled-input" type="text">
+                <input name="successCount" placeholder="成功人数" th:value="${successCount}" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -23,18 +23,23 @@
                 <form id="SJkglGyhyYjtjActivityinfo-form" class="customize-search-form">
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>主题:</label>
-                            <input type="text" class="styled-input" name="theme" autocomplete="off"/>
+                            <label>主题: </label>
+                            <input type="text" class="styled-input" placeholder="请输入主题" name="theme" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            <label>推荐状态: </label>
+                            <select name="status"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="已停用">已停用</option>
+                                <option value="已结束">已结束</option>
+                                <option value="进行中">进行中</option>
+                            </select>
                         </div>
                         <div class="customize-form-group select-time">
-                            <label for="startTime">创建日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label for="beginTime">创建日期:</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/jkgl/SJkglGyhyYjtjActivityinfoPageEdit.html

@@ -9,38 +9,38 @@
 
         <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="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>主题:</label>
-                        <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>开始时间:</label>
-                        <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>结束时间:</label>
-                        <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>使用合约:</label>
-                        <input name="usedContract" placeholder="使用合约" th:value="${usedContract}" 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">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>邀请人数:</label>
-                        <input name="invitedCount" placeholder="邀请人数" th:value="${invitedCount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>成功人数:</label>
-                        <input name="successCount" placeholder="成功人数" th:value="${successCount}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group select-time">
+                <label>创建日期:</label>
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="time-input time-input2" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>主题:</label>
+                <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>开始时间:</label>
+                <input name="startTime" placeholder="开始时间" th:value="${startTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>结束时间:</label>
+                <input name="endTime" placeholder="结束时间" th:value="${endTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>使用合约:</label>
+                <input name="usedContract" placeholder="使用合约" th:value="${usedContract}" 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" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>邀请人数:</label>
+                <input name="invitedCount" placeholder="邀请人数" th:value="${invitedCount}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>成功人数:</label>
+                <input name="successCount" placeholder="成功人数" th:value="${successCount}" class="styled-input" type="number">
+            </div>
         </div>
     </form>
 </div>

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

@@ -8,13 +8,13 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SJkglMbglQyglBenefitinfo-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="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>权益主题:</label>
-                <input name="benefitSubject" placeholder="权益主题"  id="benefitSubject" class="styled-input" type="text">
+                <input name="benefitSubject" placeholder="权益主题"  id="benefitSubject" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>疾病标签:</label>
@@ -26,7 +26,10 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <select name="status" class="styled-input" th:with="type=${@dict.getType('sys_select_qygl_qyzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${status}"></option>
+                </select>
             </div>
         </div>
     </form>

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

@@ -27,7 +27,11 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                <select name="status" class="styled-input" th:with="type=${@dict.getType('sys_select_qygl_qyzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${status}"></option>
+                </select>
+
             </div>
         </div>
     </form>

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

@@ -24,11 +24,15 @@
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>权益主题:</label>
-                            <input type="text" class="styled-input" name="benefitSubject" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入权益主题" name="benefitSubject" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            <select name="status"  th:with="type=${@dict.getType('sys_select_qygl_qyzt')}" class="styled-input">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group select-time">
                             <label for="startTime">创建日期:</label>
@@ -50,12 +54,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -27,7 +27,10 @@
                     </div>
                     <div class="customize-form-group">
                             <label>状态:</label>
-                        <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                        <select name="status" class="styled-input" th:with="type=${@dict.getType('sys_select_qygl_qyzt')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                    th:selected="${dict.dictLabel}==${status}"></option>
+                        </select>
                     </div>
         </div>
     </form>

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

@@ -10,15 +10,21 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>字段名称:</label>
-                <input name="fieldName" placeholder="字段名称"  id="fieldName" class="styled-input" type="text">
+                <input name="fieldName" placeholder="字段名称"  id="fieldName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>是否启用:</label>
-                <input name="isEnabled" placeholder="是否启用"  id="isEnabled" class="styled-input" type="text">
+                <select name="isEnabled" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否必填:</label>
-                <input name="isMandatory" placeholder="是否必填"  id="isMandatory" class="styled-input" type="text">
+                <select name="isMandatory" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>单位:</label>
@@ -26,7 +32,7 @@
             </div>
             <div class="customize-form-group">
                 <label>字段长度:</label>
-                <input name="fieldLength" placeholder="字段长度"  id="fieldLength" class="styled-input" type="text">
+                <input name="fieldLength" placeholder="字段长度"  id="fieldLength" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>录入形式:</label>

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

@@ -15,11 +15,17 @@
             </div>
             <div class="customize-form-group">
                 <label>是否启用:</label>
-                <input name="isEnabled" placeholder="是否启用" th:value="${isEnabled}" class="styled-input" type="text">
+                <select name="isEnabled" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${isEnabled}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否必填:</label>
-                <input name="isMandatory" placeholder="是否必填" th:value="${isMandatory}" class="styled-input" type="text">
+                <select name="isMandatory" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${isMandatory}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>单位:</label>
@@ -27,7 +33,7 @@
             </div>
             <div class="customize-form-group">
                 <label>字段长度:</label>
-                <input name="fieldLength" placeholder="字段长度" th:value="${fieldLength}" class="styled-input" type="text">
+                <input name="fieldLength" placeholder="字段长度" th:value="${fieldLength}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>录入形式:</label>

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

@@ -12,45 +12,25 @@
 <div class="ui-layout-center">
     <div class="container-div">
         <div class="row">
-            <!--<div class="col-sm-12 search-collapse" >
+           <div class="col-sm-12 search-collapse" >
+               <div class="query-condition-container">
+                   <h4 class="query-condition-title">查询条件</h4>
+                   <div class="query-buttons">
+                       <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                       <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                   </div>
+               </div>
                 <form id="SJkglMxbZdyFieldconfig-form" class="customize-search-form">
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>字段名称:</label>
-                            <input type="text" class="styled-input" name="fieldName" autocomplete="off"/>
+                            <label>字段名称: </label>
+                            <input type="text" class="styled-input" placeholder="字段名称" name="fieldName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>是否启用:</label>
-                            <input type="text" class="styled-input" name="isEnabled" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>是否必填:</label>
-                            <input type="text" class="styled-input" name="isMandatory" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>单位:</label>
-                            <input type="text" class="styled-input" name="unit" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>字段长度:</label>
-                            <input type="text" class="styled-input" name="fieldLength" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>录入形式:</label>
-                            <input type="text" class="styled-input" name="entryForm" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>启用位置:</label>
-                            <input type="text" class="styled-input" name="enableLocation" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>分组名称:</label>
-                            <input type="text" class="styled-input" name="groupName" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>修改选项值:</label>
-                            <input type="text" class="styled-input" name="modificationOptions" autocomplete="off"/>
+                            <label>分组名称: </label>
+                            <input type="text" class="styled-input"  placeholder="分组名称" name="groupName" autocomplete="off"/>
                         </div>
+
                     </div>
                 </form>
             </div>
@@ -59,22 +39,15 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
                     <i class="fa fa-plus"></i> 新增
                 </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>-->
-
-            <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
-                <table id="bootstrap-table" class="fixed-layout-table"></table>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
             </div>
         </div>
     </div>
@@ -130,8 +103,9 @@
             fixedRightNumber: 1,
             columns: [{
                 checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+                    },
+
+                   { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'fieldName', title: '字段名称', align: 'center' },
                     { field: 'isEnabled', title: '是否启用', align: 'center' },
                     { field: 'isMandatory', title: '是否必填', align: 'center' },
@@ -150,10 +124,6 @@
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
                             return actions.join('');
                         } else {
                             return "";

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

@@ -15,11 +15,17 @@
                     </div>
                     <div class="customize-form-group">
                             <label>是否启用:</label>
-                        <input name="isEnabled" placeholder="是否启用" th:value="${isEnabled}" class="styled-input" type="text">
+                        <select name="isEnabled" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                    th:selected="${dict.dictLabel}==${isEnabled}"></option>
+                        </select>
                     </div>
                     <div class="customize-form-group">
                             <label>是否必填:</label>
-                        <input name="isMandatory" placeholder="是否必填" th:value="${isMandatory}" class="styled-input" type="text">
+                        <select name="isMandatory" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                    th:selected="${dict.dictLabel}==${isMandatory}"></option>
+                        </select>
                     </div>
                     <div class="customize-form-group">
                             <label>单位:</label>
@@ -27,7 +33,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>字段长度:</label>
-                        <input name="fieldLength" placeholder="字段长度" th:value="${fieldLength}" class="styled-input" type="text">
+                        <input name="fieldLength" placeholder="字段长度" th:value="${fieldLength}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>录入形式:</label>

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

@@ -8,29 +8,39 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SJkglRegistrationinfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text">
+                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>登记类型:</label>
-                <input name="registrationType" placeholder="登记类型"  id="registrationType" class="styled-input" type="text">
+                <select name="registrationType"  class="styled-input">
+                    <option value="">全部</option>
+                    <option value="预约登记">预约登记</option>
+                    <option value="购药登记">购药登记</option>
+                    <option value="患者信息登记">患者信息登记</option>
+                    <option value="问卷登记">问卷登记</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否强管控:</label>
-                <input name="isStrictControl" placeholder="是否强管控"  id="isStrictControl" class="styled-input" type="text">
+                <select name="isStrictControl"  class="styled-input">
+                    <option value="是">是</option>
+                    <option value="否">否</option>
+
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="进行中">进行中</option>
+                    <option value="已停用">已停用</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>登记次数:</label>
-                <input name="registrationCount" placeholder="登记次数"  id="registrationCount" class="styled-input" type="text">
+                <input name="registrationCount" placeholder="登记次数"  id="registrationCount" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
@@ -19,19 +19,19 @@
             </div>
             <div class="customize-form-group">
                 <label>登记类型:</label>
-                <input name="registrationType" placeholder="登记类型" th:value="${registrationType}" class="styled-input" type="text">
+                <input name="registrationType" placeholder="登记类型" th:value="${registrationType}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>是否强管控:</label>
-                <input name="isStrictControl" placeholder="是否强管控" th:value="${isStrictControl}" class="styled-input" type="text">
+                <input name="isStrictControl" placeholder="是否强管控" th:value="${isStrictControl}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>登记次数:</label>
-                <input name="registrationCount" placeholder="登记次数" th:value="${registrationCount}" class="styled-input" type="text">
+                <input name="registrationCount" placeholder="登记次数" th:value="${registrationCount}" class="styled-input" type="number">
             </div>
         </div>
     </form>

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

@@ -28,21 +28,31 @@
                         </div>
                         <div class="customize-form-group">
                             <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            <select name="status"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="进行中">进行中</option>
+                                <option value="已停用">已停用</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>登记类型:</label>
-                            <input type="text" class="styled-input" name="registrationType" autocomplete="off"/>
+                            <select name="registrationType"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="预约登记">预约登记</option>
+                                <option value="购药登记">购药登记</option>
+                                <option value="患者信息登记">患者信息登记</option>
+                                <option value="问卷登记">问卷登记</option>
+                            </select>
                         </div>
                             <!--<li>
                                 创建日期:</label>
                             <input type="text" class="styled-input" name="creationDate" autocomplete="off"/>
                             </li>-->
                         <div class="customize-form-group select-time">
-                            <label for="startTime">创建日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label for="beginTime">创建日期:</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>
@@ -58,12 +68,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -9,30 +9,30 @@
 
         <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="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>主题:</label>
-                        <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>登记类型:</label>
-                        <input name="registrationType" placeholder="登记类型" th:value="${registrationType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>是否强管控:</label>
-                        <input name="isStrictControl" placeholder="是否强管控" th:value="${isStrictControl}" 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">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>登记次数:</label>
-                        <input name="registrationCount" placeholder="登记次数" th:value="${registrationCount}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>创建日期:</label>
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>主题:</label>
+                <input name="theme" placeholder="主题" th:value="${theme}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>登记类型:</label>
+                <input name="registrationType" placeholder="登记类型" th:value="${registrationType}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>是否强管控:</label>
+                <input name="isStrictControl" placeholder="是否强管控" th:value="${isStrictControl}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>登记次数:</label>
+                <input name="registrationCount" placeholder="登记次数" th:value="${registrationCount}" class="styled-input" type="number">
+            </div>
         </div>
     </form>
 </div>

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

@@ -9,12 +9,8 @@
     <form id="form-SJkglYpwxServiceprojectinfo-add" class="customize-search-form">
         <div class="customize-form-group-container">
             <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期"  id="creationDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>主题:</label>
-                <input name="theme" placeholder="主题"  id="theme" class="styled-input" type="text">
+                <input name="theme" placeholder="请输入主题"  id="theme" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>包含药品:</label>
@@ -22,27 +18,44 @@
             </div>
             <div class="customize-form-group">
                 <label>维系模式:</label>
-                <input name="maintenanceMode" placeholder="维系模式"  id="maintenanceMode" class="styled-input" type="text">
+                <select name="maintenanceMode"  class="styled-input">
+                    <option value="复购模式">复购模式</option>
+                    <option value="一次性模式">一次性模式</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>服务期数:</label>
-                <input name="servicePeriods" placeholder="服务期数"  id="servicePeriods" class="styled-input" type="text">
+                <input name="servicePeriods" placeholder="服务期数"  id="servicePeriods" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="停用">停用</option>
+                    <option value="进行中">进行中</option>
+                    <option value="未开启">未开启</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>服务人数:</label>
-                <input name="servedPeople" placeholder="服务人数"  id="servedPeople" class="styled-input" type="text">
+                <input name="servedPeople" placeholder="服务人数"  id="servedPeople" class="styled-input" type="number">
             </div>
+
+
+        </div>
+        <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>是否配置短信模板:</label>
-                <input name="isSmsTemplateConfigured" placeholder="是否配置短信模板"  id="isSmsTemplateConfigured" class="styled-input" type="text">
+                <select name="isSmsTemplateConfigured"  class="styled-input">
+                    <option value="是">是</option>
+                    <option value="否">否</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>数据来源:</label>
-                <input name="dataSource" placeholder="数据来源"  id="dataSource" class="styled-input" type="text">
+                <select name="dataSource"  class="styled-input">
+                    <option value="平台投放">平台投放</option>
+                    <option value="企业创建">企业创建</option>
+                </select>
             </div>
         </div>
     </form>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建日期:</label>
-                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text">
+                <input name="creationDate" placeholder="创建日期" th:value="${creationDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>主题:</label>
@@ -27,7 +27,7 @@
             </div>
             <div class="customize-form-group">
                 <label>服务期数:</label>
-                <input name="servicePeriods" placeholder="服务期数" th:value="${servicePeriods}" class="styled-input" type="text">
+                <input name="servicePeriods" placeholder="服务期数" th:value="${servicePeriods}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
@@ -35,7 +35,7 @@
             </div>
             <div class="customize-form-group">
                 <label>服务人数:</label>
-                <input name="servedPeople" placeholder="服务人数" th:value="${servedPeople}" class="styled-input" type="text">
+                <input name="servedPeople" placeholder="服务人数" th:value="${servedPeople}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>是否配置短信模板:</label>

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

@@ -65,10 +65,10 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
                     <i class="fa fa-plus"></i> 新建服务
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
+                <a class="btn btn-warning" onclick="" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 下载回访明细
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
+                <a class="btn btn-warning" onclick="" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 下载维系模版
                 </a>
             </div>
@@ -138,7 +138,22 @@
                     { field: 'status', title: '状态', align: 'center' },
                     { field: 'servedPeople', title: '服务人数', align: 'center' },
                     { field: 'isSmsTemplateConfigured', title: '是否配置短信模板', align: 'center' },
-                    { field: 'dataSource', title: '数据来源', align: 'center' }]
+                    { field: 'dataSource', title: '数据来源', align: 'center' },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        if (row.id) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick=""><i class="fa fa-edit"></i>查看</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                            return actions.join('');
+                        } else {
+                            return "";
+                        }
+                    }
+                }]
         };
         $.table.init(options);
     }

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

@@ -27,7 +27,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>服务期数:</label>
-                        <input name="servicePeriods" placeholder="服务期数" th:value="${servicePeriods}" class="styled-input" type="text">
+                        <input name="servicePeriods" placeholder="服务期数" th:value="${servicePeriods}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>状态:</label>
@@ -35,7 +35,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>服务人数:</label>
-                        <input name="servedPeople" placeholder="服务人数" th:value="${servedPeople}" class="styled-input" type="text">
+                        <input name="servedPeople" placeholder="服务人数" th:value="${servedPeople}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>是否配置短信模板:</label>

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

@@ -10,23 +10,23 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>序号:</label>
-                <input name="sequenceNumber" placeholder="序号"  id="sequenceNumber" class="styled-input" type="text">
+                <input name="sequenceNumber" placeholder="序号"  id="sequenceNumber" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>门店名称:</label>
-                <input name="storeName" placeholder="门店名称"  id="storeName" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>建档日期:</label>
-                <input name="jdDate" placeholder="建档日期"  id="jdDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>员工编码:</label>
-                <input name="employeeCode" placeholder="员工编码"  id="employeeCode" class="styled-input" type="text">
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="styled-input" required>
             </div>
+<!--            <div class="customize-form-group select-time">-->
+<!--                <label>建档日期:</label>-->
+<!--                <input name="jdDate" placeholder="建档日期"  id="jdDate" class="time-input time-input2" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>员工编码:</label>-->
+<!--                <input name="employeeCode" placeholder="员工编码"  id="employeeCode" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>员工姓名:</label>
-                <input name="employeeName" placeholder="员工姓名"  id="employeeName" class="styled-input" type="text">
+                <input name="employeeName" placeholder="员工姓名"  id="employeeName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>部门编号:</label>
@@ -36,13 +36,13 @@
                 <label>门店编码:</label>
                 <input name="storeCode" placeholder="门店编码"  id="storeCode" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>出生日期:</label>
-                <input name="birthDate" placeholder="出生日期"  id="birthDate" class="styled-input" type="text">
+                <input name="birthDate" placeholder="出生日期"  id="birthDate" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
-                <input name="contactNumber" placeholder="联系电话"  id="contactNumber" class="styled-input" type="text">
+                <input name="contactNumber" placeholder="联系电话"  id="contactNumber" class="styled-input" type="number" maxlength="11" required>
             </div>
             <div class="customize-form-group">
                 <label>民族:</label>
@@ -101,6 +101,27 @@
             }
         });
     }
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
 </script>
 </body>
 </html>

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

@@ -15,19 +15,19 @@
             </div>
             <div class="customize-form-group">
                 <label>门店名称:</label>
-                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="styled-input" required>
             </div>
             <div class="customize-form-group">
                 <label>建档日期:</label>
-                <input name="jdDate" placeholder="建档日期" th:value="${jdDate}" class="styled-input" type="text">
+                <input name="jdDate" placeholder="建档日期" th:value="${jdDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>员工编码:</label>
-                <input name="employeeCode" placeholder="员工编码" th:value="${employeeCode}" class="styled-input" type="text">
+                <input name="employeeCode" placeholder="员工编码" th:value="${employeeCode}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>员工姓名:</label>
-                <input name="employeeName" placeholder="员工姓名" th:value="${employeeName}" class="styled-input" type="text">
+                <input name="employeeName" placeholder="员工姓名" th:value="${employeeName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>部门编号:</label>
@@ -37,9 +37,9 @@
                 <label>门店编码:</label>
                 <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>出生日期:</label>
-                <input name="birthDate" placeholder="出生日期" th:value="${birthDate}" class="styled-input" type="text">
+                <input name="birthDate" placeholder="出生日期" th:value="${birthDate}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
@@ -106,4 +106,25 @@
             edit();
         }
     }
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
 </script>

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

@@ -40,12 +40,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -9,70 +9,70 @@
 
         <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="sequenceNumber" placeholder="序号" th:value="${sequenceNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>建档日期:</label>
-                        <input name="jdDate" placeholder="建档日期" th:value="${jdDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>员工编码:</label>
-                        <input name="employeeCode" placeholder="员工编码" th:value="${employeeCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>员工姓名:</label>
-                        <input name="employeeName" placeholder="员工姓名" th:value="${employeeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>部门编号:</label>
-                        <input name="departmentId" placeholder="部门编号" th:value="${departmentId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店编码:</label>
-                        <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>出生日期:</label>
-                        <input name="birthDate" placeholder="出生日期" th:value="${birthDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>联系电话:</label>
-                        <input name="contactNumber" placeholder="联系电话" th:value="${contactNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>民族:</label>
-                        <input name="nationality" placeholder="民族" th:value="${nationality}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>执证书编号:</label>
-                        <input name="certificateNumber" placeholder="执证书编号" th:value="${certificateNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>资格证书:</label>
-                        <input name="qualificationCertificate" placeholder="资格证书" th:value="${qualificationCertificate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>职务:</label>
-                        <input name="position" placeholder="职务" th:value="${position}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>毕业院校:</label>
-                        <input name="graduationInstitution" placeholder="毕业院校" th:value="${graduationInstitution}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>专业:</label>
-                        <input name="major" placeholder="专业" th:value="${major}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>文化专业:</label>
-                        <input name="educationalSpecialty" placeholder="文化专业" th:value="${educationalSpecialty}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>序号:</label>
+                <input name="sequenceNumber" placeholder="序号" th:value="${sequenceNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="styled-input" required>
+            </div>
+            <div class="customize-form-group">
+                <label>建档日期:</label>
+                <input name="jdDate" placeholder="建档日期" th:value="${jdDate}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>员工编码:</label>
+                <input name="employeeCode" placeholder="员工编码" th:value="${employeeCode}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>员工姓名:</label>
+                <input name="employeeName" placeholder="员工姓名" th:value="${employeeName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>部门编号:</label>
+                <input name="departmentId" placeholder="部门编号" th:value="${departmentId}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店编码:</label>
+                <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>出生日期:</label>
+                <input name="birthDate" placeholder="出生日期" th:value="${birthDate}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>联系电话:</label>
+                <input name="contactNumber" placeholder="联系电话" th:value="${contactNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>民族:</label>
+                <input name="nationality" placeholder="民族" th:value="${nationality}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>执证书编号:</label>
+                <input name="certificateNumber" placeholder="执证书编号" th:value="${certificateNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>资格证书:</label>
+                <input name="qualificationCertificate" placeholder="资格证书" th:value="${qualificationCertificate}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>职务:</label>
+                <input name="position" placeholder="职务" th:value="${position}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>毕业院校:</label>
+                <input name="graduationInstitution" placeholder="毕业院校" th:value="${graduationInstitution}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>专业:</label>
+                <input name="major" placeholder="专业" th:value="${major}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>文化专业:</label>
+                <input name="educationalSpecialty" placeholder="文化专业" th:value="${educationalSpecialty}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>
@@ -93,4 +93,25 @@
             $.operate.saveTab(prefix + "/sMdyyglMdygxxStoreemployeeinfoEdit", data);
         }
     }
+    /* 用户管理-新增-选择门店树 */
+    function selectDeptTree() {
+        var treeId = $("#treeId").val();
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
+        var options = {
+            title: '选择门店',
+            width: "380",
+            url: url,
+            callBack: doSubmit
+        };
+        $.modal.openOptions(options);
+    }
+
+    function doSubmit(index, layero){
+        var body = $.modal.getChildFrame(index);
+        $("#treeId").val(body.find('#treeId').val());
+        $("#treeName").val(body.find('#treeName').val());
+        $.modal.close(index);
+    }
+
 </script>

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

@@ -101,10 +101,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [{ field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'chainId', title: '连锁Id', align: 'center' },
                     { field: 'organizationId', title: '组织Id', align: 'center' },
                     { field: 'organizationName', title: '组织名称', align: 'center' },

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

@@ -136,10 +136,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [{ field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'returnDate', title: '退货日期', align: 'center' },
                     { field: 'returnDocumentNumber', title: '退货单号', align: 'center' },
                     { field: 'orderSource', title: '订单来源', align: 'center' },

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

@@ -141,10 +141,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [{ field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'saleDocumentNumber', title: '销售单号', align: 'center' },
                     { field: 'orderStatus', title: '订单状态', align: 'center' },
                     { field: 'storeName', title: '门店名称', align: 'center' },

health-admin/src/main/resources/templates/xtsz/SXtszMdzhglAccountmanagementList.html

@@ -86,10 +86,8 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [
+                    { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'storeId', title: '门店ID', align: 'center' },
                     { field: 'accountName', title: '账号名', align: 'center' },
                     { field: 'realName', title: '姓名', align: 'center' },

health-admin/src/main/resources/templates/xtsz/SXtszMdzhglStoremanagementList.html

@@ -81,10 +81,8 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [
+                    { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'storeName', title: '门店名称', align: 'center' },
                     { field: 'storeShortName', title: '门店简称', align: 'center' },
                     { field: 'storeType', title: '门店类型', align: 'center' },

health-admin/src/main/resources/templates/xtsz/SXtszMdzhglStorequalificationList.html

@@ -152,10 +152,8 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
-                { field: 'id', title: '主键', align: 'center' ,visible:false},
+            columns: [
+                    { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'storeId', title: '门店ID', align: 'center' },
                     { field: 'companyName', title: '企业名称', align: 'center' },
                     { field: 'legalRepresentative', title: '法定代表人/营业者', align: 'center' },

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

@@ -8,30 +8,30 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SYpdgChineseDecoctionst-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期"  id="createdDate" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>需求单号:</label>
-                <input name="demandOrderNumber" placeholder="需求单号"  id="demandOrderNumber" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>第三方订单ID:</label>
-                <input name="thirdOrderId" placeholder="第三方订单ID"  id="thirdOrderId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>平台用户ID:</label>
-                <input name="platformUserId" placeholder="平台用户ID"  id="platformUserId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>业务ID:</label>
-                <input name="businessId" placeholder="业务ID"  id="businessId" class="styled-input" type="text">
-            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>创建人:</label>-->
+<!--                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>创建日期:</label>-->
+<!--                <input name="createdDate" placeholder="创建日期"  id="createdDate" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>需求单号:</label>-->
+<!--                <input name="demandOrderNumber" placeholder="需求单号"  id="demandOrderNumber" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>第三方订单ID:</label>-->
+<!--                <input name="thirdOrderId" placeholder="第三方订单ID"  id="thirdOrderId" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>平台用户ID:</label>-->
+<!--                <input name="platformUserId" placeholder="平台用户ID"  id="platformUserId" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>业务ID:</label>-->
+<!--                <input name="businessId" placeholder="业务ID"  id="businessId" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>下单人:</label>
                 <input name="orderer" placeholder="下单人"  id="orderer" class="styled-input" type="text">
@@ -44,6 +44,7 @@
                 <label>收货人:</label>
                 <input name="consignee" placeholder="收货人"  id="consignee" class="styled-input" type="text">
             </div>
+
             <div class="customize-form-group">
                 <label>加密收货人:</label>
                 <input name="encryptedConsignee" placeholder="加密收货人"  id="encryptedConsignee" class="styled-input" type="text">
@@ -60,13 +61,23 @@
                 <label>连锁公司名称:</label>
                 <input name="chainCompanyName" placeholder="连锁公司名称"  id="chainCompanyName" class="styled-input" type="text">
             </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>存储ID:</label>-->
+<!--                <input name="storageId" placeholder="存储ID"  id="storageId" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
-                <label>存储ID:</label>
-                <input name="storageId" placeholder="存储ID"  id="storageId" class="styled-input" type="text">
+                <label>是否录入商品:</label>
+                <select name="isInputProduct"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否保存:</label>
-                <input name="isSaved" placeholder="是否保存"  id="isSaved" class="styled-input" type="text">
+                <select name="isSaved"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>处方图片:</label>
@@ -74,32 +85,35 @@
             </div>
             <div class="customize-form-group">
                 <label>药品剂量:</label>
-                <input name="medicineDosage" placeholder="药品剂量"  id="medicineDosage" class="styled-input" type="text">
+                <input name="medicineDosage" placeholder="药品剂量"  id="medicineDosage" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>煎药方式:</label>
-                <input name="decoctionMethod" placeholder="煎药方式"  id="decoctionMethod" class="styled-input" type="text">
+                <select name="decoctionMethod"  th:with="type=${@dict.getType('sys_select_ypdg_jyfs')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>下单门店:</label>
                 <input name="orderStore" placeholder="下单门店"  id="orderStore" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>提交时间:</label>
-                <input name="submitTime" placeholder="提交时间"  id="submitTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>取消时间:</label>
-                <input name="cancelTime" placeholder="取消时间"  id="cancelTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>支付时间:</label>
-                <input name="paymentTime" placeholder="支付时间"  id="paymentTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>订单状态:</label>
-                <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消"  id="orderStatus" class="styled-input" type="text">
-            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>提交时间:</label>-->
+<!--                <input name="submitTime" placeholder="提交时间"  id="submitTime" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>取消时间:</label>-->
+<!--                <input name="cancelTime" placeholder="取消时间"  id="cancelTime" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>支付时间:</label>-->
+<!--                <input name="paymentTime" placeholder="支付时间"  id="paymentTime" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>订单状态:</label>-->
+<!--                <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消"  id="orderStatus" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>备注:</label>
                 <input name="remarks" placeholder="备注"  id="remarks" class="styled-input" type="text">

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

@@ -11,27 +11,27 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>创建日期:</label>
-                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>需求单号:</label>
-                <input name="demandOrderNumber" placeholder="需求单号" th:value="${demandOrderNumber}" class="styled-input" type="text">
+                <input name="demandOrderNumber" placeholder="需求单号" th:value="${demandOrderNumber}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>第三方订单ID:</label>
-                <input name="thirdOrderId" placeholder="第三方订单ID" th:value="${thirdOrderId}" class="styled-input" type="text">
+                <input name="thirdOrderId" placeholder="第三方订单ID" th:value="${thirdOrderId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>平台用户ID:</label>
-                <input name="platformUserId" placeholder="平台用户ID" th:value="${platformUserId}" class="styled-input" type="text">
+                <input name="platformUserId" placeholder="平台用户ID" th:value="${platformUserId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>业务ID:</label>
-                <input name="businessId" placeholder="业务ID" th:value="${businessId}" class="styled-input" type="text">
+                <input name="businessId" placeholder="业务ID" th:value="${businessId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>下单人:</label>
@@ -39,7 +39,7 @@
             </div>
             <div class="customize-form-group">
                 <label>下单人手机号:</label>
-                <input name="ordererPhone" placeholder="下单人手机号" th:value="${ordererPhone}" class="styled-input" type="text">
+                <input name="ordererPhone" placeholder="下单人手机号" th:value="${ordererPhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>收货人:</label>
@@ -51,11 +51,11 @@
             </div>
             <div class="customize-form-group">
                 <label>加密收货人手机号:</label>
-                <input name="encryptedConsigneePhone" placeholder="加密收货人手机号" th:value="${encryptedConsigneePhone}" class="styled-input" type="text">
+                <input name="encryptedConsigneePhone" placeholder="加密收货人手机号" th:value="${encryptedConsigneePhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>收货人手机号:</label>
-                <input name="consigneePhone" placeholder="收货人手机号" th:value="${consigneePhone}" class="styled-input" type="text">
+                <input name="consigneePhone" placeholder="收货人手机号" th:value="${consigneePhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>连锁公司名称:</label>
@@ -63,11 +63,21 @@
             </div>
             <div class="customize-form-group">
                 <label>存储ID:</label>
-                <input name="storageId" placeholder="存储ID" th:value="${storageId}" class="styled-input" type="text">
+                <input name="storageId" placeholder="存储ID" th:value="${storageId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>是否录入商品:</label>
+                <select name="isInputProduct"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    th:selected="${dict.dictLabel}==${isInputProduct}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>是否保存:</label>
-                <input name="isSaved" placeholder="是否保存" th:value="${isSaved}" class="styled-input" type="text">
+                <select name="isSaved"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${isSaved}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>处方图片:</label>
@@ -79,7 +89,10 @@
             </div>
             <div class="customize-form-group">
                 <label>煎药方式:</label>
-                <input name="decoctionMethod" placeholder="煎药方式" th:value="${decoctionMethod}" class="styled-input" type="text">
+                <select name="decoctionMethod"  th:with="type=${@dict.getType('sys_select_ypdg_jyfs')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${decoctionMethod}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>下单门店:</label>
@@ -87,19 +100,22 @@
             </div>
             <div class="customize-form-group">
                 <label>提交时间:</label>
-                <input name="submitTime" placeholder="提交时间" th:value="${submitTime}" class="styled-input" type="text">
+                <input name="submitTime" placeholder="提交时间" th:value="${submitTime}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>取消时间:</label>
-                <input name="cancelTime" placeholder="取消时间" th:value="${cancelTime}" class="styled-input" type="text">
+                <input name="cancelTime" placeholder="取消时间" th:value="${cancelTime}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>支付时间:</label>
-                <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text">
+                <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>订单状态:</label>
-                <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消" th:value="${orderStatus}" class="styled-input" type="text">
+                <select name="orderStatus"  th:with="type=${@dict.getType('sys_select_ypdg_ddzt')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${decoctionMethod}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>备注:</label>

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

@@ -25,22 +25,34 @@
                         <input type="hidden" id="id" name="id" th:value="${id}">
                         <div class="customize-form-group">
                             <label>需求单号:</label>
-                <input type="text" class="styled-input"  name="demandOrderNumber" autocomplete="off"/>
+                            <input type="text" class="styled-input"  placeholder="请输入需求单号" name="demandOrderNumber" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>下单人手机号:</label>
-                <input type="text" class="styled-input"  name="ordererPhone" autocomplete="off"/>
+                           <input type="text" class="styled-input"  placeholder="请输入需求单号" name="ordererPhone" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>是否录入商品:</label>
-                <input type="text" class="styled-input"  name="orderStatus" autocomplete="off"/>
+                            <select name="isInputProduct"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
+                        </div>
+                        <div class="customize-form-group">
+                            <label>订单状态:</label>
+                            <select name="orderStatus"  th:with="type=${@dict.getType('sys_select_ypdg_ddzt')}" class="styled-input" >
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
 
                         <div class="customize-form-group select-time">
-                            <label for="startTime">提交时间:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <label for="beginTime">提交时间:</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>
@@ -56,12 +68,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" style="width: 100%; overflow-x: auto;">
@@ -138,6 +145,7 @@
                     { field: 'chainCompanyName', title: '连锁公司名称', align: 'center' },
                     { field: 'storageId', title: '存储ID', align: 'center' },
                     { field: 'isSaved', title: '是否保存', align: 'center' },
+                    { field: 'isInputProduct', title: '是否录入商品', align: 'center' },
                     { field: 'prescriptionImage', title: '处方图片', align: 'center' },
                     { field: 'medicineDosage', title: '药品剂量', align: 'center' },
                     { field: 'decoctionMethod', title: '煎药方式', align: 'center' },

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

@@ -9,102 +9,118 @@
 
         <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="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建日期:</label>
-                        <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>需求单号:</label>
-                        <input name="demandOrderNumber" placeholder="需求单号" th:value="${demandOrderNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>第三方订单ID:</label>
-                        <input name="thirdOrderId" placeholder="第三方订单ID" th:value="${thirdOrderId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>平台用户ID:</label>
-                        <input name="platformUserId" placeholder="平台用户ID" th:value="${platformUserId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>业务ID:</label>
-                        <input name="businessId" placeholder="业务ID" th:value="${businessId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单人:</label>
-                        <input name="orderer" placeholder="下单人" th:value="${orderer}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单人手机号:</label>
-                        <input name="ordererPhone" placeholder="下单人手机号" th:value="${ordererPhone}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>收货人:</label>
-                        <input name="consignee" placeholder="收货人" th:value="${consignee}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>加密收货人:</label>
-                        <input name="encryptedConsignee" placeholder="加密收货人" th:value="${encryptedConsignee}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>加密收货人手机号:</label>
-                        <input name="encryptedConsigneePhone" placeholder="加密收货人手机号" th:value="${encryptedConsigneePhone}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>收货人手机号:</label>
-                        <input name="consigneePhone" placeholder="收货人手机号" th:value="${consigneePhone}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>连锁公司名称:</label>
-                        <input name="chainCompanyName" placeholder="连锁公司名称" th:value="${chainCompanyName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>存储ID:</label>
-                        <input name="storageId" placeholder="存储ID" th:value="${storageId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>是否保存:</label>
-                        <input name="isSaved" placeholder="是否保存" th:value="${isSaved}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>处方图片:</label>
-                        <input name="prescriptionImage" placeholder="处方图片" th:value="${prescriptionImage}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>药品剂量:</label>
-                        <input name="medicineDosage" placeholder="药品剂量" th:value="${medicineDosage}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>煎药方式:</label>
-                        <input name="decoctionMethod" placeholder="煎药方式" th:value="${decoctionMethod}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>下单门店:</label>
-                        <input name="orderStore" placeholder="下单门店" th:value="${orderStore}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>提交时间:</label>
-                        <input name="submitTime" placeholder="提交时间" th:value="${submitTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>取消时间:</label>
-                        <input name="cancelTime" placeholder="取消时间" th:value="${cancelTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>支付时间:</label>
-                        <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>订单状态:</label>
-                        <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消" th:value="${orderStatus}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>备注:</label>
-                        <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>创建日期:</label>
+                <input name="createdDate" placeholder="创建日期" th:value="${createdDate}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>需求单号:</label>
+                <input name="demandOrderNumber" placeholder="需求单号" th:value="${demandOrderNumber}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>第三方订单ID:</label>
+                <input name="thirdOrderId" placeholder="第三方订单ID" th:value="${thirdOrderId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>平台用户ID:</label>
+                <input name="platformUserId" placeholder="平台用户ID" th:value="${platformUserId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>业务ID:</label>
+                <input name="businessId" placeholder="业务ID" th:value="${businessId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>下单人:</label>
+                <input name="orderer" placeholder="下单人" th:value="${orderer}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>下单人手机号:</label>
+                <input name="ordererPhone" placeholder="下单人手机号" th:value="${ordererPhone}" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>收货人:</label>
+                <input name="consignee" placeholder="收货人" th:value="${consignee}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>加密收货人:</label>
+                <input name="encryptedConsignee" placeholder="加密收货人" th:value="${encryptedConsignee}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>加密收货人手机号:</label>
+                <input name="encryptedConsigneePhone" placeholder="加密收货人手机号" th:value="${encryptedConsigneePhone}" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>收货人手机号:</label>
+                <input name="consigneePhone" placeholder="收货人手机号" th:value="${consigneePhone}" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>连锁公司名称:</label>
+                <input name="chainCompanyName" placeholder="连锁公司名称" th:value="${chainCompanyName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>存储ID:</label>
+                <input name="storageId" placeholder="存储ID" th:value="${storageId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>是否录入商品:</label>
+                <select name="isInputProduct"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${isInputProduct}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>是否保存:</label>
+                <select name="isSaved"  th:with="type=${@dict.getType('sys_select_yes_no')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${isSaved}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>处方图片:</label>
+                <input name="prescriptionImage" placeholder="处方图片" th:value="${prescriptionImage}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>药品剂量:</label>
+                <input name="medicineDosage" placeholder="药品剂量" th:value="${medicineDosage}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>煎药方式:</label>
+                <select name="decoctionMethod"  th:with="type=${@dict.getType('sys_select_ypdg_jyfs')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${decoctionMethod}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>下单门店:</label>
+                <input name="orderStore" placeholder="下单门店" th:value="${orderStore}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>提交时间:</label>
+                <input name="submitTime" placeholder="提交时间" th:value="${submitTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>取消时间:</label>
+                <input name="cancelTime" placeholder="取消时间" th:value="${cancelTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>支付时间:</label>
+                <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>订单状态:</label>
+                <select name="orderStatus"  th:with="type=${@dict.getType('sys_select_ypdg_ddzt')}" class="styled-input" >
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${decoctionMethod}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>备注:</label>
+                <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -25,8 +25,11 @@
 <!--                <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">
+                <label>类型：</label>
+                    <select name="types" class="styled-input" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                    </select>
             </div>
             <div class="customize-form-group select-time">
                 <label>处方日期:</label>

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

@@ -27,7 +27,10 @@
             </div>
             <div class="customize-form-group">
                 <label>类型:</label>
-                <input name="type" placeholder="类型" th:value="${type}" class="styled-input" type="text">
+                <select name="types" class="styled-input" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${types}"></option>
+                </select>
             </div>
             <div class="customize-form-group select-time">
                 <label>处方日期:</label>

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

@@ -110,7 +110,7 @@
                     { field: 'saleTime', title: '销售时间', align: 'center' },
                     { field: 'registrationTime', title: '登记时间', align: 'center' },
                     { field: 'prescriptionNumber', title: '处方单号', align: 'center' },
-                    { field: 'type', title: '类型', align: 'center' },
+                    { field: 'types', title: '类型', align: 'center' },
                     { field: 'prescriptionDate', title: '处方日期', align: 'center' },
                     { field: 'medicalInstitutionName', title: '医疗机构名称', align: 'center' },
                     { field: 'doctorName', title: '医生姓名', align: 'center' },

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

@@ -27,7 +27,10 @@
                     </div>
                     <div class="customize-form-group">
                             <label>类型:</label>
-                        <input name="type" placeholder="类型" th:value="${type}" class="styled-input" type="text">
+                        <select name="types" class="styled-input" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                    th:selected="${dict.dictLabel}==${types}"></option>
+                        </select>
                     </div>
                     <div class="customize-form-group select-time">
                             <label>处方日期:</label>

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

@@ -26,8 +26,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             and prescriptionNumber = #{prescriptionNumber}
         </if>
-        <if test="type !=null and type !='' ">
-            and type = #{type}
+        <if test="types !=null and types !='' ">
+            and types = #{types}
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             and prescriptionDate = #{prescriptionDate}
@@ -77,8 +77,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             prescriptionNumber = #{prescriptionNumber},
         </if>
-        <if test="type !=null and type !='' ">
-            type = #{type},
+        <if test="types !=null and types !='' ">
+            types = #{types},
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             prescriptionDate = #{prescriptionDate},
@@ -141,8 +141,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             prescriptionNumber,
         </if>
-        <if test="type !=null and type !='' ">
-            type,
+        <if test="types !=null and types !='' ">
+            types,
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             prescriptionDate,
@@ -185,8 +185,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
              #{prescriptionNumber},
         </if>
-        <if test="type !=null and type !='' ">
-             #{type},
+        <if test="types !=null and types !='' ">
+             #{types},
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
              #{prescriptionDate},

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="beginTime != null and beginTime!='' and endTime != null and endTime!=''">
+            and createTime between #{beginTime} and #{endTime}
+        </if>
         <if test="id !=null and id !='' ">
             and id = #{id}
         </if>

health-system/src/main/resources/mapper/ypdg/SYpdgChineseDecoctionstMapper.xml

@@ -38,6 +38,10 @@
         <if test="encryptedConsignee !=null and encryptedConsignee !='' ">
             and encryptedConsignee = #{encryptedConsignee}
         </if>
+        <if test="isInputProduct !=null and isInputProduct !='' ">
+            and isInputProduct = #{isInputProduct}
+        </if>
+
         <if test="encryptedConsigneePhone !=null and encryptedConsigneePhone !='' ">
             and encryptedConsigneePhone = #{encryptedConsigneePhone}
         </if>
@@ -134,6 +138,10 @@
         <if test="isSaved !=null and isSaved !='' ">
             isSaved = #{isSaved},
         </if>
+        <if test="isInputProduct !=null and isInputProduct !='' ">
+            isInputProduct = #{isInputProduct},
+        </if>
+
         <if test="prescriptionImage !=null and prescriptionImage !='' ">
             prescriptionImage = #{prescriptionImage},
         </if>
@@ -228,6 +236,9 @@
         <if test="isSaved !=null and isSaved !='' ">
             isSaved,
         </if>
+        <if test="isInputProduct !=null and isInputProduct !='' ">
+            isInputProduct,
+        </if>
         <if test="prescriptionImage !=null and prescriptionImage !='' ">
             prescriptionImage,
         </if>
@@ -302,6 +313,9 @@
         <if test="isSaved !=null and isSaved !='' ">
              #{isSaved},
         </if>
+        <if test="isInputProduct !=null and isInputProduct !='' ">
+            #{isInputProduct},
+        </if>
         <if test="prescriptionImage !=null and prescriptionImage !='' ">
              #{prescriptionImage},
         </if>

health-system/src/main/resources/mapper/zlgl/SZlglCfdjSaleprescriptioninfoMapper.xml

@@ -20,8 +20,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             and prescriptionNumber = #{prescriptionNumber}
         </if>
-        <if test="type !=null and type !='' ">
-            and type = #{type}
+        <if test="types !=null and types !='' ">
+            and types = #{types}
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             and prescriptionDate = #{prescriptionDate}
@@ -65,8 +65,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             prescriptionNumber = #{prescriptionNumber},
         </if>
-        <if test="type !=null and type !='' ">
-            type = #{type},
+        <if test="types !=null and types !='' ">
+            types = #{types},
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             prescriptionDate = #{prescriptionDate},
@@ -123,8 +123,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
             prescriptionNumber,
         </if>
-        <if test="type !=null and type !='' ">
-            type,
+        <if test="types !=null and types !='' ">
+            types,
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
             prescriptionDate,
@@ -161,8 +161,8 @@
         <if test="prescriptionNumber !=null and prescriptionNumber !='' ">
              #{prescriptionNumber},
         </if>
-        <if test="type !=null and type !='' ">
-             #{type},
+        <if test="types !=null and types !='' ">
+             #{types},
         </if>
         <if test="prescriptionDate !=null and prescriptionDate !='' ">
              #{prescriptionDate},