update 订单管理 商品管理 会员管理，营销管理，下载管理，质量管理，顾客管理修改添加条件显示修改

health-admin/src/main/resources/templates/daas/SDaasChannelManagementAdd.html

@@ -17,7 +17,7 @@
                 <input name="channelCode" placeholder="渠道代码"  id="channelCode" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>渠道类型，例如：线上、线下、第三方平台:</label>
+                <label>渠道类型:</label>
                 <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台"  id="channelType" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -37,7 +37,7 @@
                 <input name="address" placeholder="地址"  id="address" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>渠道状态：启用、停用:</label>
+                <label>渠道状态</label>
                 <input name="status" placeholder="渠道状态：启用、停用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/daas/SDaasChannelManagementEdit.html

@@ -21,7 +21,7 @@
                 <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>渠道类型，例如：线上、线下、第三方平台:</label>
+                <label>渠道类型:</label>
                 <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台" th:value="${channelType}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -41,7 +41,7 @@
                 <input name="address" placeholder="地址" th:value="${address}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>渠道状态：启用、停用:</label>
+                <label>渠道状态</label>
                 <input name="status" placeholder="渠道状态：启用、停用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/daas/SDaasChannelManagementPageEdit.html

@@ -21,7 +21,7 @@
                         <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>渠道类型，例如：线上、线下、第三方平台:</label>
+                        <label>渠道类型</label>
                         <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台" th:value="${channelType}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
@@ -41,7 +41,7 @@
                         <input name="address" placeholder="地址" th:value="${address}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>渠道状态：启用、停用:</label>
+                        <label>渠道状态</label>
                         <input name="status" placeholder="渠道状态：启用、停用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

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

@@ -37,7 +37,7 @@
                 <input name="orderCreateTime" placeholder="订单创建时间"  id="orderCreateTime" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单类型 (正向单, 逆向单):</label>
+                <label>订单类型</label>
                 <input name="orderType" placeholder="订单类型 (正向单, 逆向单)"  id="orderType" class="styled-input" type="text">
             </div>
         </div>

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

@@ -41,7 +41,7 @@
                 <input name="orderCreateTime" placeholder="订单创建时间" th:value="${orderCreateTime}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单类型 (正向单, 逆向单):</label>
+                <label>订单类型</label>
                 <input name="orderType" placeholder="订单类型 (正向单, 逆向单)" th:value="${orderType}" class="styled-input" type="text">
             </div>
         </div>

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

@@ -137,7 +137,7 @@
                     { field: 'billingAmount', title: '开票金额', align: 'center' },
                     { field: 'originalPositiveOrder', title: '原正向订单', align: 'center' },
                     { field: 'orderCreateTime', title: '订单创建时间', align: 'center' },
-                    { field: 'orderType', title: '订单类型 (正向单, 逆向单)', align: 'center' },
+                    { field: 'orderType', title: '订单类型', align: 'center' },
 
                 {
                     title: '操作',

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

@@ -41,7 +41,7 @@
                         <input name="orderCreateTime" placeholder="订单创建时间" th:value="${orderCreateTime}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>订单类型 (正向单, 逆向单):</label>
+                        <label>订单类型:</label>
                         <input name="orderType" placeholder="订单类型 (正向单, 逆向单)" th:value="${orderType}" class="styled-input" type="text">
                     </div>
         </div>

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

@@ -29,7 +29,7 @@
                 <input name="channelStore" placeholder="渠道店铺"  id="channelStore" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单发票类型 (线上, 线下):</label>
+                <label>订单发票类型</label>
                 <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)"  id="orderInvoiceType" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -73,7 +73,7 @@
                 <input name="auditStatus" placeholder="审核状态"  id="auditStatus" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>暂无数据 (0: 否, 1: 是):</label>
+                <label>暂无数据</label>
                 <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)"  id="noData" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -33,7 +33,7 @@
                 <input name="channelStore" placeholder="渠道店铺" th:value="${channelStore}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单发票类型 (线上, 线下):</label>
+                <label>订单发票类型:</label>
                 <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)" th:value="${orderInvoiceType}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -77,7 +77,7 @@
                 <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>暂无数据 (0: 否, 1: 是):</label>
+                <label>暂无数据:</label>
                 <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)" th:value="${noData}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -158,7 +158,7 @@
                     { field: 'invoiceNumber', title: '发票号码', align: 'center' },
                     { field: 'invoiceAmount', title: '发票金额', align: 'center' },
                     { field: 'channelStore', title: '渠道店铺', align: 'center' },
-                    { field: 'orderInvoiceType', title: '订单发票类型 (线上, 线下)', align: 'center' },
+                    { field: 'orderInvoiceType', title: '订单发票类型', align: 'center' },
                     { field: 'invoiceType', title: '发票类型', align: 'center' },
                     { field: 'headerType', title: '抬头类型', align: 'center' },
                     { field: 'headerName', title: '抬头名称', align: 'center' },
@@ -169,7 +169,7 @@
                     { field: 'storeName', title: '店铺名称', align: 'center' },
                     { field: 'auditType', title: '审核类型', align: 'center' },
                     { field: 'auditStatus', title: '审核状态', align: 'center' },
-                    { field: 'noData', title: '暂无数据 (0: 否, 1: 是)', align: 'center' },
+                    { field: 'noData', title: '暂无数据', align: 'center' },
                     { field: 'mergeOrderNo', title: '合并订单号', align: 'center' },
                     { field: 'orderNo', title: '订单号', align: 'center' },
                     { field: 'billingStatus', title: '开票状态', align: 'center' },

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

@@ -33,7 +33,7 @@
                         <input name="channelStore" placeholder="渠道店铺" th:value="${channelStore}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>订单发票类型 (线上, 线下):</label>
+                        <label>订单发票类型:</label>
                         <input name="orderInvoiceType" placeholder="订单发票类型 (线上, 线下)" th:value="${orderInvoiceType}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
@@ -77,7 +77,7 @@
                         <input name="auditStatus" placeholder="审核状态" th:value="${auditStatus}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>暂无数据 (0: 否, 1: 是):</label>
+                        <label>暂无数据:</label>
                         <input name="noData" placeholder="暂无数据 (0: 否, 1: 是)" th:value="${noData}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

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

@@ -145,7 +145,7 @@
                     { field: 'invoiceNumber', title: '发票号码', align: 'center' },
                     { field: 'invoiceAmount', title: '发票金额', align: 'center' },
                     { field: 'channelStore', title: '渠道店铺', align: 'center' },
-                    { field: 'orderInvoiceType', title: '订单发票类型 (线上, 线下)', align: 'center' },
+                    { field: 'orderInvoiceType', title: '订单发票类型', align: 'center' },
                     { field: 'invoiceType', title: '发票类型', align: 'center' },
                     { field: 'headerType', title: '抬头类型', align: 'center' },
                     { field: 'headerName', title: '抬头名称', align: 'center' },
@@ -156,7 +156,7 @@
                     { field: 'storeName', title: '店铺名称', align: 'center' },
                     { field: 'auditType', title: '审核类型', align: 'center' },
                     { field: 'auditStatus', title: '审核状态', align: 'center' },
-                    { field: 'noData', title: '暂无数据 (0: 否, 1: 是)', align: 'center' },
+                    { field: 'noData', title: '暂无数据', align: 'center' },
                     { field: 'mergeOrderNo', title: '合并订单号', align: 'center' },
                     { field: 'orderNo', title: '订单号', align: 'center' },
                     { field: 'billingStatus', title: '开票状态', align: 'center' },

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

@@ -81,7 +81,7 @@
                 <input name="settlementCode" placeholder="结账单code"  id="settlementCode" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>最后完成支付的支付时间:</label>
+                <label>最后支付时间:</label>
                 <input name="finalPaymentTime" placeholder="最后完成支付的支付时间"  id="finalPaymentTime" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -85,7 +85,7 @@
                 <input name="settlementCode" placeholder="结账单code" th:value="${settlementCode}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>最后完成支付的支付时间:</label>
+                <label>最后支付时间:</label>
                 <input name="finalPaymentTime" placeholder="最后完成支付的支付时间" th:value="${finalPaymentTime}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -182,7 +182,7 @@
                     { field: 'orderTime', title: '下单时间', align: 'center' },
                     { field: 'settlementId', title: '结账单id', align: 'center' },
                     { field: 'settlementCode', title: '结账单code', align: 'center' },
-                    { field: 'finalPaymentTime', title: '最后完成支付的支付时间', align: 'center' },
+                    { field: 'finalPaymentTime', title: '最后完成支付时间', align: 'center' },
                     { field: 'totalDrugQuantity', title: '药品总数量', align: 'center' },
                     { field: 'cardNumber', title: '卡号', align: 'center' },
                     { field: 'shippingAddress', title: '发货地址', align: 'center' },

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

@@ -85,7 +85,7 @@
                         <input name="settlementCode" placeholder="结账单code" th:value="${settlementCode}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>最后完成支付的支付时间:</label>
+                        <label>最后支付时间:</label>
                         <input name="finalPaymentTime" placeholder="最后完成支付的支付时间" th:value="${finalPaymentTime}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsList.html

@@ -39,6 +39,13 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpSjdcFollowUpStatistics-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
@@ -48,50 +55,18 @@
                                 跟进人:<input type="text" class="styled-input" name="follower" autocomplete="off"/>
                             </li>
                             <li>
-                                年龄:<input type="text" class="styled-input" name="age" autocomplete="off"/>
-                            </li>
-                            <li>
-                                性别:<input type="text" class="styled-input" name="gender" autocomplete="off"/>
-                            </li>
-                            <li>
-                                适应症:<input type="text" class="styled-input" name="indication" autocomplete="off"/>
-                            </li>
-                            <li>
-                                不良反应:<input type="text" class="styled-input" name="adverseReaction" autocomplete="off"/>
-                            </li>
-                            <li>
-                                用药状态:<input type="text" class="styled-input" name="medicationStatus" autocomplete="off"/>
-                            </li>
-                            <li>
-                                配合度:<input type="text" class="styled-input" name="cooperationLevel" autocomplete="off"/>
-                            </li>
-                            <li>
-                                永久停药:<input type="text" class="styled-input" name="permanentDiscontinuation" autocomplete="off"/>
+                                预约日期:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                             </li>
                             <li>
-                                暂停用药:<input type="text" class="styled-input" name="temporarySuspension" autocomplete="off"/>
+                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
                             </li>
                             <li>
-                                既往治疗方案:<input type="text" class="styled-input" name="previousTreatmentPlan" autocomplete="off"/>
+                                业务归属:<input type="text" class="styled-input" name="patientCount" autocomplete="off"/>
                             </li>
                             <li>
-                                目前治疗方案:<input type="text" class="styled-input" name="currentTreatmentPlan" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生存期（天）:<input type="text" class="styled-input" name="survivalPeriod" autocomplete="off"/>
-                            </li>
-                            <li>
-                                药品通用名:<input type="text" class="styled-input" name="genericName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                患者数:<input type="text" class="styled-input" name="patientCount" autocomplete="off"/>
-                            </li>
-                            <li>
-                                任务数:<input type="text" class="styled-input" name="taskCount" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                门店:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>
@@ -100,20 +75,8 @@
             </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> 导出
+                    <i class="fa fa-download"></i> 导出统计
                 </a>
             </div>
 

health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskAdd.html

@@ -33,7 +33,7 @@
                 <input name="inspectionTime" placeholder="质检时间"  id="inspectionTime" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>质检流程，用于存储详细的质检步骤和要求:</label>
+                <label>质检流程:</label>
                 <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求"  id="inspectionProcess" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -41,7 +41,7 @@
                 <input name="inspectionScore" placeholder="质检评分"  id="inspectionScore" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>质检状态：待质检，质检中，已质检，已取消:</label>
+                <label>质检状态:</label>
                 <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消"  id="inspectionStatus" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskEdit.html

@@ -37,7 +37,7 @@
                 <input name="inspectionTime" placeholder="质检时间" th:value="${inspectionTime}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>质检流程，用于存储详细的质检步骤和要求:</label>
+                <label>质检流程:</label>
                 <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求" th:value="${inspectionProcess}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -45,7 +45,7 @@
                 <input name="inspectionScore" placeholder="质检评分" th:value="${inspectionScore}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>质检状态：待质检，质检中，已质检，已取消:</label>
+                <label>质检状态:</label>
                 <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskList.html

@@ -39,48 +39,46 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpSjdcQualityInspectionTask-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                连锁ID:<input type="text" class="styled-input" name="chainId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                连锁名称:<input type="text" class="styled-input" name="chainName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                门店名称:<input type="text" class="styled-input" name="storeName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                质检用户:<input type="text" class="styled-input" name="inspectionUser" autocomplete="off"/>
-                            </li>
-                            <li>
-                                任务名称:<input type="text" class="styled-input" name="taskName" autocomplete="off"/>
+                                连锁ID:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="query" autocomplete="off"/>
                             </li>
                             <li>
-                                质检时间:<input type="text" class="styled-input" name="inspectionTime" autocomplete="off"/>
+                                连锁id:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainName" autocomplete="off"/>
                             </li>
                             <li>
-                                质检流程，用于存储详细的质检步骤和要求:<input type="text" class="styled-input" name="inspectionProcess" autocomplete="off"/>
+                                门店id:<input type="text" class="styled-input" placeholder="请输入连锁ID" name="storeName" autocomplete="off"/>
                             </li>
                             <li>
-                                质检评分:<input type="text" class="styled-input" name="inspectionScore" autocomplete="off"/>
+                                质检状态:
+                                <select name="inspectionStatus"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="进行中">进行中</option>
+                                    <option value="质检完成">质检完成</option>
+                                    <option value="质检异常">质检异常</option>
+                                </select>
                             </li>
                             <li>
-                                质检状态：待质检，质检中，已质检，已取消:<input type="text" class="styled-input" name="inspectionStatus" autocomplete="off"/>
+                                创建时间:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                             </li>
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="createdAt" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedAt" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                分数范围:<input type="number" class="styled-input" placeholder="最大" name="maxInspectionScore" autocomplete="off"/>-
+                                <input type="number" class="styled-input" placeholder="最小" name="minInspectionScore" autocomplete="off"/>
                             </li>
+
                         </ul>
                     </div>
 
@@ -91,18 +89,6 @@
                 <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">
@@ -166,9 +152,9 @@
                     { field: 'inspectionUser', title: '质检用户', align: 'center' },
                     { field: 'taskName', title: '任务名称', align: 'center' },
                     { field: 'inspectionTime', title: '质检时间', align: 'center' },
-                    { field: 'inspectionProcess', title: '质检流程，用于存储详细的质检步骤和要求', align: 'center' },
+                    { field: 'inspectionProcess', title: '质检流程', align: 'center' },
                     { field: 'inspectionScore', title: '质检评分', align: 'center' },
-                    { field: 'inspectionStatus', title: '质检状态：待质检，质检中，已质检，已取消', align: 'center' },
+                    { field: 'inspectionStatus', title: '质检状态', align: 'center' },
                     { field: 'createdAt', title: '创建时间', align: 'center' },
                     { field: 'updatedAt', title: '更新时间', align: 'center' },
 

health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskPageEdit.html

@@ -37,7 +37,7 @@
                         <input name="inspectionTime" placeholder="质检时间" th:value="${inspectionTime}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>质检流程，用于存储详细的质检步骤和要求:</label>
+                        <label>质检流程:</label>
                         <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求" th:value="${inspectionProcess}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
@@ -45,7 +45,7 @@
                         <input name="inspectionScore" placeholder="质检评分" th:value="${inspectionScore}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>质检状态：待质检，质检中，已质检，已取消:</label>
+                        <label>质检状态:</label>
                         <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordAdd.html

@@ -29,7 +29,7 @@
                 <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordEdit.html

@@ -33,7 +33,7 @@
                 <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordList.html

@@ -39,41 +39,25 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpYypzCallWord-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                药品:<input type="text" class="styled-input" name="drug" autocomplete="off"/>
-                            </li>
-                            <li>
-                                业务归属:<input type="text" class="styled-input" name="businessBelonging" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模板名称:<input type="text" class="styled-input" name="templateName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模版ID:<input type="text" class="styled-input" name="templateId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态：启用，禁用:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createdTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新人:<input type="text" class="styled-input" name="updatedBy" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                分类:
+                                <select name="category"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="整体">整体</option>
+                                    <option value="医学前沿">单项</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
@@ -91,12 +75,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">
@@ -159,7 +138,7 @@
                     { field: 'templateName', title: '模板名称', align: 'center' },
                     { field: 'templateId', title: '模版ID', align: 'center' },
                     { field: 'createdBy', title: '创建人', align: 'center' },
-                    { field: 'status', title: '状态：启用，禁用', align: 'center' },
+                    { field: 'status', title: '状态', align: 'center' },
                     { field: 'createdTime', title: '创建时间', align: 'center' },
                     { field: 'updatedTime', title: '更新时间', align: 'center' },
                     { field: 'updatedBy', title: '更新人', align: 'center' },
@@ -172,10 +151,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 "";
@@ -209,14 +184,7 @@
         $.modal.openTab("修改" + table.options.modalName, url + "?editTage=1" );
     }
 
-    /* 用户状态显示 */
-    function statusTools(row) {
-        if (row.status == 1) {
-            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
-        } else {
-            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
-        }
-    }
+
 </script>
 </body>
 

health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordPageEdit.html

@@ -33,7 +33,7 @@
                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>状态：启用，禁用:</label>
+                        <label>状态：</label>
                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementAdd.html

@@ -29,7 +29,7 @@
                 <input name="answerContent" placeholder="回答内容"  id="answerContent" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>适用药品，可以存储多个药品，用逗号分隔:</label>
+                <label>适用药品:</label>
                 <input name="applicableDrugs" placeholder="适用药品，可以存储多个药品，用逗号分隔"  id="applicableDrugs" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -37,7 +37,7 @@
                 <input name="sortWeight" placeholder="排序权重"  id="sortWeight" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementEdit.html

@@ -33,15 +33,15 @@
                 <input name="answerContent" placeholder="回答内容" th:value="${answerContent}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>适用药品，可以存储多个药品，用逗号分隔:</label>
-                <input name="applicableDrugs" placeholder="适用药品，可以存储多个药品，用逗号分隔" th:value="${applicableDrugs}" class="styled-input" type="text">
+                <label>适用药品:</label>
+                <input name="applicableDrugs" placeholder="适用药品" th:value="${applicableDrugs}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>排序权重:</label>
                 <input name="sortWeight" placeholder="排序权重" th:value="${sortWeight}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态</label>
                 <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementList.html

@@ -39,51 +39,59 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpYypzFaqManagement-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                问答ID:<input type="text" class="styled-input" name="questionAnswerId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                问答类型:<input type="text" class="styled-input" name="questionAnswerType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                问答摘要:<input type="text" class="styled-input" name="summary" autocomplete="off"/>
-                            </li>
-                            <li>
-                                问题内容:<input type="text" class="styled-input" name="questionContent" autocomplete="off"/>
+                                场景:
+                                <select name="scene"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="DTP随访">DTP随访</option>
+                                    <option value="慢病随访">慢病随访</option>
+                                </select>
                             </li>
                             <li>
-                                回答内容:<input type="text" class="styled-input" name="answerContent" autocomplete="off"/>
+                                问答类型:
+                                <select name="questionAnswerType"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="注射">注射</option>
+                                    <option value="口服">口服</option>
+                                </select>
                             </li>
                             <li>
-                                适用药品，可以存储多个药品，用逗号分隔:<input type="text" class="styled-input" name="applicableDrugs" autocomplete="off"/>
+                                问答摘要:<input type="text" class="styled-input" placeholder="请输入问答摘要" name="summary" autocomplete="off"/>
                             </li>
                             <li>
-                                排序权重:<input type="text" class="styled-input" name="sortWeight" autocomplete="off"/>
+                                适用药品
+                                <select name="applicableDrugs"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="美式高锅">美式高锅</option>
+                                    <option value="储物箱">储物箱</option>
+                                    <option value="熟料袋">熟料袋(小号)</option>
+                                </select>
                             </li>
                             <li>
-                                状态：启用，禁用:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后编辑时间:<input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后编辑人:<input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                状态:
+                                <select name="status"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="已启用">启用</option>
+                                    <option value="禁用">禁用</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
 
                 </form>
             </div>
-
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
                     <i class="fa fa-plus"></i> 新增
@@ -94,12 +102,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">
@@ -162,7 +164,7 @@
                     { field: 'summary', title: '问答摘要', align: 'center' },
                     { field: 'questionContent', title: '问题内容', align: 'center' },
                     { field: 'answerContent', title: '回答内容', align: 'center' },
-                    { field: 'applicableDrugs', title: '适用药品，可以存储多个药品，用逗号分隔', align: 'center' },
+                    { field: 'applicableDrugs', title: '适用药品', align: 'center' },
                     { field: 'sortWeight', title: '排序权重', align: 'center' },
                     { field: 'status', title: '状态：启用，禁用', align: 'center' },
                     { field: 'lastEditTime', title: '最后编辑时间', align: 'center' },

health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementPageEdit.html

@@ -33,7 +33,7 @@
                         <input name="answerContent" placeholder="回答内容" th:value="${answerContent}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>适用药品，可以存储多个药品，用逗号分隔:</label>
+                        <label>适用药品:</label>
                         <input name="applicableDrugs" placeholder="适用药品，可以存储多个药品，用逗号分隔" th:value="${applicableDrugs}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
@@ -41,7 +41,7 @@
                         <input name="sortWeight" placeholder="排序权重" th:value="${sortWeight}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>状态：启用，禁用:</label>
+                        <label>状态:</label>
                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopAdd.html

@@ -29,7 +29,7 @@
                 <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopEdit.html

@@ -33,7 +33,7 @@
                 <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html

@@ -39,41 +39,49 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpYypzFollowUpSop-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                药品:<input type="text" class="styled-input" name="drug" autocomplete="off"/>
-                            </li>
-                            <li>
-                                业务归属:<input type="text" class="styled-input" name="businessBelonging" autocomplete="off"/>
+                                业务归属:
+                                <select name="businessBelonging"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="常规回访">常规回访</option>
+                                    <option value="脱落召回">脱落召回</option>
+                                </select>
                             </li>
                             <li>
-                                模板名称:<input type="text" class="styled-input" name="templateName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模版ID:<input type="text" class="styled-input" name="templateId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
+                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="drug" autocomplete="off"/>
                             </li>
+
                             <li>
-                                状态：启用，禁用:<input type="text" class="styled-input" name="status" autocomplete="off"/>
+                                模板名称:<input type="text" class="styled-input" placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
                             </li>
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="createdTime" autocomplete="off"/>
+                                模版ID:<input type="text" class="styled-input" placeholder="请输入模版ID" name="templateId" autocomplete="off"/>
                             </li>
                             <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedTime" autocomplete="off"/>
+                                创建时间:<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
                             </li>
                             <li>
-                                更新人:<input type="text" class="styled-input" name="updatedBy" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                状态:
+                                <select name="status"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="已启用">已启用</option>
+                                    <option value="已停用">已停用</option>
+                                    <option value="已创建">已创建</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
@@ -91,12 +99,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopPageEdit.html

@@ -33,7 +33,7 @@
                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>状态：启用，禁用:</label>
+                        <label>状态:</label>
                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateAdd.html

@@ -41,7 +41,7 @@
                 <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateEdit.html

@@ -45,7 +45,7 @@
                 <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateList.html

@@ -39,47 +39,47 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpYypzFollowUpTemplate-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                药品:<input type="text" class="styled-input" name="drug" autocomplete="off"/>
-                            </li>
-                            <li>
-                                事件标签:<input type="text" class="styled-input" name="eventTag" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模版ID:<input type="text" class="styled-input" name="templateId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                模板名称:<input type="text" class="styled-input" name="templateName" autocomplete="off"/>
+                                关联药品:<input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
                             </li>
                             <li>
-                                任务数:<input type="text" class="styled-input" name="taskCount" autocomplete="off"/>
+                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
                             </li>
                             <li>
-                                业务域:<input type="text" class="styled-input" name="businessDomain" autocomplete="off"/>
+                                模板名称:<input type="text" class="styled-input"  placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
                             </li>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新人:<input type="text" class="styled-input" name="updatedBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态：启用，禁用:<input type="text" class="styled-input" name="status" autocomplete="off"/>
+                                模版ID:<input type="text" class="styled-input" placeholder="请输入模版ID"  name="templateId" autocomplete="off"/>
                             </li>
+
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="createdTime" autocomplete="off"/>
+                                事件标签:
+                                <select name="eventTag"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="普通模版">普通模版</option>
+                                    <option value="销售订单完成登记">销售订单完成登记</option>
+                                    <option value="进入慈善援助">进入慈善援助</option>
+                                </select>
                             </li>
                             <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedTime" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                任务数:
+                                <select name="taskNumber"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="单任务">单任务</option>
+                                    <option value="多任务">多任务</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
@@ -97,12 +97,6 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
             </div>
 
             <div class="col-sm-12 select-table table-striped">
@@ -168,7 +162,7 @@
                     { field: 'businessDomain', title: '业务域', align: 'center' },
                     { field: 'createdBy', title: '创建人', align: 'center' },
                     { field: 'updatedBy', title: '更新人', align: 'center' },
-                    { field: 'status', title: '状态：启用，禁用', align: 'center' },
+                    { field: 'status', title: '状态', align: 'center' },
                     { field: 'createdTime', title: '创建时间', align: 'center' },
                     { field: 'updatedTime', title: '更新时间', align: 'center' },
 
@@ -180,10 +174,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/dtp/SDtpYypzFollowUpTemplatePageEdit.html

@@ -45,7 +45,7 @@
                         <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>状态：启用，禁用:</label>
+                        <label>状态:</label>
                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktAdd.html

@@ -25,7 +25,7 @@
                 <input name="scriptContent" placeholder="话术内容"  id="scriptContent" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关键词，可以存储多个关键词，用逗号分隔:</label>
+                <label>关键词:</label>
                 <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔"  id="keywords" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -33,7 +33,7 @@
                 <input name="weight" placeholder="权重"  id="weight" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktEdit.html

@@ -29,7 +29,7 @@
                 <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关键词，可以存储多个关键词，用逗号分隔:</label>
+                <label>关键词:</label>
                 <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔" th:value="${keywords}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
@@ -37,7 +37,7 @@
                 <input name="weight" placeholder="权重" th:value="${weight}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>状态：启用，禁用:</label>
+                <label>状态:</label>
                 <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktList.html

@@ -39,63 +39,64 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        
+                        <a class="btn btn-success" onclick="" shiro:hasPermission="system:user:add">
+                            <i class="fa fa-plus"></i> MDM数据
+                        </a>
+                        <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>
                 <form id="SDtpYypzVerbalTrickt-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                话术ID:<input type="text" class="styled-input" name="scriptId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                话术主题:<input type="text" class="styled-input" name="scriptTheme" autocomplete="off"/>
-                            </li>
-                            <li>
-                                话术摘要:<input type="text" class="styled-input" name="scriptSummary" autocomplete="off"/>
-                            </li>
-                            <li>
-                                话术内容:<input type="text" class="styled-input" name="scriptContent" autocomplete="off"/>
-                            </li>
-                            <li>
-                                关键词，可以存储多个关键词，用逗号分隔:<input type="text" class="styled-input" name="keywords" autocomplete="off"/>
-                            </li>
-                            <li>
-                                权重:<input type="text" class="styled-input" name="weight" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态：启用，禁用:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后操作时间:<input type="text" class="styled-input" name="lastOperationTime" autocomplete="off"/>
+                                场景:
+                                <select name="scene"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="DTP随访">DTP随访</option>
+                                    <option value="慢病随访">慢病随访</option>
+                                </select>
                             </li>
                             <li>
-                                最后操作人:<input type="text" class="styled-input" name="lastOperator" autocomplete="off"/>
+                                话术主题:<input type="text" class="styled-input" placeholder="请输入话术主题" name="scriptTheme" autocomplete="off"/>
                             </li>
                             <li>
-                                话术主题ID:<input type="text" class="styled-input" name="themeId" autocomplete="off"/>
+                                适用药品类型:
+                                <select name="applicableDrugType"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="注射">注射</option>
+                                    <option value="口服">口服</option>
+                                </select>
                             </li>
                             <li>
-                                话术主题:<input type="text" class="styled-input" name="theme" autocomplete="off"/>
+                                适用随访类型:
+                                <select name="applicableFollowUpType"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="常规回访">常规回访</option>
+                                    <option value="脱落召回">脱落召回</option>
+                                </select>
                             </li>
                             <li>
-                                适用药品类型:<input type="text" class="styled-input" name="applicableDrugType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                适用随访类型:<input type="text" class="styled-input" name="applicableFollowUpType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                任务主题:<input type="text" class="styled-input" name="taskTheme" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后编辑时间:<input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后编辑人:<input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                状态:
+                                <select name="status"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="已启用">启用</option>
+                                    <option value="禁用">禁用</option>
+                                </select>
                             </li>
+
                         </ul>
                     </div>
 
@@ -103,6 +104,7 @@
             </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>
@@ -112,12 +114,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">
@@ -179,9 +176,9 @@
                     { field: 'scriptTheme', title: '话术主题', align: 'center' },
                     { field: 'scriptSummary', title: '话术摘要', align: 'center' },
                     { field: 'scriptContent', title: '话术内容', align: 'center' },
-                    { field: 'keywords', title: '关键词，可以存储多个关键词，用逗号分隔', align: 'center' },
+                    { field: 'keywords', title: '关键词', align: 'center' },
                     { field: 'weight', title: '权重', align: 'center' },
-                    { field: 'status', title: '状态：启用，禁用', align: 'center' },
+                    { field: 'status', title: '状态', align: 'center' },
                     { field: 'lastOperationTime', title: '最后操作时间', align: 'center' },
                     { field: 'lastOperator', title: '最后操作人', align: 'center' },
                     { field: 'themeId', title: '话术主题ID', align: 'center' },

health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktPageEdit.html

@@ -29,7 +29,7 @@
                         <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>关键词，可以存储多个关键词，用逗号分隔:</label>
+                        <label>关键词:</label>
                         <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔" th:value="${keywords}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
@@ -37,7 +37,7 @@
                         <input name="weight" placeholder="权重" th:value="${weight}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>状态：启用，禁用:</label>
+                        <label>状态:</label>
                         <input name="status" placeholder="状态：启用，禁用" th:value="${status}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsList.html

@@ -39,41 +39,30 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpZskcxDrugInstructions-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                MDM编码:<input type="text" class="styled-input" name="mdmCode" autocomplete="off"/>
-                            </li>
-                            <li>
-                                商品名:<input type="text" class="styled-input" name="productName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                通用名:<input type="text" class="styled-input" name="genericName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                规格:<input type="text" class="styled-input" name="specification" autocomplete="off"/>
-                            </li>
-                            <li>
-                                生产厂家:<input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
+                                药品:<input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码"  name="query" autocomplete="off"/>
                             </li>
                             <li>
-                                产地:<input type="text" class="styled-input" name="origin" autocomplete="off"/>
+                                生产厂家:<input type="text" class="styled-input" placeholder="请输入生产厂家"  name="manufacturer" autocomplete="off"/>
                             </li>
                             <li>
-                                是否弃用:<input type="text" class="styled-input" name="isDeprecated" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createdAt" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedAt" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                DTP商品: <select name="dtpProduct"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="是">是</option>
+                                    <option value="否">否</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
@@ -91,12 +80,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+
             </div>
 
             <div class="col-sm-12 select-table table-striped">

health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceAdd.html

@@ -17,15 +17,15 @@
                 <input name="category" placeholder="分类"  id="category" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关联药品，可以存储多个药品，用逗号分隔:</label>
+                <label>关联药品</label>
                 <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔"  id="associatedDrugs" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关联疾病，可以存储多个疾病，用逗号分隔:</label>
+                <label>关联疾病:</label>
                 <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔"  id="associatedDiseases" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>疾病病程，用于描述疾病的进展过程:</label>
+                <label>疾病病程:</label>
                 <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程"  id="diseaseCourse" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceEdit.html

@@ -21,15 +21,15 @@
                 <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关联药品，可以存储多个药品，用逗号分隔:</label>
+                <label>关联药品:</label>
                 <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔" th:value="${associatedDrugs}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>关联疾病，可以存储多个疾病，用逗号分隔:</label>
+                <label>关联疾病:</label>
                 <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔" th:value="${associatedDiseases}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>疾病病程，用于描述疾病的进展过程:</label>
+                <label>疾病病程:</label>
                 <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程" th:value="${diseaseCourse}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceList.html

@@ -39,41 +39,40 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpZskcxFollowUpGuidance-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                标题:<input type="text" class="styled-input" name="title" autocomplete="off"/>
-                            </li>
-                            <li>
-                                分类:<input type="text" class="styled-input" name="category" autocomplete="off"/>
-                            </li>
-                            <li>
-                                关联药品，可以存储多个药品，用逗号分隔:<input type="text" class="styled-input" name="associatedDrugs" autocomplete="off"/>
-                            </li>
-                            <li>
-                                关联疾病，可以存储多个疾病，用逗号分隔:<input type="text" class="styled-input" name="associatedDiseases" autocomplete="off"/>
-                            </li>
-                            <li>
-                                疾病病程，用于描述疾病的进展过程:<input type="text" class="styled-input" name="diseaseCourse" autocomplete="off"/>
+                                标题:<input type="text" class="styled-input" placeholder="请输入标题" name="title" autocomplete="off"/>
                             </li>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
+                                分类:
+                                <select name="category"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="用药参考">用药参考</option>
+                                    <option value="医学前沿">医学前沿</option>
+                                    <option value="科研服务">科研服务</option>
+                                    <option value="临床指南">临床指南</option>
+                                </select>
                             </li>
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="createdTime" autocomplete="off"/>
+                                关联药品:<input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
                             </li>
                             <li>
-                                更新人:<input type="text" class="styled-input" name="updatedBy" autocomplete="off"/>
+                                关联疾病:<input type="text" class="styled-input" placeholder="请输入关联疾病" name="associatedDiseases" autocomplete="off"/>
                             </li>
+
                             <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedTime" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                创建人:<input type="text" class="styled-input" placeholder="请输入创建人" name="createdBy" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>
@@ -91,9 +90,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>
@@ -156,9 +152,9 @@
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'title', title: '标题', align: 'center' },
                     { field: 'category', title: '分类', align: 'center' },
-                    { field: 'associatedDrugs', title: '关联药品，可以存储多个药品，用逗号分隔', align: 'center' },
-                    { field: 'associatedDiseases', title: '关联疾病，可以存储多个疾病，用逗号分隔', align: 'center' },
-                    { field: 'diseaseCourse', title: '疾病病程，用于描述疾病的进展过程', align: 'center' },
+                    { field: 'associatedDrugs', title: '关联药品', align: 'center' },
+                    { field: 'associatedDiseases', title: '关联疾病', align: 'center' },
+                    { field: 'diseaseCourse', title: '疾病病程', align: 'center' },
                     { field: 'createdBy', title: '创建人', align: 'center' },
                     { field: 'createdTime', title: '创建时间', align: 'center' },
                     { field: 'updatedBy', title: '更新人', align: 'center' },
@@ -172,10 +168,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/dtp/SDtpZskcxFollowUpGuidancePageEdit.html

@@ -21,15 +21,15 @@
                         <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>关联药品，可以存储多个药品，用逗号分隔:</label>
+                        <label>关联药品:</label>
                         <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔" th:value="${associatedDrugs}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>关联疾病，可以存储多个疾病，用逗号分隔:</label>
+                        <label>关联疾病:</label>
                         <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔" th:value="${associatedDiseases}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>疾病病程，用于描述疾病的进展过程:</label>
+                        <label>疾病病程:</label>
                         <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程" th:value="${diseaseCourse}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareList.html

@@ -39,63 +39,36 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpZskcxPharmaceuticalShare-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                文章标题:<input type="text" class="styled-input" name="articleTitle" autocomplete="off"/>
-                            </li>
-                            <li>
-                                分类:<input type="text" class="styled-input" name="category" autocomplete="off"/>
-                            </li>
-                            <li>
-                                来源门店:<input type="text" class="styled-input" name="sourceStore" autocomplete="off"/>
+                                药品:<input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
                             </li>
                             <li>
-                                创建时间:<input type="text" class="styled-input" name="createdTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新人:<input type="text" class="styled-input" name="updatedBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                更新时间:<input type="text" class="styled-input" name="updatedTime" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                分类:
+                                <select name="category"  class="styled-input">
+                                    <option value="">全部</option>
+                                    <option value="用药参考">用药参考</option>
+                                    <option value="医学前沿">医学前沿</option>
+                                    <option value="科研服务">科研服务</option>
+                                    <option value="临床指南">临床指南</option>
+                                </select>
                             </li>
                         </ul>
                     </div>
 
                 </form>
             </div>
-
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
@@ -166,12 +139,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=""><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";
@@ -181,7 +149,6 @@
         };
         $.table.init(options);
     }
-
     /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
     function resetPre() {
         resetDate();
@@ -189,30 +156,8 @@
         $.table.search();
         _refresh();
     }
-    function edit_page(id){
-        table.set();
-        var url = "/404.html";
-        if ($.common.isNotEmpty(id)) {
-            url = table.options.updateUrl.replace("{id}", id);
-        } else {
-            var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-            if (id.length == 0) {
-                $.modal.alertWarning("请至少选择一条记录");
-                return;
-            }
-            url = table.options.updateUrl.replace("{id}", id);
-        }
-        $.modal.openTab("修改" + table.options.modalName, url + "?editTage=1" );
-    }
 
-    /* 用户状态显示 */
-    function statusTools(row) {
-        if (row.status == 1) {
-            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
-        } else {
-            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
-        }
-    }
+
 </script>
 </body>
 

health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceList.html

@@ -39,29 +39,20 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SDtpZskcxPharmacovigilance-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <div class="select-list" >
                         <ul>
                             <li>
-                                最后更新时间:<input type="text" class="styled-input" name="lastUpdateTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                名称:<input type="text" class="styled-input" name="name" autocomplete="off"/>
-                            </li>
-                            <li>
-                                介绍:<input type="text" class="styled-input" name="introduction" autocomplete="off"/>
-                            </li>
-                            <li>
-                                警戒创建人:<input type="text" class="styled-input" name="alertCreator" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建时间:<input type="text" class="styled-input" name="createdAt" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                药品:<input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
                             </li>
                         </ul>
                     </div>
@@ -69,24 +60,6 @@
                 </form>
             </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
-            </div>
-
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>

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

@@ -38,6 +38,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse" >
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="archives-form">
 						<input type="hidden" id="deptId" name="deptId">
 		                <input type="hidden" id="parentId" name="parentId">
@@ -45,98 +52,33 @@
 						<div class="select-list" >
 							<ul>
 								<li>
-									患者信息：<input type="text" class="styled-input" name="name"/>
+									患者信息：<input type="text" placeholder="请输入姓名手机号" class="styled-input" name="name"/>
 								</li>
 								<li>
-									药品：<input type="text"  class="styled-input" name="genericName"/>
+									药品：<input type="text"  placeholder="请输入商品名/通用名/MDM编码" class="styled-input" name="query"/>
 								</li>
 								<li>
-									是否接受随访：
-									<select name="acceptFollowUp" id="acceptFollowUpSelect"  class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-									</select>
+									随访跟进人：<input type="text"  placeholder="请输入随访跟进人" class="styled-input" name="followUpPerson"/>
 								</li>
 								<li>
-									档案是否完善：
-									<select name="archiveCompleteStatus" class="styled-input" th:with="type=${@dict.getType('sys_doc_yes_no')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
-									</select>
-								</li>
-								<li style="text-align: center">
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
-							</ul>
-						</div>
-
-						<div class="ul-list select-list">
-							<ul>
-								<li>
-									随访跟进人：<input type="text"  class="styled-input" name="followUpPerson"/>
-								</li>
-								<li>
-									门店：<input type="text"  class="styled-input" name="storeName"/>
-								</li>
-								<li>
-									疾病：<input type="text"  class="styled-input" name="disease"/>
-								</li>
-								<li>
-									上翻状态：
-									<select name="flipStatus" class="styled-input" th:with="type=${@dict.getType('sys_up_yes_no')}" >
+									是否接受随访:<select name="acceptFollowUp" id="acceptFollowUpSelect"  style="width: auto" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
 										<option value="">所有</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 									</select>
 								</li>
-
-							</ul>
-							<ul>
 								<li>
-									随访状态：
-									<select name="followUpStatus" class="styled-input" th:with="type=${@dict.getType('sys_follow_up_visit')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-									</select>
-								</li>
-								<li>
-									实名状态：
-									<select name="realNameStatus" class="styled-input" th:with="type=${@dict.getType('sys_real_yes_no')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-									</select>
-								</li>
-								<li>
-									创建时间：<input type="text" class="styled-input time-input" id="updateTime" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
-								</li>
-								<li>
-									创建时间：<input type="text" class="styled-input time-input-new" id="updateTime1" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
-								</li>
-							</ul>
-							<ul>
-								<li>
-									性别：
-									<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
+									档案是否完善：<select name="archiveCompleteStatus"  class="styled-input" th:with="type=${@dict.getType('sys_doc_yes_no')}">
 										<option value="">所有</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 									</select>
 								</li>
 								<li>
-									是否参加共建项目：
-									<select name="joinProject" class="styled-input" th:with="type=${@dict.getType('sys_select_yes_no')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-									</select>
-								</li>
-								<li>
-									有无慈善援助：
-									<select name="charityAssistance" class="styled-input" th:with="type=${@dict.getType('sys_salvation_yes_no')}">
-										<option value="">所有</option>
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-									</select>
+									门店：<input type="text"  placeholder="请输入门店" class="styled-input" name="storeName"/>
 								</li>
+
 							</ul>
 						</div>
+
 					</form>
 				</div>
 

health-admin/src/main/resources/templates/dtp/cold/cold.html

@@ -11,6 +11,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse">
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="user-form">
 						<input type="hidden" id="deptId" name="deptId">
 		                <input type="hidden" id="parentId" name="parentId">
@@ -71,10 +78,7 @@
 										></option>
 									</select>
 								</li>
-								<li>
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
+
 							</ul>
 						</div>
 					</form>

health-admin/src/main/resources/templates/dtp/configInfo/drugList.html

@@ -11,6 +11,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse">
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="user-form">
 						<div class="select-list">
 							<ul>
@@ -39,11 +46,6 @@
 												></option>
 									</select>
 								</li>
-
-								<li>
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
 							</ul>
 						</div>
 					</form>

health-admin/src/main/resources/templates/dtp/followUp/followUpList.html

@@ -37,6 +37,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse" >
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="followUp-form">
 						<input type="hidden" id="deptId" name="deptId">
 		                <input type="hidden" id="parentId" name="parentId">
@@ -56,10 +63,7 @@
 								<li>
 									任务跟进人：<input type="text"  class="styled-input" name="taskFollower"/>
 								</li>
-								<li style="text-align: center">
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" id="refresh_id" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
+
 							</ul>
 						</div>
 

health-admin/src/main/resources/templates/dtp/print/print.html

@@ -11,6 +11,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse">
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="user-form">
 						<div class="select-list">
 							<ul>
@@ -39,11 +46,6 @@
 												></option>
 									</select>
 								</li>
-
-								<li>
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
 							</ul>
 						</div>
 					</form>

health-admin/src/main/resources/templates/dtp/recipe/recipe.html

@@ -11,6 +11,13 @@
 		<div class="container-div">
 			<div class="row">
 				<div class="col-sm-12 search-collapse">
+					<div class="query-condition-container">
+						<h4 class="query-condition-title">查询条件</h4>
+						<div class="query-buttons">
+							<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="user-form">
 						<input type="hidden" id="deptId" name="deptId">
 		                <input type="hidden" id="parentId" name="parentId">
@@ -68,10 +75,7 @@
 								</li>
 								</li>
 
-								<li>
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-								</li>
+
 							</ul>
 						</div>
 					</form>
@@ -87,9 +91,6 @@
 		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sdtp:recipe:remove">
 		                <i class="fa fa-remove"></i> 删除
 		            </a>
-<!--		            <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="dtp:recipe:import">-->
-<!--			            <i class="fa fa-upload"></i> 导入-->
-<!--			        </a>-->
 		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:recipe:export">
 			            <i class="fa fa-download"></i> 导出
 			        </a>

health-admin/src/main/resources/templates/dtp/recipe/view.html

@@ -20,12 +20,20 @@
                 <div class="ant-card-head-title">
                     <div class="index_title-2CoZR">
                         <h1>DTP处方登记概览</h1>
-                        <button onclick="" class="ant-btn-primary">导出订单</button>
+
                     </div>
                 </div>
             </div>
 
         </div>
+        <div class="query-condition-container">
+            <h4 class="query-condition-title">查询条件</h4>
+            <div class="query-buttons">
+                <button onclick="" class="ant-btn-primary">导出订单</button>
+                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+            </div>
+        </div>
         <div class="container-div">
         <form id="report-form">
             <input type="text" class="" hidden="true" value="" name="id">
@@ -81,8 +89,7 @@
 									<input type="text" class="styled-input time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
 									<span>-</span>
 									<input type="text" class="styled-input time-input" id="endTime" placeholder="结束时间" name="endTime"/>
-                    <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>

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

@@ -33,7 +33,7 @@
                 <input name="approvalTime" placeholder="审批时间"  id="approvalTime" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>审批状态：待审核，审核通过，驳回:</label>
+                <label>审批状态:</label>
                 <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回"  id="approvalStatus" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -37,7 +37,7 @@
                 <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>审批状态：待审核，审核通过，驳回:</label>
+                <label>审批状态:</label>
                 <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回" th:value="${approvalStatus}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -64,7 +64,7 @@
                             <li class="select-time">
                                 <label>申请时间: </label>
                                 <input type="text" class="time-input-new styled-input" id="sqstartTime" placeholder="开始时间" name="plibeginTime"/>
-                                -
+                                <span>-</span>
                                 <input type="text" class="time-input-new styled-input" id="sqendTime" placeholder="结束时间" name="pliendTime"/>
                             </li>
 

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

@@ -37,7 +37,7 @@
                         <input name="approvalTime" placeholder="审批时间" th:value="${approvalTime}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>审批状态：待审核，审核通过，驳回:</label>
+                        <label>审批状态:</label>
                         <input name="approvalStatus" placeholder="审批状态：待审核，审核通过，驳回" th:value="${approvalStatus}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">

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

@@ -39,12 +39,16 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SSpglMdspStoreproductdetails-form">
-
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
-                    <h4>查询条件</h4>
-                    <hr>
                     <div class="select-list" >
 
                         <div class="col-sm-12">
@@ -188,15 +192,6 @@
 
                                     </div>
                                 </div>
-
-                                <div class="col-sm-6">
-                                    <div class="input-group">
-                                        <hr>
-                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
-                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                    </div>
-                                </div>
-
                             </div>
                         </div>
 

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

@@ -17,11 +17,17 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse" >
+                <div class="query-condition-container">
+                    <h4 class="query-condition-title">查询条件</h4>
+                    <div class="query-buttons">
+                        <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="SSpglProductdetails-form">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
-                    <h4>查询条件</h4>
-                    <hr>
+
                     <div class="select-list" >
                         <div class="col-sm-12">
                         <div class="form-group">
@@ -132,12 +138,7 @@
                                         </select>
                                     </div>
                                 </div>
-                                <div class="col-sm-3">
-                                    <div class="input-group">
-                                        <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;查询</a>
-                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                                    </div>
-                                </div>
+
                             </div>
                         </div>
                     </div>

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

@@ -8,10 +8,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SXtszMdzhglAccountmanagement-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>门店ID:</label>
-                <input name="storeId" placeholder="门店ID"  id="storeId" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>账号名:</label>
                 <input name="accountName" placeholder="账号名"  id="accountName" class="styled-input" type="text">
@@ -24,10 +21,6 @@
                 <label>手机号码:</label>
                 <input name="mobileNumber" placeholder="手机号码"  id="mobileNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>二维码:</label>
-                <input name="qrcodeUrl" placeholder="二维码"  id="qrcodeUrl" class="styled-input" type="text">
-            </div>
         </div>
     </form>
 </div>

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

@@ -12,10 +12,7 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-            <div class="customize-form-group">
-                <label>门店ID:</label>
-                <input name="storeId" placeholder="门店ID" th:value="${storeId}" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>账号名:</label>
                 <input name="accountName" placeholder="账号名" th:value="${accountName}" class="styled-input" type="text">

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

@@ -13,10 +13,6 @@
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
-                        <label>门店ID:</label>
-                        <input name="storeId" placeholder="门店ID" th:value="${storeId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
                         <label>账号名:</label>
                         <input name="accountName" placeholder="账号名" th:value="${accountName}" class="styled-input" type="text">
                     </div>

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

@@ -8,10 +8,7 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SXtszMdzhglStorequalification-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>门店ID:</label>
-                <input name="storeId" placeholder="门店ID"  id="storeId" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>企业名称:</label>
                 <input name="companyName" placeholder="企业名称"  id="companyName" class="styled-input" type="text">

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

@@ -13,10 +13,6 @@
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
-                <label>门店ID:</label>
-                <input name="storeId" placeholder="门店ID" th:value="${storeId}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
                 <label>企业名称:</label>
                 <input name="companyName" placeholder="企业名称" th:value="${companyName}" class="styled-input" type="text">
             </div>

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

@@ -12,10 +12,7 @@
         </div>
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                        <label>门店ID:</label>
-                        <input name="storeId" placeholder="门店ID" th:value="${storeId}" class="styled-input" type="text">
-                    </div>
+
                     <div class="customize-form-group">
                         <label>企业名称:</label>
                         <input name="companyName" placeholder="企业名称" th:value="${companyName}" class="styled-input" type="text">

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

@@ -38,108 +38,7 @@
 <div class="ui-layout-center">
     <div class="container-div">
         <div class="row">
-            <!--<div class="col-sm-12 search-collapse" >
-                <form id="SXzglDownloadManagement-form">
-                    <input type="hidden" id="deptId" name="deptId">
-                    <input type="hidden" id="parentId" name="parentId">
-                    <div class="select-list" >
-                        <ul>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="createdBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建日期:<input type="text" class="styled-input" name="createdDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后更新人:<input type="text" class="styled-input" name="lastModifiedBy" autocomplete="off"/>
-                            </li>
-                            <li>
-                                最后更新日期:<input type="text" class="styled-input" name="lastModifiedDate" autocomplete="off"/>
-                            </li>
-                            <li>
-                                业务id:<input type="text" class="styled-input" name="businessId" autocomplete="off"/>
-                            </li>
-                            <li>
-                                类型:<input type="text" class="styled-input" name="type" autocomplete="off"/>
-                            </li>
-                            <li>
-                                任务名称:<input type="text" class="styled-input" name="name" autocomplete="off"/>
-                            </li>
-                            <li>
-                                平台类型1:<input type="text" class="styled-input" name="platformType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                文件名称全路径:<input type="text" class="styled-input" name="fileName" autocomplete="off"/>
-                            </li>
-                            <li>
-                                文件渠道位置1:<input type="text" class="styled-input" name="filePlace" autocomplete="off"/>
-                            </li>
-                            <li>
-                                文件下载地址:<input type="text" class="styled-input" name="fileUrl" autocomplete="off"/>
-                            </li>
-                            <li>
-                                原因:成功:<input type="text" class="styled-input" name="reason" autocomplete="off"/>
-                            </li>
-                            <li>
-                                状态：为数字代表:<input type="text" class="styled-input" name="status" autocomplete="off"/>
-                            </li>
-                            <li>
-                                请求接口路径例如:/chronicdisease/api/chronic/downloadExcel:<input type="text" class="styled-input" name="requestUrl" autocomplete="off"/>
-                            </li>
-                            <li>
-                                请求参数{}:<input type="text" class="styled-input" name="requestParam" autocomplete="off"/>
-                            </li>
-                            <li>
-                                请求类型:1,2,3:<input type="text" class="styled-input" name="requestType" autocomplete="off"/>
-                            </li>
-                            <li>
-                                耗时:{"completeTime":"2024-06-29 20:11:48","startTime":"2024-06-29 20:11:43","spendTime":"5秒"}:<input type="text" class="styled-input" name="extend" autocomplete="off"/>
-                            </li>
-                            <li>
-                                扩展JSON对象:<input type="text" class="styled-input" name="extendJson" autocomplete="off"/>
-                            </li>
-                            <li>
-                                版本号:<input type="text" class="styled-input" name="version" autocomplete="off"/>
-                            </li>
-                            <li>
-                                开始日期:<input type="text" class="styled-input" name="startTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                结束日期:<input type="text" class="styled-input" name="endTime" autocomplete="off"/>
-                            </li>
-                            <li>
-                                是否可以重新下载 值为true 和false:<input type="text" class="styled-input" name="canReload" autocomplete="off"/>
-                            </li>
-                            <li>
-                                创建人:<input type="text" class="styled-input" name="createName" autocomplete="off"/>
-                            </li>
-                            <li style="text-align: center">
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-
-                </form>
-            </div>
-
-            <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>-->
+            <h4>任务列表</h4>
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="" shiro:hasPermission="system:user:add">
                     <i class="fa fa-download"></i> 正在下载
@@ -187,9 +86,9 @@
             createUrl: prefix + "/sXzglDownloadManagementAdd",
             updateUrl: prefix + "/sXzglDownloadManagementEdit/{id}",
             removeUrl: prefix + "/sXzglDownloadManagementRemove",
-            /*exportUrl: prefix + "/export",
+            exportUrl: prefix + "/export",
             importUrl: prefix + "/importData",
-            importTemplateUrl: prefix + "/importTemplate",*/
+            importTemplateUrl: prefix + "/importTemplate",
             sortName: "id",
             sortOrder: "asc",
             modalName: "下载管理表",
@@ -204,38 +103,43 @@
                 checkbox: true
             },
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
-                    { field: 'createdBy', title: '创建人', align: 'center' },
-                    { field: 'createdDate', title: '创建日期', align: 'center' },
-                    { field: 'lastModifiedBy', title: '最后更新人', align: 'center' },
-                    { field: 'lastModifiedDate', title: '最后更新日期', align: 'center' },
-                    { field: 'businessId', title: '业务id', align: 'center' },
-                    { field: 'type', title: '类型', align: 'center' },
-                    { field: 'name', title: '任务名称', align: 'center' },
-                    { field: 'platformType', title: '平台类型1', align: 'center' },
-                    { field: 'fileName', title: '文件名称全路径', align: 'center' },
-                    { field: 'filePlace', title: '文件渠道位置1', align: 'center' },
-                    { field: 'fileUrl', title: '文件下载地址', align: 'center' },
-                    { field: 'reason', title: '原因:成功', align: 'center' },
-                    { field: 'status', title: '状态：为数字代表', align: 'center' },
-                    { field: 'requestUrl', title: '请求接口路径例如:/chronicdisease/api/chronic/downloadExcel', align: 'center' },
-                    { field: 'requestParam', title: '请求参数{}', align: 'center' },
-                    { field: 'requestType', title: '请求类型:1,2,3', align: 'center' },
-                    { field: 'extend', title: '耗时:{"completeTime":"2024-06-29 20:11:48","startTime":"2024-06-29 20:11:43","spendTime":"5秒"}', align: 'center' },
-                    { field: 'extendJson', title: '扩展JSON对象', align: 'center' },
-                    { field: 'version', title: '版本号', align: 'center' },
-                    { field: 'startTime', title: '开始日期', align: 'center' },
-                    { field: 'endTime', title: '结束日期', align: 'center' },
-                    { field: 'canReload', title: '是否可以重新下载 值为true 和false', align: 'center' },
-                    { field: 'createName', title: '创建人', align: 'center' },
-
+                { field: 'name', title: '任务名称', align: 'center' },
+                { field: 'startTime', title: '开始日期', align: 'center' },
+                { field: 'endTime', title: '结束日期', align: 'center' },
+                { field: 'createdDate', title: '创建时间', align: 'center' },
+                {
+                    field: 'extend',
+                    title: '耗时',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        if (value) {
+                            try {
+                                // 尝试将字符串解析为 JSON 对象
+                                var extendObj = JSON.parse(value);
+                                return '<span style="color: #00B83F">' + extendObj.spendTime + '</span>';
+                            } catch (e) {
+                                // 如果解析失败，返回原始值或空字符串
+                                console.error('Failed to parse extend value:', e);
+                                return value;
+                            }
+                        } else {
+                            return '';
+                        }
+                    }
+                },
+                { field: 'status', title: '状态', align: 'center',
+                    formatter: function (value, row, index) {
+                        return statusTools(row);
+                    }
+                },
                 {
                     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="$.operate.save(\'' + 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> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.save(\'' + row.id + '\')"><i class="fa fa-edit"></i>保存到本地</a> ');
                             return actions.join('');
                         } else {
                             return "";
@@ -269,12 +173,12 @@
         $.modal.openTab("修改" + table.options.modalName, url + "?editTage=1" );
     }
 
-    /* 用户状态显示 */
+    /* 用户状态显示1成功，2进行中 */
     function statusTools(row) {
         if (row.status == 1) {
-            return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
+            return '<span style="color: #00B83F">成功</span>';
         } else {
-            return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+            return '<span style="color: #005cc5">进行中</span>';
         }
     }
 </script>

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

@@ -45,7 +45,7 @@
                 <input name="medicareMinDosageUnit" placeholder="医保最小剂量单位"  id="medicareMinDosageUnit" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>是否拆零上传（0: 否, 1: 是）:</label>
+                <label>是否拆零上传:</label>
                 <input name="isSplitUpload" placeholder="是否拆零上传（0: 否, 1: 是）"  id="isSplitUpload" class="styled-input" type="text">
             </div>
         </div>

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

@@ -49,7 +49,7 @@
                 <input name="medicareMinDosageUnit" placeholder="医保最小剂量单位" th:value="${medicareMinDosageUnit}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>是否拆零上传（0: 否, 1: 是）:</label>
+                <label>是否拆零上传:</label>
                 <input name="isSplitUpload" placeholder="是否拆零上传（0: 否, 1: 是）" th:value="${isSplitUpload}" class="styled-input" type="text">
             </div>
         </div>

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

@@ -49,7 +49,7 @@
                         <input name="medicareMinDosageUnit" placeholder="医保最小剂量单位" th:value="${medicareMinDosageUnit}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>是否拆零上传（0: 否, 1: 是）:</label>
+                        <label>是否拆零上传:</label>
                         <input name="isSplitUpload" placeholder="是否拆零上传（0: 否, 1: 是）" th:value="${isSplitUpload}" class="styled-input" type="text">
                     </div>
         </div>

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

@@ -97,7 +97,7 @@
                 <input name="paymentTime" placeholder="支付时间"  id="paymentTime" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单状态：1待录方，2待付款，3已完成，4已取消:</label>
+                <label>订单状态:</label>
                 <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消"  id="orderStatus" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -101,7 +101,7 @@
                 <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>订单状态：1待录方，2待付款，3已完成，4已取消:</label>
+                <label>订单状态:</label>
                 <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消" th:value="${orderStatus}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">

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

@@ -142,7 +142,7 @@
                     { field: 'submitTime', title: '提交时间', align: 'center' },
                     { field: 'cancelTime', title: '取消时间', align: 'center' },
                     { field: 'paymentTime', title: '支付时间', align: 'center' },
-                    { field: 'orderStatus', title: '订单状态：1待录方，2待付款，3已完成，4已取消', align: 'center' },
+                    { field: 'orderStatus', title: '订单状态', align: 'center' },
                     { field: 'remarks', title: '备注', align: 'center' },
 
                 {

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

@@ -101,7 +101,7 @@
                         <input name="paymentTime" placeholder="支付时间" th:value="${paymentTime}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">
-                        <label>订单状态：1待录方，2待付款，3已完成，4已取消:</label>
+                        <label>订单状态:</label>
                         <input name="orderStatus" placeholder="订单状态：1待录方，2待付款，3已完成，4已取消" th:value="${orderStatus}" class="styled-input" type="text">
                     </div>
                     <div class="customize-form-group">