update 报表库存页面调整

health-admin/src/main/java/com/bzd/web/controller/daas/SDaasChannelManagementController.java

@@ -6,6 +6,8 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.DateUtils;
+import com.bzd.common.utils.uuid.IdUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -53,6 +55,9 @@ public class SDaasChannelManagementController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("channelCode", IdUtils.randomUUID());
+            pd.put("createdBy", getSysUser().getUserId()) ;
+            pd.put("createdAt",DateUtils.getTime());
             Integer result = sDaasChannelManagementService.addSDaasChannelManagement(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/java/com/bzd/web/controller/dtp/SDtpYypzFaqManagementController.java

@@ -6,8 +6,11 @@ import com.bzd.common.core.controller.BaseController;
 import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
+import com.bzd.common.utils.DateUtils;
+import com.bzd.common.utils.uuid.IdUtils;
 import com.bzd.system.service.PharmaceuticalService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.helpers.Util;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -54,6 +57,9 @@ public class SDtpYypzFaqManagementController extends BaseController {
     public AjaxResult addSave() throws Exception {
         PageData pd = this.getPageData();
         try {
+            pd.put("questionAnswerId", IdUtils.fastUUID());
+            pd.put("lastEditTime", DateUtils.getTime());
+            pd.put("lastEditor", getLoginName());
             Integer result = sDtpYypzFaqManagementService.addSDtpYypzFaqManagement(pd);
             if (result == 1) {
                 return AjaxResult.success("新增成功");

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailAdd.html

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>商品ID:</label>
-                <input name="productId" placeholder="商品ID"  id="productId" class="styled-input" type="text">
+                <input name="productId" placeholder="商品ID"  id="productId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
@@ -30,28 +30,22 @@
             </div>
             <div class="customize-form-group">
                 <label>库存数量:</label>
-                <input name="stockQuantity" placeholder="库存数量"  id="stockQuantity" class="styled-input" type="text">
+                <input name="stockQuantity" placeholder="库存数量"  id="stockQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>再订货水平:</label>
-                <input name="reorderLevel" placeholder="再订货水平"  id="reorderLevel" class="styled-input" type="text">
+                <input name="reorderLevel" placeholder="再订货水平"  id="reorderLevel" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
-                <label>缺货数量:</label>
-                <input name="shortageQuantity" placeholder="缺货数量"  id="shortageQuantity" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+
+            <div class="customize-form-group select-time">
                 <label>最后库存检查时间:</label>
-                <input name="lastStockCheckTime" placeholder="最后库存检查时间"  id="lastStockCheckTime" class="styled-input" type="text">
+                <input name="lastStockCheckTime" placeholder="最后库存检查时间"  id="lastStockCheckTime" class="time-input2 time-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>
                 <input name="lastEditor" placeholder="最后编辑人"  id="lastEditor" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间"  id="lastEditTime" class="styled-input" type="text">
-            </div>
+
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailEdit.html

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>商品ID:</label>
-                <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
+                <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
@@ -31,27 +31,24 @@
             </div>
             <div class="customize-form-group">
                 <label>库存数量:</label>
-                <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
+                <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>再订货水平:</label>
                 <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>缺货数量:</label>
-                <input name="shortageQuantity" placeholder="缺货数量" th:value="${shortageQuantity}" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
+
+            <div class="customize-form-group select-time">
                 <label>最后库存检查时间:</label>
-                <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
+                <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>
                 <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailList.html

@@ -22,10 +22,7 @@
                 </div>
                 <form id="SBbfxKcbbInventoryShortageDetail-form" class="customize-search-form">
 <div class="customize-form-group-container">
-                        <div class="customize-form-group">
-                            <label>商品ID:</label>
-                            <input type="text" class="styled-input" name="productId" autocomplete="off"/>
-                        </div>
+
                         <div class="customize-form-group">
                             <label>商品名称:</label>
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
@@ -42,50 +39,21 @@
                             <label>供应商:</label>
                             <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>库存数量:</label>
-                            <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>再订货水平:</label>
-                            <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>缺货数量:</label>
-                            <input type="text" class="styled-input" name="shortageQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后库存检查时间:</label>
-                            <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后编辑人:</label>
-                            <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后编辑时间:</label>
-                            <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
-                        </div>
                     </div>
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <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>-->
+
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
@@ -143,9 +111,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'productId', title: '商品ID', align: 'center' },
                     { field: 'productName', title: '商品名称', align: 'center' },
@@ -165,12 +131,7 @@
                     formatter: function(value, row, index) {
                         if (row.id) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailPageEdit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('商品缺货明细表修改')" />
+    <th:block th:include="include :: header('商品缺货明细表')" />
 </head>
 <body>
 <div class="ui-layout-center">
@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
                     <div class="customize-form-group">
                             <label>商品ID:</label>
-                        <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
+                        <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>商品名称:</label>
@@ -31,34 +31,31 @@
                     </div>
                     <div class="customize-form-group">
                             <label>库存数量:</label>
-                        <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
+                        <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>再订货水平:</label>
                         <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
-                            <label>缺货数量:</label>
-                        <input name="shortageQuantity" placeholder="缺货数量" th:value="${shortageQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
+
+                    <div class="customize-form-group select-time" >
                             <label>最后库存检查时间:</label>
-                        <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
+                        <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="time-input time-input" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>最后编辑人:</label>
                         <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>最后编辑时间:</label>
-                        <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
+                        <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -66,6 +63,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SBbfxKcbbInventoryShortageDetail-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "bbfx/sbbfxkcbbinventoryshortagedetail";
         if ($.validate.form()) {

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxAdd.html

@@ -10,11 +10,11 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>机构ID:</label>
-                <input name="organizationId" placeholder="机构ID"  id="organizationId" class="styled-input" type="text">
+                <input name="organizationId" placeholder="机构ID"  id="organizationId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品ID:</label>
-                <input name="productId" placeholder="商品ID"  id="productId" class="styled-input" type="text">
+                <input name="productId" placeholder="商品ID"  id="productId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
@@ -34,23 +34,23 @@
             </div>
             <div class="customize-form-group">
                 <label>库存数量:</label>
-                <input name="stockQuantity" placeholder="库存数量"  id="stockQuantity" class="styled-input" type="text">
+                <input name="stockQuantity" placeholder="库存数量"  id="stockQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>再订货水平:</label>
                 <input name="reorderLevel" placeholder="再订货水平"  id="reorderLevel" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后库存检查时间:</label>
-                <input name="lastStockCheckTime" placeholder="最后库存检查时间"  id="lastStockCheckTime" class="styled-input" type="text">
+                <input name="lastStockCheckTime" placeholder="最后库存检查时间"  id="lastStockCheckTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>
                 <input name="lastEditor" placeholder="最后编辑人"  id="lastEditor" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间"  id="lastEditTime" class="styled-input" type="text">
+                <input name="lastEditTime" placeholder="最后编辑时间"  id="lastEditTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxEdit.html

@@ -11,11 +11,11 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>机构ID:</label>
-                <input name="organizationId" placeholder="机构ID" th:value="${organizationId}" class="styled-input" type="text">
+                <input name="organizationId" placeholder="机构ID" th:value="${organizationId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品ID:</label>
-                <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
+                <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品名称:</label>
@@ -35,23 +35,23 @@
             </div>
             <div class="customize-form-group">
                 <label>库存数量:</label>
-                <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
+                <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>再订货水平:</label>
                 <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后库存检查时间:</label>
-                <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
+                <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>
                 <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxList.html

@@ -21,15 +21,7 @@
                     </div>
                 </div>
                 <form id="SBbfxKcbbJgkcmx-form" class="customize-search-form">
-<div class="customize-form-group-container">
-                        <div class="customize-form-group">
-                            <label>机构ID:</label>
-                            <input type="text" class="styled-input" name="organizationId" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>商品ID:</label>
-                            <input type="text" class="styled-input" name="productId" autocomplete="off"/>
-                        </div>
+                        <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>商品名称:</label>
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
@@ -46,46 +38,20 @@
                             <label>供应商:</label>
                             <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>库存数量:</label>
-                            <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>再订货水平:</label>
-                            <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后库存检查时间:</label>
-                            <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后编辑人:</label>
-                            <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>最后编辑时间:</label>
-                            <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
-                        </div>
                     </div>
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <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>-->
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
@@ -143,9 +109,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'organizationId', title: '机构ID', align: 'center' },
                     { field: 'productId', title: '商品ID', align: 'center' },
@@ -165,12 +129,7 @@
                     formatter: function(value, row, index) {
                         if (row.id) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxPageEdit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('机构库存表修改')" />
+    <th:block th:include="include :: header('机构库存表')" />
 </head>
 <body>
 <div class="ui-layout-center">
@@ -9,56 +9,56 @@
 
         <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="organizationId" placeholder="机构ID" th:value="${organizationId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品ID:</label>
-                        <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品名称:</label>
-                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品编码:</label>
-                        <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品类别:</label>
-                        <input name="category" placeholder="商品类别" th:value="${category}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>供应商:</label>
-                        <input name="supplier" placeholder="供应商" th:value="${supplier}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>库存数量:</label>
-                        <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>再订货水平:</label>
-                        <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后库存检查时间:</label>
-                        <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑人:</label>
-                        <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑时间:</label>
-                        <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>机构ID:</label>
+                <input name="organizationId" placeholder="机构ID" th:value="${organizationId}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>商品ID:</label>
+                <input name="productId" placeholder="商品ID" th:value="${productId}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>商品名称:</label>
+                <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品编码:</label>
+                <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品类别:</label>
+                <input name="category" placeholder="商品类别" th:value="${category}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>供应商:</label>
+                <input name="supplier" placeholder="供应商" th:value="${supplier}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>库存数量:</label>
+                <input name="stockQuantity" placeholder="库存数量" th:value="${stockQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>再订货水平:</label>
+                <input name="reorderLevel" placeholder="再订货水平" th:value="${reorderLevel}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>最后库存检查时间:</label>
+                <input name="lastStockCheckTime" placeholder="最后库存检查时间" th:value="${lastStockCheckTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>最后编辑人:</label>
+                <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>最后编辑时间:</label>
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -66,6 +66,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SBbfxKcbbJgkcmx-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "bbfx/sbbfxkcbbjgkcmx";
         if ($.validate.form()) {

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

@@ -10,23 +10,33 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>渠道名称:</label>
-                <input name="channelName" placeholder="渠道名称"  id="channelName" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>渠道代码:</label>
-                <input name="channelCode" placeholder="渠道代码"  id="channelCode" class="styled-input" type="text">
+                <select name="channelName"  class="styled-input" required>
+                    <option value="药急送">药急送</option>
+                    <option value="美团外卖">美团外卖</option>
+                    <option value="京东到家">京东到家</option>
+                    <option value="天猫商城">天猫商城</option>
+                    <option value="饿了么">饿了么</option>
+                </select>
             </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>渠道代码:</label>-->
+<!--                <input name="channelCode" placeholder="渠道代码"  id="channelCode" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>渠道类型:</label>
-                <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台"  id="channelType" class="styled-input" type="text">
+
+                <select name="channelType"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                    ></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>联系人:</label>
-                <input name="contactPerson" placeholder="联系人"  id="contactPerson" class="styled-input" type="text">
+                <input name="contactPerson" placeholder="联系人"  id="contactPerson" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
-                <input name="contactPhone" placeholder="联系电话"  id="contactPhone" class="styled-input" type="text">
+                <input name="contactPhone" placeholder="联系电话"  id="contactPhone" class="styled-input" type="number" maxlength="11" required>
             </div>
             <div class="customize-form-group">
                 <label>电子邮件:</label>
@@ -38,24 +48,27 @@
             </div>
             <div class="customize-form-group">
                 <label>渠道状态</label>
-                <input name="status" placeholder="渠道状态：启用、停用"  id="status" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间"  id="updatedAt" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新人:</label>
-                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
+                <select name="status"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            ></option>
+                </select>
             </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>创建时间:</label>-->
+<!--                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>创建人:</label>-->
+<!--                <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>更新时间:</label>-->
+<!--                <input name="updatedAt" placeholder="更新时间"  id="updatedAt" class="styled-input" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>更新人:</label>-->
+<!--                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>备注:</label>
                 <input name="remarks" placeholder="备注"  id="remarks" class="styled-input" type="text">

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

@@ -15,11 +15,14 @@
             </div>
             <div class="customize-form-group">
                 <label>渠道代码:</label>
-                <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text">
+                <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>渠道类型:</label>
-                <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台" th:value="${channelType}" class="styled-input" type="text">
+                <select name="channelType"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${channelType}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>联系人:</label>
@@ -27,7 +30,7 @@
             </div>
             <div class="customize-form-group">
                 <label>联系电话:</label>
-                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
+                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="number" maxlength="11">
             </div>
             <div class="customize-form-group">
                 <label>电子邮件:</label>
@@ -39,23 +42,26 @@
             </div>
             <div class="customize-form-group">
                 <label>渠道状态</label>
-                <input name="status" placeholder="渠道状态：启用、停用" th:value="${status}" class="styled-input" type="text">
+                <select name="status"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${status}"></option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>
-                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>备注:</label>

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

@@ -28,12 +28,12 @@
                         </div>
                         <div class="customize-form-group">
                             <label>渠道类型</label>
-                                <select name="channelType"  class="styled-input">
-                                    <option value="">全部</option>
-                                    <option value="线上">线上</option>
-                                    <option value="线下">线下</option>
-                                    <option value="第三方平台">第三方平台</option>
-                                </select>
+
+                            <select name="channelType"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdlx')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>联系人:</label>
@@ -45,17 +45,17 @@
                         </div>
                         <div class="customize-form-group">
                             <label>渠道状态</label>
-                                <select name="status"  class="styled-input">
-                                    <option value="">全部</option>
-                                    <option value="启用">启用</option>
-                                    <option value="启用">停用</option>
-                                </select>
+                            <select name="status"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdzt')}">
+                                <option value="">全部</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                ></option>
+                            </select>
                         </div>
                         <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="params[beginTime]">
+                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime">
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime">
                         </div>
                     </div>
                 </form>

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

@@ -9,58 +9,64 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>渠道名称:</label>
-                        <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道代码:</label>
-                        <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道类型</label>
-                        <input name="channelType" placeholder="渠道类型，例如：线上、线下、第三方平台" th:value="${channelType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>联系人:</label>
-                        <input name="contactPerson" placeholder="联系人" th:value="${contactPerson}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>联系电话:</label>
-                        <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>电子邮件:</label>
-                        <input name="email" placeholder="电子邮件" th:value="${email}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>地址:</label>
-                        <input name="address" placeholder="地址" th:value="${address}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道状态</label>
-                        <input name="status" placeholder="渠道状态：启用、停用" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建人:</label>
-                        <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新人:</label>
-                        <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>备注:</label>
-                        <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>渠道名称:</label>
+                <input name="channelName" placeholder="渠道名称" th:value="${channelName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道代码:</label>
+                <input name="channelCode" placeholder="渠道代码" th:value="${channelCode}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道类型:</label>
+                <select name="channelType"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdlx')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${channelType}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>联系人:</label>
+                <input name="contactPerson" placeholder="联系人" th:value="${contactPerson}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>联系电话:</label>
+                <input name="contactPhone" placeholder="联系电话" th:value="${contactPhone}" class="styled-input" type="number" maxlength="11">
+            </div>
+            <div class="customize-form-group">
+                <label>电子邮件:</label>
+                <input name="email" placeholder="电子邮件" th:value="${email}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>地址:</label>
+                <input name="address" placeholder="地址" th:value="${address}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道状态</label>
+                <select name="status"  class="styled-input"  th:with="type=${@dict.getType('sys_select_qdgl_qdzt')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                            th:selected="${dict.dictLabel}==${status}"></option>
+                </select>
+            </div>
+            <div class="customize-form-group">
+                <label>创建时间:</label>
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>更新时间:</label>
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>更新人:</label>
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>备注:</label>
+                <input name="remarks" placeholder="备注" th:value="${remarks}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -122,7 +122,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=""><i class="fa fa-edit"></i>查看</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

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

@@ -46,7 +46,7 @@
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -54,6 +54,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SDdglFpglDsfzfkp-edit :input').attr('readonly', 'readonly');
+    });
     function submitHandler() {
         var prefix = ctx + "ddgl/sddglfpgldsfzfkp";
         if ($.validate.form()) {

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

@@ -162,22 +162,24 @@
                     { field: 'noData', title: '暂无数据', align: 'center' },
                     { field: 'mergeOrderNo', title: '合并订单号', align: 'center' },
                     { field: 'orderNo', title: '订单号', align: 'center' },
-                    { field: 'billingStatus', title: '开票状态', align: 'center' },
                     { field: 'createTime', title: '创建时间', align: 'center' },
-
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        if (row.id) {
-                            var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick=""><i class="fa fa-edit"></i>查看详情</a> ');
-                            return actions.join('');
-                        } else {
-                            return "";
-                        }
-                    }
-                }]
+                { field: 'billingStatus', title: '开票状态', align: 'center' }
+                // ,
+                //
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         if (row.id) {
+                //             var actions = [];
+                //             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
+                //             return actions.join('');
+                //         } else {
+                //             return "";
+                //         }
+                //     }
+                // }
+                ]
         };
         $.table.init(options);
     }

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

@@ -24,9 +24,9 @@
                     <div class="customize-form-group-container">
                         <div class="customize-form-group select-time">
                             <label>订单日期:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
+                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime">
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime">
                         </div>
                         <div class="customize-form-group">
                             <label>订单号:</label>

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

@@ -10,27 +10,35 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>业务归属:</label>
-                <input name="businessBelonging" placeholder="业务归属"  id="businessBelonging" class="styled-input" type="text">
+                <select name="businessBelonging"  class="styled-input">
+                    <option value="常规回访">常规回访</option>
+                    <option value="脱落召回">脱落召回</option>
+                </select>
+
             </div>
             <div class="customize-form-group">
                 <label>任务类型:</label>
-                <input name="taskType" placeholder="任务类型"  id="taskType" class="styled-input" type="text">
+                <select name="taskType"  class="styled-input">
+                    <option value="表单任务">表单任务</option>
+                    <option value="触达任务">触达任务</option>
+                    <option value="外呼任务">外呼任务</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>患者姓名:</label>
-                <input name="patientName" placeholder="患者姓名"  id="patientName" class="styled-input" type="text">
+                <input name="patientName" placeholder="患者姓名"  id="patientName" class="styled-input" type="text" required>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间"  id="createTime" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间"  id="createTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>完成时间:</label>
-                <input name="completeTime" placeholder="完成时间"  id="completeTime" class="styled-input" type="text">
+                <input name="completeTime" placeholder="完成时间"  id="completeTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>跟进人:</label>
-                <input name="follower" placeholder="跟进人"  id="follower" class="styled-input" type="text">
+                <input name="follower" placeholder="跟进人"  id="follower" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>门店:</label>
@@ -42,7 +50,14 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="已创建">已创建</option>
+                    <option value="待执行">待执行</option>
+                    <option value="已完成">已完成</option>
+                    <option value="已取消">已取消</option>
+                    <option value="未完成">未完成</option>
+                </select>
+
             </div>
         </div>
     </form>

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

@@ -11,27 +11,27 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>业务归属:</label>
-                <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
+                <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>任务类型:</label>
-                <input name="taskType" placeholder="任务类型" th:value="${taskType}" class="styled-input" type="text">
+                <input name="taskType" placeholder="任务类型" th:value="${taskType}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>患者姓名:</label>
-                <input name="patientName" placeholder="患者姓名" th:value="${patientName}" class="styled-input" type="text">
+                <input name="patientName" placeholder="患者姓名" th:value="${patientName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>创建时间:</label>
-                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>完成时间:</label>
-                <input name="completeTime" placeholder="完成时间" th:value="${completeTime}" class="styled-input" type="text">
+                <input name="completeTime" placeholder="完成时间" th:value="${completeTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>跟进人:</label>
-                <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text">
+                <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>门店:</label>
@@ -43,7 +43,7 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
+                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text" disabled="true">
             </div>
         </div>
     </form>

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

@@ -24,23 +24,32 @@
                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>业务归属:</label>
-                            <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>
                         </div>
                         <div class="customize-form-group">
                             <label>任务类型:</label>
-                            <input type="text" class="styled-input" name="taskType" autocomplete="off"/>
+                            <select name="taskType"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="表单任务">表单任务</option>
+                                <option value="触达任务">触达任务</option>
+                                <option value="外呼任务">外呼任务</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>患者姓名:</label>
                             <input type="text" class="styled-input" name="patientName" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
+                        <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                            <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
+                            <input type="text" class="time-input time-input2" name="createTime" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
+                        <div class="customize-form-group select-time">
                             <label>完成时间:</label>
-                            <input type="text" class="styled-input" name="completeTime" autocomplete="off"/>
+                            <input type="text" class="time-input time-input2" name="completeTime" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>跟进人:</label>
@@ -50,13 +59,17 @@
                             <label>门店:</label>
                             <input type="text" class="styled-input" name="store" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>连锁:</label>
-                            <input type="text" class="styled-input" name="chain" autocomplete="off"/>
-                        </div>
+
                         <div class="customize-form-group">
                             <label>状态:</label>
-                            <input type="text" class="styled-input" name="status" autocomplete="off"/>
+                            <select name="status"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="已创建">已创建</option>
+                                <option value="待执行">待执行</option>
+                                <option value="已完成">已完成</option>
+                                <option value="已取消">已取消</option>
+                                <option value="未完成">未完成</option>
+                            </select>
                         </div>
                     </div>
                 </form>
@@ -72,12 +85,12 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">-->
+<!--                    <i class="fa fa-upload"></i> 导入-->
+<!--                </a>-->
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -9,42 +9,42 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>业务归属:</label>
-                        <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>任务类型:</label>
-                        <input name="taskType" placeholder="任务类型" th:value="${taskType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>患者姓名:</label>
-                        <input name="patientName" placeholder="患者姓名" th:value="${patientName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>完成时间:</label>
-                        <input name="completeTime" placeholder="完成时间" th:value="${completeTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>跟进人:</label>
-                        <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店:</label>
-                        <input name="store" placeholder="门店" th:value="${store}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>连锁:</label>
-                        <input name="chain" placeholder="连锁" th:value="${chain}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>状态:</label>
-                        <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>业务归属:</label>
+                <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>任务类型:</label>
+                <input name="taskType" placeholder="任务类型" th:value="${taskType}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>患者姓名:</label>
+                <input name="patientName" placeholder="患者姓名" th:value="${patientName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>创建时间:</label>
+                <input name="createTime" placeholder="创建时间" th:value="${createTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>完成时间:</label>
+                <input name="completeTime" placeholder="完成时间" th:value="${completeTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>跟进人:</label>
+                <input name="follower" placeholder="跟进人" th:value="${follower}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>门店:</label>
+                <input name="store" placeholder="门店" th:value="${store}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>连锁:</label>
+                <input name="chain" placeholder="连锁" th:value="${chain}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text" disabled="true">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>连锁ID:</label>
-                <input name="chainId" placeholder="连锁ID"  id="chainId" class="styled-input" type="text">
+                <input name="chainId" placeholder="连锁ID"  id="chainId" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>连锁名称:</label>
@@ -28,9 +28,9 @@
                 <label>任务名称:</label>
                 <input name="taskName" placeholder="任务名称"  id="taskName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>质检时间:</label>
-                <input name="inspectionTime" placeholder="质检时间"  id="inspectionTime" class="styled-input" type="text">
+                <input name="inspectionTime" placeholder="质检时间"  id="inspectionTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>质检流程:</label>
@@ -38,19 +38,15 @@
             </div>
             <div class="customize-form-group">
                 <label>质检评分:</label>
-                <input name="inspectionScore" placeholder="质检评分"  id="inspectionScore" class="styled-input" type="text">
+                <input name="inspectionScore" placeholder="质检评分"  id="inspectionScore" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>质检状态:</label>
                 <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消"  id="inspectionStatus" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间"  id="updatedAt" class="styled-input" type="text">
+                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>连锁ID:</label>
-                <input name="chainId" placeholder="连锁ID" th:value="${chainId}" class="styled-input" type="text">
+                <input name="chainId" placeholder="连锁ID" th:value="${chainId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>连锁名称:</label>
@@ -45,13 +45,13 @@
                 <label>质检状态:</label>
                 <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="time-input time-input2" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -24,15 +24,11 @@
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>连锁ID:</label>
-                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="query" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainId" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>连锁id:</label>
-                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainName" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店id:</label>
-                            <input type="text" class="styled-input" placeholder="请输入连锁ID" name="storeName" autocomplete="off"/>
+                            <label>门店:</label>
+                            <input type="text" class="styled-input" placeholder="请输入连锁门店" name="storeName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>质检状态:</label>
@@ -45,9 +41,9 @@
                         </div>
                         <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+                            <input type="text" class="time-input time-input2" id="beginTime" placeholder="开始时间" name="beginTime"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
+                            <input type="text" class="time-input time-input2" id="endTime" placeholder="结束时间" name="endTime"/>
                         </div>
                         <div class="customize-form-group">
                             <label>分数范围:</label>

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

@@ -9,50 +9,50 @@
 
         <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="chainId" placeholder="连锁ID" th:value="${chainId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>连锁名称:</label>
-                        <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>质检用户:</label>
-                        <input name="inspectionUser" placeholder="质检用户" th:value="${inspectionUser}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>任务名称:</label>
-                        <input name="taskName" placeholder="任务名称" th:value="${taskName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>质检时间:</label>
-                        <input name="inspectionTime" placeholder="质检时间" th:value="${inspectionTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>质检流程:</label>
-                        <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求" th:value="${inspectionProcess}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>质检评分:</label>
-                        <input name="inspectionScore" placeholder="质检评分" th:value="${inspectionScore}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>质检状态:</label>
-                        <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>连锁ID:</label>
+                <input name="chainId" placeholder="连锁ID" th:value="${chainId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>连锁名称:</label>
+                <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>质检用户:</label>
+                <input name="inspectionUser" placeholder="质检用户" th:value="${inspectionUser}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>任务名称:</label>
+                <input name="taskName" placeholder="任务名称" th:value="${taskName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>质检时间:</label>
+                <input name="inspectionTime" placeholder="质检时间" th:value="${inspectionTime}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>质检流程:</label>
+                <input name="inspectionProcess" placeholder="质检流程，用于存储详细的质检步骤和要求" th:value="${inspectionProcess}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>质检评分:</label>
+                <input name="inspectionScore" placeholder="质检评分" th:value="${inspectionScore}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>质检状态:</label>
+                <input name="inspectionStatus" placeholder="质检状态：待质检，质检中，已质检，已取消" th:value="${inspectionStatus}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建时间:</label>
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="time-input time-input2" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text">
+                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>业务归属:</label>
@@ -18,11 +18,11 @@
             </div>
             <div class="customize-form-group">
                 <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text">
+                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="text">
+                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="number" >
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
@@ -30,20 +30,17 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+
+                    <option value="启用">启用</option>
+                    <option value="停用">停用</option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新人:</label>
-                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="time-input time-input2" type="text">
             </div>
+
         </div>
     </form>
 </div>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>业务归属:</label>
@@ -19,27 +19,27 @@
             </div>
             <div class="customize-form-group">
                 <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
+                <input name="status" placeholder="启用，停用" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>

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

@@ -21,16 +21,27 @@
                     </div>
                 </div>
                 <form id="SDtpYypzCallWord-form" class="customize-search-form">
-<div class="customize-form-group-container">
+                    <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>分类:</label>
-                                <select name="category"  class="styled-input">
+                            <label>状态:</label>
+                                <select name="status"  class="styled-input">
                                     <option value="">全部</option>
-                                    <option value="整体">整体</option>
-                                    <option value="医学前沿">单项</option>
+                                    <option value="启用">启用</option>
+                                    <option value="停用">停用</option>
                                 </select>
-                            </div>
+                        </div>
+
+
+                        <div class="customize-form-group">
+                            <label>药品:</label>
+                            <input type="text" class="styled-input" placeholder="请输入药品" name="drug" autocomplete="off"/>
+                        </div>
+                        <div class="customize-form-group">
+                            <label>模板名称:</label>
+                            <input type="text" class="styled-input" placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
+                        </div>
                     </div>
+
                 </form>
             </div>
 

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

@@ -9,42 +9,42 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>药品:</label>
-                        <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>业务归属:</label>
-                        <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>模板名称:</label>
-                        <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>模版ID:</label>
-                        <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建人:</label>
-                        <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>状态：</label>
-                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新人:</label>
-                        <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>药品:</label>
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>业务归属:</label>
+                <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>模板名称:</label>
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>模版ID:</label>
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="启用，停用" th:value="${status}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>创建时间:</label>
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>更新人:</label>
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -8,46 +8,48 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form id="form-SDtpYypzFaqManagement-add" class="customize-search-form">
         <div class="customize-form-group-container">
-            <div class="customize-form-group">
-                <label>问答ID:</label>
-                <input name="questionAnswerId" placeholder="问答ID"  id="questionAnswerId" class="styled-input" type="text">
-            </div>
+<!--            <div class="customize-form-group">-->
+<!--                <label>问答ID:</label>-->
+<!--                <input name="questionAnswerId" placeholder="问答ID"  id="questionAnswerId" class="styled-input" type="text">-->
+<!--            </div>-->
             <div class="customize-form-group">
                 <label>问答类型:</label>
-                <input name="questionAnswerType" placeholder="问答类型"  id="questionAnswerType" class="styled-input" type="text">
+                <select name="questionAnswerType"  class="styled-input">
+                    <option value="注射">注射</option>
+                    <option value="口服">口服</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>问答摘要:</label>
-                <input name="summary" placeholder="问答摘要"  id="summary" class="styled-input" type="text">
+                <input name="summary" placeholder="问答摘要"  id="summary" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>问题内容:</label>
-                <input name="questionContent" placeholder="问题内容"  id="questionContent" class="styled-input" type="text">
+                <input name="questionContent" placeholder="问题内容"  id="questionContent" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>回答内容:</label>
-                <input name="answerContent" placeholder="回答内容"  id="answerContent" class="styled-input" type="text">
+                <input name="answerContent" placeholder="回答内容"  id="answerContent" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>适用药品:</label>
-                <input name="applicableDrugs" placeholder="适用药品，可以存储多个药品，用逗号分隔"  id="applicableDrugs" class="styled-input" type="text">
+                <select name="applicableDrugs"  class="styled-input">
+                    <option value="中药">中药</option>
+                    <option value="西药">西药</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>排序权重:</label>
-                <input name="sortWeight" placeholder="排序权重"  id="sortWeight" class="styled-input" type="text">
+                <input name="sortWeight" placeholder="排序权重"  id="sortWeight" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间"  id="lastEditTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后编辑人:</label>
-                <input name="lastEditor" placeholder="最后编辑人"  id="lastEditor" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="启用">启用</option>
+                    <option value="停用">停用</option>
+                </select>
             </div>
+
         </div>
     </form>
 </div>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>问答ID:</label>
-                <input name="questionAnswerId" placeholder="问答ID" th:value="${questionAnswerId}" class="styled-input" type="text">
+                <input name="questionAnswerId" placeholder="问答ID" th:value="${questionAnswerId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>问答类型:</label>
@@ -41,9 +41,9 @@
                 <label>状态</label>
                 <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>

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

@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <form id="SDtpYypzFaqManagement-form" class="customize-search-form">
-<div class="customize-form-group-container">
+                   <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>场景:</label>
                                 <select name="scene"  class="styled-input">
@@ -44,19 +44,18 @@
                         </div>
                         <div class="customize-form-group">
                             <label>适用药品</label>
-                                <select name="applicableDrugs"  class="styled-input">
-                                    <option value="">全部</option>
-                                    <option value="美式高锅">美式高锅</option>
-                                    <option value="储物箱">储物箱</option>
-                                    <option value="熟料袋">熟料袋(小号)</option>
-                                </select>
+                            <select name="applicableDrugs"  class="styled-input">
+                                <option value="">全部</option>
+                                <option value="中药">中药</option>
+                                <option value="西药">西药</option>
+                            </select>
                         </div>
                         <div class="customize-form-group">
                             <label>状态:</label>
                                 <select name="status"  class="styled-input">
                                     <option value="">全部</option>
                                     <option value="已启用">启用</option>
-                                    <option value="禁用">禁用</option>
+                                    <option value="停用">停用</option>
                                 </select>
                             </div>
                     </div>

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

@@ -9,46 +9,46 @@
 
         <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="questionAnswerId" placeholder="问答ID" th:value="${questionAnswerId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>问答类型:</label>
-                        <input name="questionAnswerType" placeholder="问答类型" th:value="${questionAnswerType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>问答摘要:</label>
-                        <input name="summary" placeholder="问答摘要" th:value="${summary}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>问题内容:</label>
-                        <input name="questionContent" placeholder="问题内容" th:value="${questionContent}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>回答内容:</label>
-                        <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">
-                    </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>
-                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑时间:</label>
-                        <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑人:</label>
-                        <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>问答ID:</label>
+                <input name="questionAnswerId" placeholder="问答ID" th:value="${questionAnswerId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>问答类型:</label>
+                <input name="questionAnswerType" placeholder="问答类型" th:value="${questionAnswerType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>问答摘要:</label>
+                <input name="summary" placeholder="问答摘要" th:value="${summary}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>问题内容:</label>
+                <input name="questionContent" placeholder="问题内容" th:value="${questionContent}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>回答内容:</label>
+                <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">
+            </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>
+                <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>最后编辑时间:</label>
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>最后编辑人:</label>
+                <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text">
+                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>业务归属:</label>
@@ -18,11 +18,11 @@
             </div>
             <div class="customize-form-group">
                 <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text">
+                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="text">
+                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
@@ -30,20 +30,25 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="">全部</option>
+                    <option value="已启用">已启用</option>
+                    <option value="已停用">已停用</option>
+                    <option value="已创建">已创建</option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新人:</label>
-                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="time-input time-input2" type="text">
             </div>
+<!--            <div class="customize-form-group select-time">-->
+<!--                <label>更新时间:</label>-->
+<!--                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="time-input time-input2" type="text">-->
+<!--            </div>-->
+<!--            <div class="customize-form-group">-->
+<!--                <label>更新人:</label>-->
+<!--                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">-->
+<!--            </div>-->
         </div>
     </form>
 </div>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>业务归属:</label>
@@ -19,27 +19,27 @@
             </div>
             <div class="customize-form-group">
                 <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
+                <input name="status" placeholder="状态：已启用,已停用,已创建" th:value="${status}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>

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

@@ -9,42 +9,42 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>药品:</label>
-                        <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>业务归属:</label>
-                        <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>模板名称:</label>
-                        <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>模版ID:</label>
-                        <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建人:</label>
-                        <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>状态:</label>
-                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新人:</label>
-                        <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>药品:</label>
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>业务归属:</label>
+                <input name="businessBelonging" placeholder="业务归属" th:value="${businessBelonging}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>模板名称:</label>
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>模版ID:</label>
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="状态：已启用,已停用,已创建" th:value="${status}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>创建时间:</label>
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>更新人:</label>
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,24 +10,32 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text">
+                <input name="drug" placeholder="药品"  id="drug" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>事件标签:</label>
-                <input name="eventTag" placeholder="事件标签"  id="eventTag" class="styled-input" type="text">
+                <select name="eventTag"  class="styled-input">
+                    <option value="普通模版">普通模版</option>
+                    <option value="销售订单完成登记">销售订单完成登记</option>
+                    <option value="进入慈善援助">进入慈善援助</option>
+                </select>
             </div>
             <div class="customize-form-group">
-                <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="text">
+                <label>任务数:</label>
+                <select name="taskCount"  class="styled-input">
+                    <option value="单任务">单任务</option>
+                    <option value="多任务">多任务</option>
+                </select>
             </div>
             <div class="customize-form-group">
-                <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text">
+                <label>模版ID:</label>
+                <input name="templateId" placeholder="模版ID"  id="templateId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
-                <label>任务数:</label>
-                <input name="taskCount" placeholder="任务数"  id="taskCount" class="styled-input" type="text">
+                <label>模板名称:</label>
+                <input name="templateName" placeholder="模板名称"  id="templateName" class="styled-input" type="text" required>
             </div>
+
             <div class="customize-form-group">
                 <label>业务域:</label>
                 <input name="businessDomain" placeholder="业务域"  id="businessDomain" class="styled-input" type="text">
@@ -36,22 +44,19 @@
                 <label>创建人:</label>
                 <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>更新人:</label>
-                <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
-            </div>
+
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="启用">启用</option>
+                    <option value="停用">停用</option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="time-input time-input2" type="text">
             </div>
+
         </div>
     </form>
 </div>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>药品:</label>
-                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>事件标签:</label>
@@ -19,11 +19,11 @@
             </div>
             <div class="customize-form-group">
                 <label>模版ID:</label>
-                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>模板名称:</label>
-                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>任务数:</label>
@@ -35,7 +35,7 @@
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>
@@ -47,11 +47,11 @@
             </div>
             <div class="customize-form-group">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input2 time-input" type="text">
             </div>
         </div>
     </form>

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

@@ -22,13 +22,13 @@
                 </div>
                 <form id="SDtpYypzFollowUpTemplate-form" class="customize-search-form">
 <div class="customize-form-group-container">
-                        <div class="customize-form-group">
-                            <label>关联药品:</label>
-                            <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
-                        </div>
+<!--                        <div class="customize-form-group">-->
+<!--                            <label>关联药品:</label>-->
+<!--                            <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>-->
+<!--                        </div>-->
                         <div class="customize-form-group">
                             <label>药品:</label>
-                            <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
+                            <input type="text" class="styled-input" placeholder="请输入药品名" name="drug" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>模板名称:</label>
@@ -49,7 +49,7 @@
                         </div>
                         <div class="customize-form-group">
                             <label>任务数:</label>
-                                <select name="taskNumber"  class="styled-input">
+                                <select name="taskCount"  class="styled-input">
                                     <option value="">全部</option>
                                     <option value="单任务">单任务</option>
                                     <option value="多任务">多任务</option>

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

@@ -9,50 +9,50 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                        <label>药品:</label>
-                        <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>事件标签:</label>
-                        <input name="eventTag" placeholder="事件标签" th:value="${eventTag}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>模版ID:</label>
-                        <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>模板名称:</label>
-                        <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>任务数:</label>
-                        <input name="taskCount" placeholder="任务数" th:value="${taskCount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>业务域:</label>
-                        <input name="businessDomain" placeholder="业务域" th:value="${businessDomain}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>创建人:</label>
-                        <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>更新人:</label>
-                        <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>状态:</label>
-                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>创建时间:</label>
-                        <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                        <label>更新时间:</label>
-                        <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>药品:</label>
+                <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>事件标签:</label>
+                <input name="eventTag" placeholder="事件标签" th:value="${eventTag}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>模版ID:</label>
+                <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>模板名称:</label>
+                <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>任务数:</label>
+                <input name="taskCount" placeholder="任务数" th:value="${taskCount}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>业务域:</label>
+                <input name="businessDomain" placeholder="业务域" th:value="${businessDomain}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>更新人:</label>
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>创建时间:</label>
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input2 time-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,19 +10,19 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>话术ID:</label>
-                <input name="scriptId" placeholder="话术ID"  id="scriptId" class="styled-input" type="text">
+                <input name="scriptId" placeholder="话术ID"  id="scriptId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>话术主题:</label>
-                <input name="scriptTheme" placeholder="话术主题"  id="scriptTheme" class="styled-input" type="text">
+                <input name="scriptTheme" placeholder="话术主题"  id="scriptTheme" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>话术摘要:</label>
-                <input name="scriptSummary" placeholder="话术摘要"  id="scriptSummary" class="styled-input" type="text">
+                <input name="scriptSummary" placeholder="话术摘要"  id="scriptSummary" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>话术内容:</label>
-                <input name="scriptContent" placeholder="话术内容"  id="scriptContent" class="styled-input" type="text">
+                <input name="scriptContent" placeholder="话术内容"  id="scriptContent" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>关键词:</label>
@@ -34,23 +34,20 @@
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>
-                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后操作时间:</label>
-                <input name="lastOperationTime" placeholder="最后操作时间"  id="lastOperationTime" class="styled-input" type="text">
+                <select name="status"  class="styled-input">
+                    <option value="启用">启用</option>
+                    <option value="停用">停用</option>
+                </select>
             </div>
+
+
             <div class="customize-form-group">
-                <label>最后操作人:</label>
-                <input name="lastOperator" placeholder="最后操作人"  id="lastOperator" class="styled-input" type="text">
+                <label>话术主副题ID:</label>
+                <input name="themeId" placeholder="话术主副题ID"  id="themeId" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
-                <label>话术主题ID:</label>
-                <input name="themeId" placeholder="话术主题ID"  id="themeId" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>话术主题:</label>
-                <input name="theme" placeholder="话术主题"  id="theme" class="styled-input" type="text">
+                <label>话术主副题:</label>
+                <input name="theme" placeholder="话术主副题"  id="theme" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>适用药品类型:</label>
@@ -64,14 +61,6 @@
                 <label>任务主题:</label>
                 <input name="taskTheme" placeholder="任务主题"  id="taskTheme" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
-                <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间"  id="lastEditTime" class="styled-input" type="text">
-            </div>
-            <div class="customize-form-group">
-                <label>最后编辑人:</label>
-                <input name="lastEditor" placeholder="最后编辑人"  id="lastEditor" class="styled-input" type="text">
-            </div>
         </div>
     </form>
 </div>

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

@@ -11,19 +11,19 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>话术ID:</label>
-                <input name="scriptId" placeholder="话术ID" th:value="${scriptId}" class="styled-input" type="text">
+                <input name="scriptId" placeholder="话术ID" th:value="${scriptId}" class="styled-input" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>话术主题:</label>
-                <input name="scriptTheme" placeholder="话术主题" th:value="${scriptTheme}" class="styled-input" type="text">
+                <input name="scriptTheme" placeholder="话术主题" th:value="${scriptTheme}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>话术摘要:</label>
-                <input name="scriptSummary" placeholder="话术摘要" th:value="${scriptSummary}" class="styled-input" type="text">
+                <input name="scriptSummary" placeholder="话术摘要" th:value="${scriptSummary}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>话术内容:</label>
-                <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text">
+                <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>关键词:</label>
@@ -37,21 +37,21 @@
                 <label>状态:</label>
                 <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后操作时间:</label>
-                <input name="lastOperationTime" placeholder="最后操作时间" th:value="${lastOperationTime}" class="styled-input" type="text">
+                <input name="lastOperationTime" placeholder="最后操作时间" th:value="${lastOperationTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后操作人:</label>
                 <input name="lastOperator" placeholder="最后操作人" th:value="${lastOperator}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>话术主题ID:</label>
-                <input name="themeId" placeholder="话术主题ID" th:value="${themeId}" class="styled-input" type="text">
+                <label>话术主副题ID:</label>
+                <input name="themeId" placeholder="话术主副题ID" th:value="${themeId}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
-                <label>话术主题:</label>
-                <input name="theme" placeholder="话术主题" th:value="${theme}" class="styled-input" type="text">
+                <label>话术主副主题:</label>
+                <input name="theme" placeholder="话术主副主题" th:value="${theme}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>适用药品类型:</label>
@@ -65,9 +65,9 @@
                 <label>任务主题:</label>
                 <input name="taskTheme" placeholder="任务主题" th:value="${taskTheme}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>最后编辑时间:</label>
-                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>最后编辑人:</label>

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

@@ -9,70 +9,70 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>话术ID:</label>
-                        <input name="scriptId" placeholder="话术ID" th:value="${scriptId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>话术主题:</label>
-                        <input name="scriptTheme" placeholder="话术主题" th:value="${scriptTheme}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>话术摘要:</label>
-                        <input name="scriptSummary" placeholder="话术摘要" th:value="${scriptSummary}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>话术内容:</label>
-                        <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>关键词:</label>
-                        <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔" th:value="${keywords}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>权重:</label>
-                        <input name="weight" placeholder="权重" th:value="${weight}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>状态:</label>
-                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后操作时间:</label>
-                        <input name="lastOperationTime" placeholder="最后操作时间" th:value="${lastOperationTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后操作人:</label>
-                        <input name="lastOperator" placeholder="最后操作人" th:value="${lastOperator}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>话术主题ID:</label>
-                        <input name="themeId" placeholder="话术主题ID" th:value="${themeId}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>话术主题:</label>
-                        <input name="theme" placeholder="话术主题" th:value="${theme}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>适用药品类型:</label>
-                        <input name="applicableDrugType" placeholder="适用药品类型" th:value="${applicableDrugType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>适用随访类型:</label>
-                        <input name="applicableFollowUpType" placeholder="适用随访类型" th:value="${applicableFollowUpType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>任务主题:</label>
-                        <input name="taskTheme" placeholder="任务主题" th:value="${taskTheme}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑时间:</label>
-                        <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>最后编辑人:</label>
-                        <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>话术ID:</label>
+                <input name="scriptId" placeholder="话术ID" th:value="${scriptId}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>话术主题:</label>
+                <input name="scriptTheme" placeholder="话术主题" th:value="${scriptTheme}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>话术摘要:</label>
+                <input name="scriptSummary" placeholder="话术摘要" th:value="${scriptSummary}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>话术内容:</label>
+                <input name="scriptContent" placeholder="话术内容" th:value="${scriptContent}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>关键词:</label>
+                <input name="keywords" placeholder="关键词，可以存储多个关键词，用逗号分隔" th:value="${keywords}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>权重:</label>
+                <input name="weight" placeholder="权重" th:value="${weight}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>状态:</label>
+                <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>最后操作时间:</label>
+                <input name="lastOperationTime" placeholder="最后操作时间" th:value="${lastOperationTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>最后操作人:</label>
+                <input name="lastOperator" placeholder="最后操作人" th:value="${lastOperator}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>话术主副题ID:</label>
+                <input name="themeId" placeholder="话术主副题ID" th:value="${themeId}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>话术主副主题:</label>
+                <input name="theme" placeholder="话术主副主题" th:value="${theme}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>适用药品类型:</label>
+                <input name="applicableDrugType" placeholder="适用药品类型" th:value="${applicableDrugType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>适用随访类型:</label>
+                <input name="applicableFollowUpType" placeholder="适用随访类型" th:value="${applicableFollowUpType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>任务主题:</label>
+                <input name="taskTheme" placeholder="任务主题" th:value="${taskTheme}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>最后编辑时间:</label>
+                <input name="lastEditTime" placeholder="最后编辑时间" th:value="${lastEditTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>最后编辑人:</label>
+                <input name="lastEditor" placeholder="最后编辑人" th:value="${lastEditor}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,11 +10,11 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>MDM编码:</label>
-                <input name="mdmCode" placeholder="MDM编码"  id="mdmCode" class="styled-input" type="text">
+                <input name="mdmCode" placeholder="MDM编码"  id="mdmCode" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品名:</label>
-                <input name="productName" placeholder="商品名"  id="productName" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名"  id="productName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>通用名:</label>
@@ -34,15 +34,18 @@
             </div>
             <div class="customize-form-group">
                 <label>是否弃用:</label>
-                <input name="isDeprecated" placeholder="是否弃用"  id="isDeprecated" class="styled-input" type="text">
+                <select name="isDeprecated"  class="styled-input">
+                    <option value="是">是</option>
+                    <option value="否">否</option>
+                </select>
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="styled-input" type="text">
+                <input name="createdAt" placeholder="创建时间"  id="createdAt" class="time-input2 time-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间"  id="updatedAt" class="styled-input" type="text">
+                <input name="updatedAt" placeholder="更新时间"  id="updatedAt" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -11,11 +11,11 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>MDM编码:</label>
-                <input name="mdmCode" placeholder="MDM编码" th:value="${mdmCode}" class="styled-input" type="text">
+                <input name="mdmCode" placeholder="MDM编码" th:value="${mdmCode}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>商品名:</label>
-                <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
+                <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>通用名:</label>
@@ -35,15 +35,15 @@
             </div>
             <div class="customize-form-group">
                 <label>是否弃用:</label>
-                <input name="isDeprecated" placeholder="是否弃用" th:value="${isDeprecated}" class="styled-input" type="text">
+                <input name="isDeprecated" placeholder="是或者否" th:value="${isDeprecated}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -9,42 +9,42 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>MDM编码:</label>
-                        <input name="mdmCode" placeholder="MDM编码" th:value="${mdmCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品名:</label>
-                        <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>通用名:</label>
-                        <input name="genericName" placeholder="通用名" th:value="${genericName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>规格:</label>
-                        <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>生产厂家:</label>
-                        <input name="manufacturer" placeholder="生产厂家" th:value="${manufacturer}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>产地:</label>
-                        <input name="origin" placeholder="产地" th:value="${origin}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>是否弃用:</label>
-                        <input name="isDeprecated" placeholder="是否弃用" th:value="${isDeprecated}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>MDM编码:</label>
+                <input name="mdmCode" placeholder="MDM编码" th:value="${mdmCode}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>商品名:</label>
+                <input name="productName" placeholder="商品名" th:value="${productName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>通用名:</label>
+                <input name="genericName" placeholder="通用名" th:value="${genericName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>规格:</label>
+                <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>生产厂家:</label>
+                <input name="manufacturer" placeholder="生产厂家" th:value="${manufacturer}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>产地:</label>
+                <input name="origin" placeholder="产地" th:value="${origin}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>是否弃用:</label>
+                <input name="isDeprecated" placeholder="是或者否" th:value="${isDeprecated}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建时间:</label>
+                <input name="createdAt" placeholder="创建时间" th:value="${createdAt}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedAt" placeholder="更新时间" th:value="${updatedAt}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -10,7 +10,7 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>标题:</label>
-                <input name="title" placeholder="标题"  id="title" class="styled-input" type="text">
+                <input name="title" placeholder="标题"  id="title" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>分类:</label>
@@ -32,17 +32,17 @@
                 <label>创建人:</label>
                 <input name="createdBy" placeholder="创建人"  id="createdBy" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间"  id="createdTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>
                 <input name="updatedBy" placeholder="更新人"  id="updatedBy" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="styled-input" type="text">
+                <input name="updatedTime" placeholder="更新时间"  id="updatedTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -11,7 +11,7 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>标题:</label>
-                <input name="title" placeholder="标题" th:value="${title}" class="styled-input" type="text">
+                <input name="title" placeholder="标题" th:value="${title}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>分类:</label>
@@ -31,19 +31,19 @@
             </div>
             <div class="customize-form-group">
                 <label>创建人:</label>
-                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="time-input time-input2" type="text" disabled="true">
             </div>
             <div class="customize-form-group">
                 <label>更新人:</label>
                 <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>更新时间:</label>
-                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <form id="SDtpZskcxFollowUpGuidance-form" class="customize-search-form">
-<div class="customize-form-group-container">
+                       <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>标题:</label>
                             <input type="text" class="styled-input" placeholder="请输入标题" name="title" autocomplete="off"/>
@@ -30,10 +30,10 @@
                             <label>分类:</label>
                                 <select name="category"  class="styled-input">
                                     <option value="">全部</option>
-                                    <option value="用药参考">用药参考</option>
-                                    <option value="医学前沿">医学前沿</option>
-                                    <option value="科研服务">科研服务</option>
-                                    <option value="临床指南">临床指南</option>
+                                    <option value="内分泌疾病">内分泌疾病</option>
+                                    <option value="呼吸系统疾病">呼吸系统疾病</option>
+                                    <option value="泌尿系统疾病">泌尿系统疾病</option>
+                                    <option value="精神心理疾病">精神心理疾病</option>
                                 </select>
                         </div>
                         <div class="customize-form-group">
@@ -62,9 +62,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
-                    <i class="fa fa-download"></i> 导出
-                </a>
+<!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">-->
+<!--                    <i class="fa fa-download"></i> 导出-->
+<!--                </a>-->
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">

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

@@ -9,42 +9,42 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>标题:</label>
-                        <input name="title" placeholder="标题" th:value="${title}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>分类:</label>
-                        <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>关联药品:</label>
-                        <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔" th:value="${associatedDrugs}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>关联疾病:</label>
-                        <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔" th:value="${associatedDiseases}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>疾病病程:</label>
-                        <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程" th:value="${diseaseCourse}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建人:</label>
-                        <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>创建时间:</label>
-                        <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新人:</label>
-                        <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>更新时间:</label>
-                        <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>标题:</label>
+                <input name="title" placeholder="标题" th:value="${title}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>分类:</label>
+                <input name="category" placeholder="分类" th:value="${category}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>关联药品:</label>
+                <input name="associatedDrugs" placeholder="关联药品，可以存储多个药品，用逗号分隔" th:value="${associatedDrugs}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>关联疾病:</label>
+                <input name="associatedDiseases" placeholder="关联疾病，可以存储多个疾病，用逗号分隔" th:value="${associatedDiseases}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>疾病病程:</label>
+                <input name="diseaseCourse" placeholder="疾病病程，用于描述疾病的进展过程" th:value="${diseaseCourse}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>创建人:</label>
+                <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>创建时间:</label>
+                <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="time-input time-input2" type="text" disabled="true">
+            </div>
+            <div class="customize-form-group">
+                <label>更新人:</label>
+                <input name="updatedBy" placeholder="更新人" th:value="${updatedBy}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>更新时间:</label>
+                <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>

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

@@ -23,8 +23,8 @@
                 <form id="SDtpZskcxPharmaceuticalShare-form" class="customize-search-form">
 <div class="customize-form-group-container">
                         <div class="customize-form-group">
-                            <label>药品:</label>
-                            <input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
+                            <label>文章标题:</label>
+                            <input type="text" class="styled-input"  placeholder="请输入文章标题字" name="articleTitle" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
                             <label>分类:</label>
@@ -94,9 +94,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'createdBy', title: '创建人', align: 'center' },
                     { field: 'createdDate', title: '创建日期', align: 'center' },
@@ -113,7 +111,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=""><i class="fa fa-edit"></i>查看</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";
@@ -131,7 +129,21 @@
         _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" );
+    }
 </script>
 </body>
 

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

@@ -46,7 +46,7 @@
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -54,6 +54,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SDtpZskcxPharmaceuticalShare-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "dtp/sdtpzskcxpharmaceuticalshare";
         if ($.validate.form()) {

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

@@ -85,9 +85,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'lastUpdateTime', title: '最后更新时间', align: 'center' },
                     { field: 'name', title: '名称', align: 'center' },

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

@@ -80,6 +80,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:RecipeRegister:edit')}]];

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

@@ -91,9 +91,9 @@
 <!--		            <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:cold:export">
-			            <i class="fa fa-download"></i> 导出
-			        </a>
+<!--		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:cold:export">-->
+<!--			            <i class="fa fa-download"></i> 导出-->
+<!--			        </a>-->
 		        </div>
 
 				<div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
@@ -105,6 +105,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:cold:edit')}]];
@@ -142,12 +143,16 @@
 		        sortName: "createTime",
 		        sortOrder: "desc",
 		        modalName: "配送单列表",
+				fitColumns: true,
+				striped: true,
+				autoRowHeight: true,
+				rowNumbers: true,
 				showFooter:true,  //是否显示表格底部区域。
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 				singleSelect: false, //是否仅允许选择一行
-            fixedColumns: true,
-            //fixedNumber: 3,
-            fixedRightNumber: 1,
+				fixedColumns: true,
+				//fixedNumber: 3,
+				fixedRightNumber: 1,
 		        columns: [{
 		            checkbox: true
 		        },

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

@@ -6,7 +6,7 @@
 <body>
 <div class="main-content">
     <form class="form-horizontal" id="form-server-edit" th:object="${cold}">
-        <h4 class="form-header h4">处方信息</h4>
+        <h4 class="form-header h4">配送信息</h4>
         <input type="hidden" id="id" name="id" th:value="${id}">
         <div class="row">
             <div class="col-sm-3">
@@ -43,7 +43,7 @@
                     <div class="col-sm-8">
                         <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
                             <option value="">请选择</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${storeName}"
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${storeName}"
                             ></option>
                         </select>
                     </div>
@@ -55,8 +55,8 @@
                 <div class="form-group">
                     <label class="col-sm-6 control-label">是否线上签收：</label>
                     <div class="col-sm-4">
-                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictLabel}==${prescriptionType}"
+                        <select name="isOnlineSignature" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${isOnlineSignature}"
                             ></option>
                         </select>
                     </div>
@@ -191,7 +191,7 @@
                     <label class="col-sm-4 control-label">付款顺序：</label>
                     <div class="col-sm-8">
                         <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${paymentSequence}"
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${paymentSequence}"
                             ></option>
                         </select>
                     </div>

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

@@ -31,8 +31,8 @@
 					</div>
 				</form>
 			</div>
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table"></table>
+			<div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
+				<table id="bootstrap-table" class="fixed-layout-table"></table>
 			</div>
 		</div>
 	</div>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('配送单据打印列表')" />
+	<th:block th:include="include :: header('药品名单')" />
 	<th:block th:include="include :: layout-latest-css" />
 	<th:block th:include="include :: ztree-css" />
 </head>
@@ -69,6 +69,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
@@ -111,9 +112,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-		        columns: [{
-		            checkbox: true
-		        },
+		        columns: [
 					{
 						field: "id",
 						title: "id",

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

@@ -31,8 +31,8 @@
 					</div>
 				</form>
 			</div>
-			<div class="col-sm-12 select-table table-striped">
-				<table id="bootstrap-table"></table>
+			<div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
+				<table id="bootstrap-table" class="fixed-layout-table"></table>
 			</div>
 		</div>
 	</div>

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

@@ -44,6 +44,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var viewFlag = [[${@permission.hasPermi('dtp:configInfo:list')}]];
@@ -79,7 +80,7 @@
 				singleSelect: false, //是否仅允许选择一行
             fixedColumns: true,
             //fixedNumber: 3,
-            fixedRightNumber: 1,
+            //fixedRightNumber: 1,
 		        columns: [
 					{
 						field: "id",

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

@@ -28,10 +28,10 @@
                         <label class="col-sm-1 control-label">业务归属：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <select name="sex" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}" >
-                                    <!--<option>所有</option>-->
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
-                                            th:selected="${dict.dictLabel} == ${gender}" ></option>
+                                <select name="businessBelonging" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_ywgs')}" >
+                                    <option>所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                            th:selected="${dict.dictLabel} == ${businessBelonging}" ></option>
                                 </select>
                                 <!--<input name="gender" placeholder="请输入性别" class="styled-input" type="text" maxlength="30" th:value="${gender}" required>-->
                             </div>
@@ -45,7 +45,10 @@
                         <label class="col-sm-1 control-label">任务主题：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="taskTheme" placeholder="请输入任务主题" class="styled-input" type="text" maxlength="30" th:value="${taskTheme}" required>
+                                <select name="taskTheme" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_rwzt')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+                                            th:selected="${dict.dictLabel} == ${taskTheme}"></option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -74,13 +77,13 @@
                         <label class="col-sm-1 control-label">年龄：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="age" placeholder="请输入年龄" class="styled-input" type="text" maxlength="30" th:value="${age}" required>
+                                <input name="age" placeholder="请输入年龄" class="styled-input" type="text" maxlength="30" th:value="${age}">
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">随访小结：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="followUpSummary" placeholder="随访小结" class="styled-input" type="text" maxlength="30" th:value="${followUpSummary}" required>
+                                <input name="followUpSummary" placeholder="随访小结" class="styled-input" type="text" maxlength="30" th:value="${followUpSummary}">
                             </div>
                         </div>
                     </div>
@@ -91,7 +94,7 @@
                         <label class="col-sm-1 control-label">疾病：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="disease" placeholder="请输入证件类型" class="styled-input" type="text" maxlength="30" th:value="${disease}" required>
+                                <input name="disease" placeholder="请输入证件类型" class="styled-input" type="text" maxlength="30" th:value="${disease}">
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">门店：</label>
@@ -156,14 +159,17 @@
                         <label class="col-sm-1 control-label">任务状态：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="taskStatus" placeholder="任务状态" class="styled-input" type="text" maxlength="30" th:value="${taskStatus}" required>
+                                <select name="taskStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrwzt')}" >
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel} == ${taskStatus}"></option>
+                                </select>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">最后外呼状态：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="lastOutboundStatus" placeholder="最后外呼状态"
-                                       class="styled-input" type="text" maxlength="30" th:value="${lastOutboundStatus}" required>
+                                <select name="lastOutboundStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_zhwhzt')}">
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel} == ${lastOutboundStatus}"></option>
+                                </select>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">更新时间：</label>

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

@@ -31,7 +31,7 @@
 							</div>
 							<div class="customize-form-group">
 								<label>预约日期:</label>
-								<input type="text" disabled="" class="styled-input time-input" id="t" placeholder="预约日期" name="appointmentDate"  required/>
+								<input type="text" class="styled-input time-input" id="t" placeholder="预约日期" name="appointmentDate"/>
 							</div>
 							<div class="customize-form-group">
 								<label>任务跟进人:</label>
@@ -44,47 +44,39 @@
 							</div>
 							<div class="customize-form-group">
 								<label>任务状态:</label>
-								<select name="flipStatus"  disabled="" class="styled-input" th:with="type=${@dict.getType('sys_up_yes_no')}" >
+								<select name="taskStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrwzt')}" >
 									<option value="">所有</option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 								</select>
 							</div>
 							<div class="customize-form-group">
 								<label>最后外呼状态:</label>
-								<select name="followUpStatus" class="styled-input" th:with="type=${@dict.getType('sys_follow_up_visit')}">
+								<select name="lastOutboundStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_zhwhzt')}">
 									<option value="">所有</option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 								</select>
 							</div>
-							<div class="customize-form-group">
-								<label>最后外呼标记:</label>
-									<select name="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>
-							</div>
-							<div class="customize-form-group">
-								<label>下次外呼时间:</label>
-								<input type="text" class="styled-input time-input" id="updateTime" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
-							</div>
+
 							<div class="customize-form-group">
 								<label>疾病:</label>
 								<input type="text"  class="styled-input" name="disease"/>
 							</div>
 							<div class="customize-form-group">
 								<label>随访小结:</label>
-								<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
+								<select name="followUpSummary" class="styled-input">
 									<option value="">所有</option>
-									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
+									<option value="待处理" >待处理</option>
+									<option value="已完成" >已完成</option>
+									<option value="已过期" >已过期</option>
 								</select>
 							</div>
 							<div class="customize-form-group">
 								<label>完成日期:</label>
-								<input type="text"  disabled="" class="styled-input time-input" id="a" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
+								<input type="text"   class="styled-input time-input" id="a" placeholder="更新时间" name="updateTime" th:value="${updateTime}"/>
 							</div>
 							<div class="customize-form-group">
 								<label>任务主题:</label>
-								<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
+								<select name="taskTheme" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_rwzt')}">
 									<option value="">所有</option>
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 								</select>
@@ -95,9 +87,10 @@
 							</div>
 							<div class="customize-form-group">
 								<label>业务归属:</label>
-								<select name="gender" class="styled-input" disabled="" th:with="type=${@dict.getType('sys_user_sex')}">
+								<select name="businessBelonging" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_ywgs')}" >
 									<option value="">所有</option>
-									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
+											></option>
 								</select>
 							</div>
 						</div>
@@ -131,6 +124,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];

health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignEdit.html

@@ -104,7 +104,9 @@
                         <label class="col-sm-1 control-label">患者分配状态：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="patientAssignmentStatus" placeholder="外呼次数" class="styled-input" type="text" maxlength="30" th:value="${patientAssignmentStatus}" required>
+                                <select name="patientAssignmentStatus" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_sfrw_hzfpzt')}" >
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel} == ${patientAssignmentStatus}"></option>
+                                </select>
                             </div>
                         </div>
                     </div>
@@ -116,19 +118,19 @@
                         <label class="col-sm-1 control-label">门店：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="storeName" placeholder="下次外呼次数" class="styled-input" type="text" maxlength="30" th:value="${storeName}" required>
+                                <input name="storeName" placeholder="门店" class="styled-input" type="text" maxlength="30" th:value="${storeName}" required>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">离职员工：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="terminatedEmployeeName" placeholder="任务状态" class="styled-input" type="text" maxlength="30" th:value="${terminatedEmployeeName}" required>
+                                <input name="terminatedEmployeeName" placeholder="离职员工" class="styled-input" type="text" maxlength="30" th:value="${terminatedEmployeeName}" required>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">离职员工手机号：</label>
                         <div class="col-sm-2" >
                             <div class="input-group">
-                                <input name="terminatedEmployeePhone" placeholder="最后外呼状态"
+                                <input name="terminatedEmployeePhone" placeholder="离职员工手机号"
                                        class="styled-input" type="text" maxlength="30" th:value="${terminatedEmployeePhone}" required>
                             </div>
                         </div>
@@ -136,7 +138,7 @@
                         <div class="col-sm-2" >
                             <div class="input-group">
                                 <input type="text" class="styled-input" id="terminatedEmployeeStore"
-                                       placeholder="更新时间" name="terminatedEmployeeStore" th:value="${terminatedEmployeeStore}" required/>
+                                       placeholder="离职员工门店" name="terminatedEmployeeStore" th:value="${terminatedEmployeeStore}" required/>
                             </div>
                         </div>
                     </div>

health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignList.html

@@ -72,6 +72,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];

health-admin/src/main/resources/templates/dtp/followUpEvaluation/followUpEvaluationList.html

@@ -29,10 +29,11 @@
 								<label>门店:</label>
 								<input type="text" class="styled-input" name="storeName"/>
 							</div>
-							<div class="customize-form-group">
+							<div class="customize-form-group select-time">
 								<label>评价日期:</label>
-								<input type="text" disabled="" class="styled-input time-input"
-									   placeholder="评价日期" name="evaluationDate"  required/>
+								<input type="text" class="time-input time-input2" id="beginTime" placeholder="开始时间" name="beginTime">
+								<span>-</span>
+								<input type="text" class="time-input time-input2" id="endTime" placeholder="结束时间" name="endTime">
 							</div>
 							<div class="customize-form-group">
 								<label>任务跟进人:</label>
@@ -69,6 +70,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];

health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingEdit.html

@@ -28,7 +28,7 @@
                             <label class="col-sm-1 control-label">患者手机号：</label>
                             <div class="col-sm-2">
                                 <div class="input-group">
-                                    <input name="patientPhone" placeholder="患者手机号" th:value="${patientPhone}" class="styled-input" type="text" maxlength="20" required>
+                                    <input name="patientPhone" placeholder="患者手机号" th:value="${patientPhone}" class="styled-input" type="number" maxlength="11" required>
                                 </div>
                             </div>
                         <label class="col-sm-1 control-label">性别：</label>
@@ -54,7 +54,9 @@
                         <label class="col-sm-1 control-label">问题类型：</label>
                         <div class="col-sm-2">
                             <div class="input-group">
-                                <input name="questionType" placeholder="问题类型" class="styled-input" th:value="${questionType}" type="text" maxlength="255" required>
+                                <select name="questionType" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_hzzx_wtlx')}" >
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel} == ${questionType}"></option>
+                                </select>
                             </div>
                         </div>
                         <label class="col-sm-1 control-label">咨询问题：</label>

health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingList.html

@@ -35,7 +35,10 @@
 							</div>
 							<div class="customize-form-group">
 								<label>问题类型:</label>
-								<input type="text"  class="styled-input" name="questionType"/>
+								<select name="questionType" class="styled-input" th:with="type=${@dict.getType('sys_select_dtp_hzzx_wtlx')}" >
+									<option value="">全部</option>
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+								</select>
 							</div>
 							<div class="customize-form-group">
 								<label>药品:</label>
@@ -72,6 +75,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('dtp:pmService:edit')}]];

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

@@ -69,6 +69,7 @@
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
@@ -105,12 +106,16 @@
 		        sortName: "createTime",
 		        sortOrder: "desc",
 		        modalName: "配送单据打印信息",
+				fitColumns: true,
+				striped: true,
+				autoRowHeight: true,
+				rowNumbers: true,
 				showFooter:true,  //是否显示表格底部区域。
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 				singleSelect: false, //是否仅允许选择一行
-            fixedColumns: true,
-            //fixedNumber: 3,
-            fixedRightNumber: 1,
+				fixedColumns: true,
+				//fixedNumber: 3,
+				fixedRightNumber: 1,
 		        columns: [{
 		            checkbox: true
 		        },

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

@@ -92,12 +92,14 @@
 				<div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: auto;">
 					<table id="bootstrap-table" class="fixed-layout-table"></table>
 				</div>
+
 			</div>
 		</div>
 	</div>
 
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
+	<th:block th:include="include :: bootstrap-table-fixed-columns-js" />
 	<th:block th:include="include :: ztree-js" />
 	<script th:inline="javascript">
 		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
@@ -132,15 +134,19 @@
 		        exportUrl: prefix + "/export",
 		        //importUrl: prefix + "/importData",
 		        importTemplateUrl: prefix + "/importTemplate",
-		        sortName: "createTime",
+		        sortName: "id",
 		        sortOrder: "desc",
 		        modalName: "处方登记信息",
+				fitColumns: true,
+				striped: true,
+				autoRowHeight: true,
+				rowNumbers: true,
 				showFooter:true,  //是否显示表格底部区域。
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 				singleSelect: false, //是否仅允许选择一行
-            fixedColumns: true,
-            //fixedNumber: 3,
-            fixedRightNumber: 1,
+				fixedColumns: true,
+				//fixedNumber: 3,
+				fixedRightNumber: 1,
 		        columns: [{
 		            checkbox: true
 		        },

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

@@ -16,13 +16,13 @@
                 <label>奖励类型:</label>
                 <input name="rewardType" placeholder="奖励类型"  id="rewardType" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>发生时间:</label>
-                <input name="occurrenceTime" placeholder="发生时间"  id="occurrenceTime" class="styled-input" type="text">
+                <input name="occurrenceTime" placeholder="发生时间"  id="occurrenceTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>服务包订单号:</label>
-                <input name="servicePackageOrderNumber" placeholder="服务包订单号"  id="servicePackageOrderNumber" class="styled-input" type="text">
+                <input name="servicePackageOrderNumber" placeholder="服务包订单号"  id="servicePackageOrderNumber" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>券核销订单号:</label>
@@ -42,11 +42,11 @@
             </div>
             <div class="customize-form-group">
                 <label>店员工号:</label>
-                <input name="staffNumber" placeholder="店员工号"  id="staffNumber" class="styled-input" type="text">
+                <input name="staffNumber" placeholder="店员工号"  id="staffNumber" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店员ID:</label>
-                <input name="staffID" placeholder="店员ID"  id="staffID" class="styled-input" type="text">
+                <input name="staffID" placeholder="店员ID"  id="staffID" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店员姓名:</label>
@@ -54,11 +54,11 @@
             </div>
             <div class="customize-form-group">
                 <label>合约ID:</label>
-                <input name="contractID" placeholder="合约ID"  id="contractID" class="styled-input" type="text">
+                <input name="contractID" placeholder="合约ID"  id="contractID" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>合约单ID:</label>
-                <input name="contractOrderID" placeholder="合约单ID"  id="contractOrderID" class="styled-input" type="text">
+                <input name="contractOrderID" placeholder="合约单ID"  id="contractOrderID" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>状态:</label>

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

@@ -17,9 +17,9 @@
                 <label>奖励类型:</label>
                 <input name="rewardType" placeholder="奖励类型" th:value="${rewardType}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>发生时间:</label>
-                <input name="occurrenceTime" placeholder="发生时间" th:value="${occurrenceTime}" class="styled-input" type="text">
+                <input name="occurrenceTime" placeholder="发生时间" th:value="${occurrenceTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>服务包订单号:</label>

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

@@ -17,9 +17,9 @@
                         <label>奖励类型:</label>
                         <input name="rewardType" placeholder="奖励类型" th:value="${rewardType}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                         <label>发生时间:</label>
-                        <input name="occurrenceTime" placeholder="发生时间" th:value="${occurrenceTime}" class="styled-input" type="text">
+                        <input name="occurrenceTime" placeholder="发生时间" th:value="${occurrenceTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                         <label>服务包订单号:</label>

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

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+ <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('服务包管理（服务包列表）新增')" />
@@ -44,9 +44,9 @@
                 <label>状态:</label>
                 <input name="status" placeholder="状态"  id="status" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="creationTime" placeholder="创建时间"  id="creationTime" class="styled-input" type="text">
+                <input name="creationTime" placeholder="创建时间"  id="creationTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -23,7 +23,7 @@
             </div>
             <div class="customize-form-group">
                 <label>价格:</label>
-                <input name="price" placeholder="价格" th:value="${price}" class="styled-input" type="text">
+                <input name="price" placeholder="价格" th:value="${price}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>商品类型:</label>
@@ -45,9 +45,9 @@
                 <label>状态:</label>
                 <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>创建时间:</label>
-                <input name="creationTime" placeholder="创建时间" th:value="${creationTime}" class="styled-input" type="text">
+                <input name="creationTime" placeholder="创建时间" th:value="${creationTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -23,7 +23,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>价格:</label>
-                        <input name="price" placeholder="价格" th:value="${price}" class="styled-input" type="text">
+                        <input name="price" placeholder="价格" th:value="${price}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>商品类型:</label>
@@ -31,7 +31,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>库存:</label>
-                        <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="text">
+                        <input name="stock" placeholder="库存" th:value="${stock}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>商品类目:</label>
@@ -45,9 +45,9 @@
                             <label>状态:</label>
                         <input name="status" placeholder="状态" th:value="${status}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>创建时间:</label>
-                        <input name="creationTime" placeholder="创建时间" th:value="${creationTime}" class="styled-input" type="text">
+                        <input name="creationTime" placeholder="创建时间" th:value="${creationTime}" class="time-input2 time-input" type="text">
                     </div>
         </div>
     </form>

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

@@ -24,9 +24,9 @@
                 <label>商品名称:</label>
                 <input name="productName" placeholder="商品名称"  id="productName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>订单金额:</label>

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

@@ -25,9 +25,9 @@
                 <label>商品名称:</label>
                 <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>订单金额:</label>
@@ -51,7 +51,7 @@
             </div>
             <div class="customize-form-group">
                 <label>下单手机号:</label>
-                <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
+                <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>下单门店:</label>

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

@@ -25,9 +25,9 @@
                             <label>商品名称:</label>
                         <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>下单时间:</label>
-                        <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
+                        <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>订单金额:</label>
@@ -47,11 +47,11 @@
                     </div>
                     <div class="customize-form-group">
                             <label>用户ID:</label>
-                        <input name="userId" placeholder="用户ID" th:value="${userId}" class="styled-input" type="text">
+                        <input name="userId" placeholder="用户ID" th:value="${userId}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>下单手机号:</label>
-                        <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
+                        <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>下单门店:</label>

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

@@ -24,9 +24,9 @@
                 <label>服务包名称:</label>
                 <input name="servicePackageName" placeholder="服务包名称"  id="servicePackageName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间"  id="orderTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>用户ID:</label>
@@ -52,9 +52,9 @@
                 <label>扫码提成员工姓名:</label>
                 <input name="scanningStaffName" placeholder="扫码提成员工姓名"  id="scanningStaffName" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>扫码时间:</label>
-                <input name="scanningTime" placeholder="扫码时间"  id="scanningTime" class="styled-input" type="text">
+                <input name="scanningTime" placeholder="扫码时间"  id="scanningTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -25,9 +25,9 @@
                 <label>服务包名称:</label>
                 <input name="servicePackageName" placeholder="服务包名称" th:value="${servicePackageName}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>下单时间:</label>
-                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
+                <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>用户ID:</label>
@@ -35,7 +35,7 @@
             </div>
             <div class="customize-form-group">
                 <label>下单手机号:</label>
-                <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
+                <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>订单状态:</label>
@@ -53,9 +53,9 @@
                 <label>扫码提成员工姓名:</label>
                 <input name="scanningStaffName" placeholder="扫码提成员工姓名" th:value="${scanningStaffName}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>扫码时间:</label>
-                <input name="scanningTime" placeholder="扫码时间" th:value="${scanningTime}" class="styled-input" type="text">
+                <input name="scanningTime" placeholder="扫码时间" th:value="${scanningTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

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

@@ -25,9 +25,9 @@
                             <label>服务包名称:</label>
                         <input name="servicePackageName" placeholder="服务包名称" th:value="${servicePackageName}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>下单时间:</label>
-                        <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="styled-input" type="text">
+                        <input name="orderTime" placeholder="下单时间" th:value="${orderTime}" class="time-input time-input2" type="text">
                     </div>
                     <div class="customize-form-group">
                             <label>用户ID:</label>
@@ -35,7 +35,7 @@
                     </div>
                     <div class="customize-form-group">
                             <label>下单手机号:</label>
-                        <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="text">
+                        <input name="orderingPhone" placeholder="下单手机号" th:value="${orderingPhone}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>订单状态:</label>
@@ -47,15 +47,15 @@
                     </div>
                     <div class="customize-form-group">
                             <label>扫码提成员工工号:</label>
-                        <input name="scanningStaffNumber" placeholder="扫码提成员工工号" th:value="${scanningStaffNumber}" class="styled-input" type="text">
+                        <input name="scanningStaffNumber" placeholder="扫码提成员工工号" th:value="${scanningStaffNumber}" class="styled-input" type="number">
                     </div>
                     <div class="customize-form-group">
                             <label>扫码提成员工姓名:</label>
                         <input name="scanningStaffName" placeholder="扫码提成员工姓名" th:value="${scanningStaffName}" class="styled-input" type="text">
                     </div>
-                    <div class="customize-form-group">
+                    <div class="customize-form-group select-time">
                             <label>扫码时间:</label>
-                        <input name="scanningTime" placeholder="扫码时间" th:value="${scanningTime}" class="styled-input" type="text">
+                        <input name="scanningTime" placeholder="扫码时间" th:value="${scanningTime}" class="time-input time-input2" type="text">
                     </div>
         </div>
     </form>

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

@@ -10,15 +10,18 @@
         <div class="customize-form-group-container">
             <div class="customize-form-group">
                 <label>调价单号:</label>
-                <input name="adjustmentSheetNo" placeholder="调价单号"  id="adjustmentSheetNo" class="styled-input" type="text">
+                <input name="adjustmentSheetNo" placeholder="调价单号"  id="adjustmentSheetNo" class="styled-input" type="number" required>
             </div>
             <div class="customize-form-group">
                 <label>调价单名称:</label>
-                <input name="adjustmentSheetName" placeholder="调价单名称"  id="adjustmentSheetName" class="styled-input" type="text">
+                <input name="adjustmentSheetName" placeholder="调价单名称"  id="adjustmentSheetName" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>调价类型:</label>
-                <input name="adjustmentType" placeholder="调价类型"  id="adjustmentType" class="styled-input" type="text">
+                <select name="adjustmentType"  class="styled-input">
+                    <option value="上调">上调</option>
+                    <option value="下调">下调</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>调价原因:</label>
@@ -26,7 +29,11 @@
             </div>
             <div class="customize-form-group">
                 <label>渠道:</label>
-                <input name="channel" placeholder="渠道"  id="channel" class="styled-input" type="text">
+                <select name="channel"  class="styled-input">
+                    <option value="线上">线上</option>
+                    <option value="线下">线下</option>
+                    <option value="第三方平台">第三方平台</option>
+                </select>
             </div>
             <div class="customize-form-group">
                 <label>价格类型:</label>
@@ -42,15 +49,15 @@
             </div>
             <div class="customize-form-group">
                 <label>门店编码:</label>
-                <input name="storeCode" placeholder="门店编码"  id="storeCode" class="styled-input" type="text">
+                <input name="storeCode" placeholder="门店编码"  id="storeCode" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>要求生效时间:</label>
-                <input name="effectiveTime" placeholder="要求生效时间"  id="effectiveTime" class="styled-input" type="text">
+                <input name="effectiveTime" placeholder="要求生效时间"  id="effectiveTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生成通知时间:</label>
-                <input name="notificationTime" placeholder="生成通知时间"  id="notificationTime" class="styled-input" type="text">
+                <input name="notificationTime" placeholder="生成通知时间"  id="notificationTime" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>制单人:</label>

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

@@ -11,11 +11,11 @@
             <input type="hidden" id="id" name="id" th:value="${id}">
             <div class="customize-form-group">
                 <label>调价单号:</label>
-                <input name="adjustmentSheetNo" placeholder="调价单号" th:value="${adjustmentSheetNo}" class="styled-input" type="text">
+                <input name="adjustmentSheetNo" placeholder="调价单号" th:value="${adjustmentSheetNo}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调价单名称:</label>
-                <input name="adjustmentSheetName" placeholder="调价单名称" th:value="${adjustmentSheetName}" class="styled-input" type="text">
+                <input name="adjustmentSheetName" placeholder="调价单名称" th:value="${adjustmentSheetName}" class="styled-input" type="text" required>
             </div>
             <div class="customize-form-group">
                 <label>调价类型:</label>
@@ -45,13 +45,13 @@
                 <label>门店编码:</label>
                 <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>要求生效时间:</label>
-                <input name="effectiveTime" placeholder="要求生效时间" th:value="${effectiveTime}" class="styled-input" type="text">
+                <input name="effectiveTime" placeholder="要求生效时间" th:value="${effectiveTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生成通知时间:</label>
-                <input name="notificationTime" placeholder="生成通知时间" th:value="${notificationTime}" class="styled-input" type="text">
+                <input name="notificationTime" placeholder="生成通知时间" th:value="${notificationTime}" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>制单人:</label>

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

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

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

@@ -9,54 +9,54 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>调价单号:</label>
-                        <input name="adjustmentSheetNo" placeholder="调价单号" th:value="${adjustmentSheetNo}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调价单名称:</label>
-                        <input name="adjustmentSheetName" placeholder="调价单名称" th:value="${adjustmentSheetName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调价类型:</label>
-                        <input name="adjustmentType" placeholder="调价类型" th:value="${adjustmentType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调价原因:</label>
-                        <input name="adjustmentReason" placeholder="调价原因" th:value="${adjustmentReason}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>渠道:</label>
-                        <input name="channel" placeholder="渠道" th:value="${channel}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>价格类型:</label>
-                        <input name="priceType" placeholder="价格类型" th:value="${priceType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>连锁名称:</label>
-                        <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店编码:</label>
-                        <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>要求生效时间:</label>
-                        <input name="effectiveTime" placeholder="要求生效时间" th:value="${effectiveTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>生成通知时间:</label>
-                        <input name="notificationTime" placeholder="生成通知时间" th:value="${notificationTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>制单人:</label>
-                        <input name="createdUser" placeholder="制单人" th:value="${createdUser}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>调价单号:</label>
+                <input name="adjustmentSheetNo" placeholder="调价单号" th:value="${adjustmentSheetNo}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>调价单名称:</label>
+                <input name="adjustmentSheetName" placeholder="调价单名称" th:value="${adjustmentSheetName}" class="styled-input" type="text" required>
+            </div>
+            <div class="customize-form-group">
+                <label>调价类型:</label>
+                <input name="adjustmentType" placeholder="调价类型" th:value="${adjustmentType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>调价原因:</label>
+                <input name="adjustmentReason" placeholder="调价原因" th:value="${adjustmentReason}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>渠道:</label>
+                <input name="channel" placeholder="渠道" th:value="${channel}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>价格类型:</label>
+                <input name="priceType" placeholder="价格类型" th:value="${priceType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>连锁名称:</label>
+                <input name="chainName" placeholder="连锁名称" th:value="${chainName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店编码:</label>
+                <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>要求生效时间:</label>
+                <input name="effectiveTime" placeholder="要求生效时间" th:value="${effectiveTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>生成通知时间:</label>
+                <input name="notificationTime" placeholder="生成通知时间" th:value="${notificationTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>制单人:</label>
+                <input name="createdUser" placeholder="制单人" th:value="${createdUser}" class="styled-input" type="text">
+            </div>
         </div>
     </form>
 </div>

health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationAdd.html

@@ -12,9 +12,9 @@
                 <label>序号:</label>
                 <input name="sequenceNumber" placeholder="序号"  id="sequenceNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>期间:</label>
-                <input name="period" placeholder="期间"  id="period" class="styled-input" type="text">
+                <input name="period" placeholder="期间"  id="period" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>商品编码:</label>
@@ -50,123 +50,123 @@
             </div>
             <div class="customize-form-group">
                 <label>期初库存数量:</label>
-                <input name="initialStockQuantity" placeholder="期初库存数量"  id="initialStockQuantity" class="styled-input" type="text">
+                <input name="initialStockQuantity" placeholder="期初库存数量"  id="initialStockQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初库存成本金额/元:</label>
-                <input name="initialStockCost" placeholder="期初库存成本金额/元"  id="initialStockCost" class="styled-input" type="text">
+                <input name="initialStockCost" placeholder="期初库存成本金额/元"  id="initialStockCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>大仓配送数量:</label>
-                <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量"  id="warehouseDeliveryQuantity" class="styled-input" type="text">
+                <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量"  id="warehouseDeliveryQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>大仓配送成本金额/元:</label>
-                <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元"  id="warehouseDeliveryCost" class="styled-input" type="text">
+                <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元"  id="warehouseDeliveryCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调入配送数量:</label>
-                <input name="transferInQuantity" placeholder="调拨调入配送数量"  id="transferInQuantity" class="styled-input" type="text">
+                <input name="transferInQuantity" placeholder="调拨调入配送数量"  id="transferInQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调入配送成本金额/元:</label>
-                <input name="transferInCost" placeholder="调拨调入配送成本金额/元"  id="transferInCost" class="styled-input" type="text">
+                <input name="transferInCost" placeholder="调拨调入配送成本金额/元"  id="transferInCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采收货数量:</label>
-                <input name="storeReceiptQuantity" placeholder="店采收货数量"  id="storeReceiptQuantity" class="styled-input" type="text">
+                <input name="storeReceiptQuantity" placeholder="店采收货数量"  id="storeReceiptQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采收货成本金额:</label>
-                <input name="storeReceiptCost" placeholder="店采收货成本金额"  id="storeReceiptCost" class="styled-input" type="text">
+                <input name="storeReceiptCost" placeholder="店采收货成本金额"  id="storeReceiptCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采退货数量:</label>
-                <input name="storeReturnQuantity" placeholder="店采退货数量"  id="storeReturnQuantity" class="styled-input" type="text">
+                <input name="storeReturnQuantity" placeholder="店采退货数量"  id="storeReturnQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采退货金额/元:</label>
-                <input name="storeReturnAmount" placeholder="店采退货金额/元"  id="storeReturnAmount" class="styled-input" type="text">
+                <input name="storeReturnAmount" placeholder="店采退货金额/元"  id="storeReturnAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调出数量:</label>
-                <input name="transferOutQuantity" placeholder="调拨调出数量"  id="transferOutQuantity" class="styled-input" type="text">
+                <input name="transferOutQuantity" placeholder="调拨调出数量"  id="transferOutQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调出成本金额/元:</label>
-                <input name="transferOutCost" placeholder="调拨调出成本金额/元"  id="transferOutCost" class="styled-input" type="text">
+                <input name="transferOutCost" placeholder="调拨调出成本金额/元"  id="transferOutCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>门店退仓数量:</label>
-                <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量"  id="storeReturnWarehouseQuantity" class="styled-input" type="text">
+                <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量"  id="storeReturnWarehouseQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>门店退仓成本金额/元:</label>
-                <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元"  id="storeReturnWarehouseCost" class="styled-input" type="text">
+                <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元"  id="storeReturnWarehouseCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售数量:</label>
-                <input name="offlineSalesQuantity" placeholder="线下销售数量"  id="offlineSalesQuantity" class="styled-input" type="text">
+                <input name="offlineSalesQuantity" placeholder="线下销售数量"  id="offlineSalesQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售成本金额/元:</label>
-                <input name="offlineSalesCost" placeholder="线下销售成本金额/元"  id="offlineSalesCost" class="styled-input" type="text">
+                <input name="offlineSalesCost" placeholder="线下销售成本金额/元"  id="offlineSalesCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售退货数量:</label>
-                <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量"  id="offlineSalesReturnQuantity" class="styled-input" type="text">
+                <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量"  id="offlineSalesReturnQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售退货金额/元:</label>
-                <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元"  id="offlineSalesReturnAmount" class="styled-input" type="text">
+                <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元"  id="offlineSalesReturnAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售数量:</label>
-                <input name="onlineSalesQuantity" placeholder="线上销售数量"  id="onlineSalesQuantity" class="styled-input" type="text">
+                <input name="onlineSalesQuantity" placeholder="线上销售数量"  id="onlineSalesQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售成本金额/元:</label>
-                <input name="onlineSalesCost" placeholder="线上销售成本金额/元"  id="onlineSalesCost" class="styled-input" type="text">
+                <input name="onlineSalesCost" placeholder="线上销售成本金额/元"  id="onlineSalesCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售退货数量:</label>
-                <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量"  id="onlineSalesReturnQuantity" class="styled-input" type="text">
+                <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量"  id="onlineSalesReturnQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售退货金额/元:</label>
-                <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元"  id="onlineSalesReturnAmount" class="styled-input" type="text">
+                <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元"  id="onlineSalesReturnAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报损数量:</label>
-                <input name="lossQuantity" placeholder="报损数量"  id="lossQuantity" class="styled-input" type="text">
+                <input name="lossQuantity" placeholder="报损数量"  id="lossQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报损成本金额:</label>
-                <input name="lossCost" placeholder="报损成本金额"  id="lossCost" class="styled-input" type="text">
+                <input name="lossCost" placeholder="报损成本金额"  id="lossCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报溢数量:</label>
-                <input name="gainQuantity" placeholder="报溢数量"  id="gainQuantity" class="styled-input" type="text">
+                <input name="gainQuantity" placeholder="报溢数量"  id="gainQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报溢成本金额/元:</label>
-                <input name="gainCost" placeholder="报溢成本金额/元"  id="gainCost" class="styled-input" type="text">
+                <input name="gainCost" placeholder="报溢成本金额/元"  id="gainCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期末库存数量:</label>
-                <input name="finalStockQuantity" placeholder="期末库存数量"  id="finalStockQuantity" class="styled-input" type="text">
+                <input name="finalStockQuantity" placeholder="期末库存数量"  id="finalStockQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期末库存成本金额/元:</label>
-                <input name="finalStockCost" placeholder="期末库存成本金额/元"  id="finalStockCost" class="styled-input" type="text">
+                <input name="finalStockCost" placeholder="期末库存成本金额/元"  id="finalStockCost" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初导入库存数量:</label>
-                <input name="initialImportQuantity" placeholder="期初导入库存数量"  id="initialImportQuantity" class="styled-input" type="text">
+                <input name="initialImportQuantity" placeholder="期初导入库存数量"  id="initialImportQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初导入库存成本金额/元:</label>
-                <input name="initialImportCost" placeholder="期初导入库存成本金额/元"  id="initialImportCost" class="styled-input" type="text">
+                <input name="initialImportCost" placeholder="期初导入库存成本金额/元"  id="initialImportCost" class="styled-input" type="number">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationEdit.html

@@ -30,7 +30,7 @@
             </div>
             <div class="customize-form-group">
                 <label>单位:</label>
-                <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
+                <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>生产企业:</label>
@@ -50,123 +50,123 @@
             </div>
             <div class="customize-form-group">
                 <label>期初库存数量:</label>
-                <input name="initialStockQuantity" placeholder="期初库存数量" th:value="${initialStockQuantity}" class="styled-input" type="text">
+                <input name="initialStockQuantity" placeholder="期初库存数量" th:value="${initialStockQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初库存成本金额/元:</label>
-                <input name="initialStockCost" placeholder="期初库存成本金额/元" th:value="${initialStockCost}" class="styled-input" type="text">
+                <input name="initialStockCost" placeholder="期初库存成本金额/元" th:value="${initialStockCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>大仓配送数量:</label>
-                <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量" th:value="${warehouseDeliveryQuantity}" class="styled-input" type="text">
+                <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量" th:value="${warehouseDeliveryQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>大仓配送成本金额/元:</label>
-                <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元" th:value="${warehouseDeliveryCost}" class="styled-input" type="text">
+                <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元" th:value="${warehouseDeliveryCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调入配送数量:</label>
-                <input name="transferInQuantity" placeholder="调拨调入配送数量" th:value="${transferInQuantity}" class="styled-input" type="text">
+                <input name="transferInQuantity" placeholder="调拨调入配送数量" th:value="${transferInQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调入配送成本金额/元:</label>
-                <input name="transferInCost" placeholder="调拨调入配送成本金额/元" th:value="${transferInCost}" class="styled-input" type="text">
+                <input name="transferInCost" placeholder="调拨调入配送成本金额/元" th:value="${transferInCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采收货数量:</label>
-                <input name="storeReceiptQuantity" placeholder="店采收货数量" th:value="${storeReceiptQuantity}" class="styled-input" type="text">
+                <input name="storeReceiptQuantity" placeholder="店采收货数量" th:value="${storeReceiptQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采收货成本金额:</label>
-                <input name="storeReceiptCost" placeholder="店采收货成本金额" th:value="${storeReceiptCost}" class="styled-input" type="text">
+                <input name="storeReceiptCost" placeholder="店采收货成本金额" th:value="${storeReceiptCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采退货数量:</label>
-                <input name="storeReturnQuantity" placeholder="店采退货数量" th:value="${storeReturnQuantity}" class="styled-input" type="text">
+                <input name="storeReturnQuantity" placeholder="店采退货数量" th:value="${storeReturnQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>店采退货金额/元:</label>
-                <input name="storeReturnAmount" placeholder="店采退货金额/元" th:value="${storeReturnAmount}" class="styled-input" type="text">
+                <input name="storeReturnAmount" placeholder="店采退货金额/元" th:value="${storeReturnAmount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调出数量:</label>
-                <input name="transferOutQuantity" placeholder="调拨调出数量" th:value="${transferOutQuantity}" class="styled-input" type="text">
+                <input name="transferOutQuantity" placeholder="调拨调出数量" th:value="${transferOutQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>调拨调出成本金额/元:</label>
-                <input name="transferOutCost" placeholder="调拨调出成本金额/元" th:value="${transferOutCost}" class="styled-input" type="text">
+                <input name="transferOutCost" placeholder="调拨调出成本金额/元" th:value="${transferOutCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>门店退仓数量:</label>
-                <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量" th:value="${storeReturnWarehouseQuantity}" class="styled-input" type="text">
+                <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量" th:value="${storeReturnWarehouseQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>门店退仓成本金额/元:</label>
-                <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元" th:value="${storeReturnWarehouseCost}" class="styled-input" type="text">
+                <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元" th:value="${storeReturnWarehouseCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售数量:</label>
-                <input name="offlineSalesQuantity" placeholder="线下销售数量" th:value="${offlineSalesQuantity}" class="styled-input" type="text">
+                <input name="offlineSalesQuantity" placeholder="线下销售数量" th:value="${offlineSalesQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售成本金额/元:</label>
-                <input name="offlineSalesCost" placeholder="线下销售成本金额/元" th:value="${offlineSalesCost}" class="styled-input" type="text">
+                <input name="offlineSalesCost" placeholder="线下销售成本金额/元" th:value="${offlineSalesCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售退货数量:</label>
-                <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量" th:value="${offlineSalesReturnQuantity}" class="styled-input" type="text">
+                <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量" th:value="${offlineSalesReturnQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线下销售退货金额/元:</label>
-                <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元" th:value="${offlineSalesReturnAmount}" class="styled-input" type="text">
+                <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元" th:value="${offlineSalesReturnAmount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售数量:</label>
-                <input name="onlineSalesQuantity" placeholder="线上销售数量" th:value="${onlineSalesQuantity}" class="styled-input" type="text">
+                <input name="onlineSalesQuantity" placeholder="线上销售数量" th:value="${onlineSalesQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售成本金额/元:</label>
-                <input name="onlineSalesCost" placeholder="线上销售成本金额/元" th:value="${onlineSalesCost}" class="styled-input" type="text">
+                <input name="onlineSalesCost" placeholder="线上销售成本金额/元" th:value="${onlineSalesCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售退货数量:</label>
-                <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量" th:value="${onlineSalesReturnQuantity}" class="styled-input" type="text">
+                <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量" th:value="${onlineSalesReturnQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>线上销售退货金额/元:</label>
-                <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元" th:value="${onlineSalesReturnAmount}" class="styled-input" type="text">
+                <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元" th:value="${onlineSalesReturnAmount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报损数量:</label>
-                <input name="lossQuantity" placeholder="报损数量" th:value="${lossQuantity}" class="styled-input" type="text">
+                <input name="lossQuantity" placeholder="报损数量" th:value="${lossQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报损成本金额:</label>
-                <input name="lossCost" placeholder="报损成本金额" th:value="${lossCost}" class="styled-input" type="text">
+                <input name="lossCost" placeholder="报损成本金额" th:value="${lossCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报溢数量:</label>
-                <input name="gainQuantity" placeholder="报溢数量" th:value="${gainQuantity}" class="styled-input" type="text">
+                <input name="gainQuantity" placeholder="报溢数量" th:value="${gainQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>报溢成本金额/元:</label>
-                <input name="gainCost" placeholder="报溢成本金额/元" th:value="${gainCost}" class="styled-input" type="text">
+                <input name="gainCost" placeholder="报溢成本金额/元" th:value="${gainCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期末库存数量:</label>
-                <input name="finalStockQuantity" placeholder="期末库存数量" th:value="${finalStockQuantity}" class="styled-input" type="text">
+                <input name="finalStockQuantity" placeholder="期末库存数量" th:value="${finalStockQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期末库存成本金额/元:</label>
-                <input name="finalStockCost" placeholder="期末库存成本金额/元" th:value="${finalStockCost}" class="styled-input" type="text">
+                <input name="finalStockCost" placeholder="期末库存成本金额/元" th:value="${finalStockCost}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初导入库存数量:</label>
-                <input name="initialImportQuantity" placeholder="期初导入库存数量" th:value="${initialImportQuantity}" class="styled-input" type="text">
+                <input name="initialImportQuantity" placeholder="期初导入库存数量" th:value="${initialImportQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>期初导入库存成本金额/元:</label>
-                <input name="initialImportCost" placeholder="期初导入库存成本金额/元" th:value="${initialImportCost}" class="styled-input" type="text">
+                <input name="initialImportCost" placeholder="期初导入库存成本金额/元" th:value="${initialImportCost}" class="styled-input" type="number">
             </div>
         </div>
     </form>
@@ -179,6 +179,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbInventoryvariation-edit :input').attr('disabled', 'disabled');
+    });
     function edit() {
         var data = $("#form-SKcBbInventoryvariation-edit").serializeArray();
         $.ajax({

health-admin/src/main/resources/templates/kc/bb/SKcBbInventoryvariationList.html

@@ -46,159 +46,12 @@
                             <label>单位:</label>
                             <input type="text" class="styled-input" name="unit" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>生产企业:</label>
-                            <input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>剂型:</label>
-                            <input type="text" class="styled-input" name="dosageForm" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>批号:</label>
-                            <input type="text" class="styled-input" name="batchNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>批次:</label>
-                            <input type="text" class="styled-input" name="batch" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期初库存数量:</label>
-                            <input type="text" class="styled-input" name="initialStockQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期初库存成本金额/元:</label>
-                            <input type="text" class="styled-input" name="initialStockCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>大仓配送数量:</label>
-                            <input type="text" class="styled-input" name="warehouseDeliveryQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>大仓配送成本金额/元:</label>
-                            <input type="text" class="styled-input" name="warehouseDeliveryCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>调拨调入配送数量:</label>
-                            <input type="text" class="styled-input" name="transferInQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>调拨调入配送成本金额/元:</label>
-                            <input type="text" class="styled-input" name="transferInCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>店采收货数量:</label>
-                            <input type="text" class="styled-input" name="storeReceiptQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>店采收货成本金额:</label>
-                            <input type="text" class="styled-input" name="storeReceiptCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>店采退货数量:</label>
-                            <input type="text" class="styled-input" name="storeReturnQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>店采退货金额/元:</label>
-                            <input type="text" class="styled-input" name="storeReturnAmount" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>调拨调出数量:</label>
-                            <input type="text" class="styled-input" name="transferOutQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>调拨调出成本金额/元:</label>
-                            <input type="text" class="styled-input" name="transferOutCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店退仓数量:</label>
-                            <input type="text" class="styled-input" name="storeReturnWarehouseQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>门店退仓成本金额/元:</label>
-                            <input type="text" class="styled-input" name="storeReturnWarehouseCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线下销售数量:</label>
-                            <input type="text" class="styled-input" name="offlineSalesQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线下销售成本金额/元:</label>
-                            <input type="text" class="styled-input" name="offlineSalesCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线下销售退货数量:</label>
-                            <input type="text" class="styled-input" name="offlineSalesReturnQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线下销售退货金额/元:</label>
-                            <input type="text" class="styled-input" name="offlineSalesReturnAmount" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线上销售数量:</label>
-                            <input type="text" class="styled-input" name="onlineSalesQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线上销售成本金额/元:</label>
-                            <input type="text" class="styled-input" name="onlineSalesCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线上销售退货数量:</label>
-                            <input type="text" class="styled-input" name="onlineSalesReturnQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>线上销售退货金额/元:</label>
-                            <input type="text" class="styled-input" name="onlineSalesReturnAmount" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>报损数量:</label>
-                            <input type="text" class="styled-input" name="lossQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>报损成本金额:</label>
-                            <input type="text" class="styled-input" name="lossCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>报溢数量:</label>
-                            <input type="text" class="styled-input" name="gainQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>报溢成本金额/元:</label>
-                            <input type="text" class="styled-input" name="gainCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期末库存数量:</label>
-                            <input type="text" class="styled-input" name="finalStockQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期末库存成本金额/元:</label>
-                            <input type="text" class="styled-input" name="finalStockCost" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期初导入库存数量:</label>
-                            <input type="text" class="styled-input" name="initialImportQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>期初导入库存成本金额/元:</label>
-                            <input type="text" class="styled-input" name="initialImportCost" autocomplete="off"/>
-                        </div>
                     </div>
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
+
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -259,9 +112,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'sequenceNumber', title: '序号', align: 'center' },
                     { field: 'period', title: '期间', align: 'center' },
@@ -310,12 +161,8 @@
                     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> ');
+                            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> ');
                             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/kc/bb/SKcBbInventoryvariationPageEdit.html

@@ -9,172 +9,172 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>序号:</label>
-                        <input name="sequenceNumber" placeholder="序号" th:value="${sequenceNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期间:</label>
-                        <input name="period" placeholder="期间" th:value="${period}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品编码:</label>
-                        <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品名称:</label>
-                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>规格:</label>
-                        <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>单位:</label>
-                        <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>生产企业:</label>
-                        <input name="manufacturer" placeholder="生产企业" th:value="${manufacturer}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>剂型:</label>
-                        <input name="dosageForm" placeholder="剂型" th:value="${dosageForm}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>批号:</label>
-                        <input name="batchNumber" placeholder="批号" th:value="${batchNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>批次:</label>
-                        <input name="batch" placeholder="批次" th:value="${batch}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期初库存数量:</label>
-                        <input name="initialStockQuantity" placeholder="期初库存数量" th:value="${initialStockQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期初库存成本金额/元:</label>
-                        <input name="initialStockCost" placeholder="期初库存成本金额/元" th:value="${initialStockCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>大仓配送数量:</label>
-                        <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量" th:value="${warehouseDeliveryQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>大仓配送成本金额/元:</label>
-                        <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元" th:value="${warehouseDeliveryCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调拨调入配送数量:</label>
-                        <input name="transferInQuantity" placeholder="调拨调入配送数量" th:value="${transferInQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调拨调入配送成本金额/元:</label>
-                        <input name="transferInCost" placeholder="调拨调入配送成本金额/元" th:value="${transferInCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>店采收货数量:</label>
-                        <input name="storeReceiptQuantity" placeholder="店采收货数量" th:value="${storeReceiptQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>店采收货成本金额:</label>
-                        <input name="storeReceiptCost" placeholder="店采收货成本金额" th:value="${storeReceiptCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>店采退货数量:</label>
-                        <input name="storeReturnQuantity" placeholder="店采退货数量" th:value="${storeReturnQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>店采退货金额/元:</label>
-                        <input name="storeReturnAmount" placeholder="店采退货金额/元" th:value="${storeReturnAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调拨调出数量:</label>
-                        <input name="transferOutQuantity" placeholder="调拨调出数量" th:value="${transferOutQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>调拨调出成本金额/元:</label>
-                        <input name="transferOutCost" placeholder="调拨调出成本金额/元" th:value="${transferOutCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店退仓数量:</label>
-                        <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量" th:value="${storeReturnWarehouseQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店退仓成本金额/元:</label>
-                        <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元" th:value="${storeReturnWarehouseCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线下销售数量:</label>
-                        <input name="offlineSalesQuantity" placeholder="线下销售数量" th:value="${offlineSalesQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线下销售成本金额/元:</label>
-                        <input name="offlineSalesCost" placeholder="线下销售成本金额/元" th:value="${offlineSalesCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线下销售退货数量:</label>
-                        <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量" th:value="${offlineSalesReturnQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线下销售退货金额/元:</label>
-                        <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元" th:value="${offlineSalesReturnAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线上销售数量:</label>
-                        <input name="onlineSalesQuantity" placeholder="线上销售数量" th:value="${onlineSalesQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线上销售成本金额/元:</label>
-                        <input name="onlineSalesCost" placeholder="线上销售成本金额/元" th:value="${onlineSalesCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线上销售退货数量:</label>
-                        <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量" th:value="${onlineSalesReturnQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>线上销售退货金额/元:</label>
-                        <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元" th:value="${onlineSalesReturnAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>报损数量:</label>
-                        <input name="lossQuantity" placeholder="报损数量" th:value="${lossQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>报损成本金额:</label>
-                        <input name="lossCost" placeholder="报损成本金额" th:value="${lossCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>报溢数量:</label>
-                        <input name="gainQuantity" placeholder="报溢数量" th:value="${gainQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>报溢成本金额/元:</label>
-                        <input name="gainCost" placeholder="报溢成本金额/元" th:value="${gainCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期末库存数量:</label>
-                        <input name="finalStockQuantity" placeholder="期末库存数量" th:value="${finalStockQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期末库存成本金额/元:</label>
-                        <input name="finalStockCost" placeholder="期末库存成本金额/元" th:value="${finalStockCost}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期初导入库存数量:</label>
-                        <input name="initialImportQuantity" placeholder="期初导入库存数量" th:value="${initialImportQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>期初导入库存成本金额/元:</label>
-                        <input name="initialImportCost" placeholder="期初导入库存成本金额/元" th:value="${initialImportCost}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>序号:</label>
+                <input name="sequenceNumber" placeholder="序号" th:value="${sequenceNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>期间:</label>
+                <input name="period" placeholder="期间" th:value="${period}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品编码:</label>
+                <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品名称:</label>
+                <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>规格:</label>
+                <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>单位:</label>
+                <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>生产企业:</label>
+                <input name="manufacturer" placeholder="生产企业" th:value="${manufacturer}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>剂型:</label>
+                <input name="dosageForm" placeholder="剂型" th:value="${dosageForm}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>批号:</label>
+                <input name="batchNumber" placeholder="批号" th:value="${batchNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>批次:</label>
+                <input name="batch" placeholder="批次" th:value="${batch}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>期初库存数量:</label>
+                <input name="initialStockQuantity" placeholder="期初库存数量" th:value="${initialStockQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>期初库存成本金额/元:</label>
+                <input name="initialStockCost" placeholder="期初库存成本金额/元" th:value="${initialStockCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>大仓配送数量:</label>
+                <input name="warehouseDeliveryQuantity" placeholder="大仓配送数量" th:value="${warehouseDeliveryQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>大仓配送成本金额/元:</label>
+                <input name="warehouseDeliveryCost" placeholder="大仓配送成本金额/元" th:value="${warehouseDeliveryCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>调拨调入配送数量:</label>
+                <input name="transferInQuantity" placeholder="调拨调入配送数量" th:value="${transferInQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>调拨调入配送成本金额/元:</label>
+                <input name="transferInCost" placeholder="调拨调入配送成本金额/元" th:value="${transferInCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>店采收货数量:</label>
+                <input name="storeReceiptQuantity" placeholder="店采收货数量" th:value="${storeReceiptQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>店采收货成本金额:</label>
+                <input name="storeReceiptCost" placeholder="店采收货成本金额" th:value="${storeReceiptCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>店采退货数量:</label>
+                <input name="storeReturnQuantity" placeholder="店采退货数量" th:value="${storeReturnQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>店采退货金额/元:</label>
+                <input name="storeReturnAmount" placeholder="店采退货金额/元" th:value="${storeReturnAmount}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>调拨调出数量:</label>
+                <input name="transferOutQuantity" placeholder="调拨调出数量" th:value="${transferOutQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>调拨调出成本金额/元:</label>
+                <input name="transferOutCost" placeholder="调拨调出成本金额/元" th:value="${transferOutCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>门店退仓数量:</label>
+                <input name="storeReturnWarehouseQuantity" placeholder="门店退仓数量" th:value="${storeReturnWarehouseQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>门店退仓成本金额/元:</label>
+                <input name="storeReturnWarehouseCost" placeholder="门店退仓成本金额/元" th:value="${storeReturnWarehouseCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线下销售数量:</label>
+                <input name="offlineSalesQuantity" placeholder="线下销售数量" th:value="${offlineSalesQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线下销售成本金额/元:</label>
+                <input name="offlineSalesCost" placeholder="线下销售成本金额/元" th:value="${offlineSalesCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线下销售退货数量:</label>
+                <input name="offlineSalesReturnQuantity" placeholder="线下销售退货数量" th:value="${offlineSalesReturnQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线下销售退货金额/元:</label>
+                <input name="offlineSalesReturnAmount" placeholder="线下销售退货金额/元" th:value="${offlineSalesReturnAmount}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线上销售数量:</label>
+                <input name="onlineSalesQuantity" placeholder="线上销售数量" th:value="${onlineSalesQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线上销售成本金额/元:</label>
+                <input name="onlineSalesCost" placeholder="线上销售成本金额/元" th:value="${onlineSalesCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线上销售退货数量:</label>
+                <input name="onlineSalesReturnQuantity" placeholder="线上销售退货数量" th:value="${onlineSalesReturnQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>线上销售退货金额/元:</label>
+                <input name="onlineSalesReturnAmount" placeholder="线上销售退货金额/元" th:value="${onlineSalesReturnAmount}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>报损数量:</label>
+                <input name="lossQuantity" placeholder="报损数量" th:value="${lossQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>报损成本金额:</label>
+                <input name="lossCost" placeholder="报损成本金额" th:value="${lossCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>报溢数量:</label>
+                <input name="gainQuantity" placeholder="报溢数量" th:value="${gainQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>报溢成本金额/元:</label>
+                <input name="gainCost" placeholder="报溢成本金额/元" th:value="${gainCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>期末库存数量:</label>
+                <input name="finalStockQuantity" placeholder="期末库存数量" th:value="${finalStockQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>期末库存成本金额/元:</label>
+                <input name="finalStockCost" placeholder="期末库存成本金额/元" th:value="${finalStockCost}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>期初导入库存数量:</label>
+                <input name="initialImportQuantity" placeholder="期初导入库存数量" th:value="${initialImportQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>期初导入库存成本金额/元:</label>
+                <input name="initialImportCost" placeholder="期初导入库存成本金额/元" th:value="${initialImportCost}" class="styled-input" type="number">
+            </div>
         </div>
     </form>
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -182,6 +182,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbInventoryvariation-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "kc/skcbbinventoryvariation";
         if ($.validate.form()) {

health-admin/src/main/resources/templates/kc/bb/SKcBbJxcspmxStoreinventorychangesAdd.html

@@ -54,11 +54,11 @@
             </div>
             <div class="customize-form-group">
                 <label>是否拆零商品:</label>
-                <input name="isDispensed" placeholder="是否拆零商品"  id="isDispensed" class="styled-input" type="text">
+                <input name="isDispensed" placeholder="是/否"  id="isDispensed" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>拆零因子:</label>
-                <input name="dispenseFactor" placeholder="拆零因子"  id="dispenseFactor" class="styled-input" type="text">
+                <input name="dispenseFactor" placeholder="拆零因子"  id="dispenseFactor" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>源单据号:</label>
@@ -74,31 +74,31 @@
             </div>
             <div class="customize-form-group">
                 <label>库存改变数量:</label>
-                <input name="inventoryChangeQuantity" placeholder="库存改变数量"  id="inventoryChangeQuantity" class="styled-input" type="text">
+                <input name="inventoryChangeQuantity" placeholder="库存改变数量"  id="inventoryChangeQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>变动前库存:</label>
-                <input name="inventoryBeforeChange" placeholder="变动前库存"  id="inventoryBeforeChange" class="styled-input" type="text">
+                <input name="inventoryBeforeChange" placeholder="变动前库存"  id="inventoryBeforeChange" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本单价:</label>
-                <input name="costUnitPrice" placeholder="成本单价"  id="costUnitPrice" class="styled-input" type="text">
+                <input name="costUnitPrice" placeholder="成本单价"  id="costUnitPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本金额:</label>
-                <input name="costAmount" placeholder="成本金额"  id="costAmount" class="styled-input" type="text">
+                <input name="costAmount" placeholder="成本金额"  id="costAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>瞬时结余库存:</label>
-                <input name="instantRemainingInventory" placeholder="瞬时结余库存"  id="instantRemainingInventory" class="styled-input" type="text">
+                <input name="instantRemainingInventory" placeholder="瞬时结余库存"  id="instantRemainingInventory" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>单据时间:</label>
-                <input name="documentTime" placeholder="单据时间"  id="documentTime" class="styled-input" type="text">
+                <input name="documentTime" placeholder="单据时间"  id="documentTime" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>库存变动时间:</label>
-                <input name="inventoryChangeTime" placeholder="库存变动时间"  id="inventoryChangeTime" class="styled-input" type="text">
+                <input name="inventoryChangeTime" placeholder="库存变动时间"  id="inventoryChangeTime" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>

health-admin/src/main/resources/templates/kc/bb/SKcBbJxcspmxStoreinventorychangesEdit.html

@@ -55,11 +55,11 @@
             </div>
             <div class="customize-form-group">
                 <label>是否拆零商品:</label>
-                <input name="isDispensed" placeholder="是否拆零商品" th:value="${isDispensed}" class="styled-input" type="text">
+                <input name="isDispensed" placeholder="是/否" th:value="${isDispensed}" class="styled-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>拆零因子:</label>
-                <input name="dispenseFactor" placeholder="拆零因子" th:value="${dispenseFactor}" class="styled-input" type="text">
+                <input name="dispenseFactor" placeholder="拆零因子" th:value="${dispenseFactor}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>源单据号:</label>
@@ -75,31 +75,31 @@
             </div>
             <div class="customize-form-group">
                 <label>库存改变数量:</label>
-                <input name="inventoryChangeQuantity" placeholder="库存改变数量" th:value="${inventoryChangeQuantity}" class="styled-input" type="text">
+                <input name="inventoryChangeQuantity" placeholder="库存改变数量" th:value="${inventoryChangeQuantity}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>变动前库存:</label>
-                <input name="inventoryBeforeChange" placeholder="变动前库存" th:value="${inventoryBeforeChange}" class="styled-input" type="text">
+                <input name="inventoryBeforeChange" placeholder="变动前库存" th:value="${inventoryBeforeChange}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本单价:</label>
-                <input name="costUnitPrice" placeholder="成本单价" th:value="${costUnitPrice}" class="styled-input" type="text">
+                <input name="costUnitPrice" placeholder="成本单价" th:value="${costUnitPrice}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本金额:</label>
-                <input name="costAmount" placeholder="成本金额" th:value="${costAmount}" class="styled-input" type="text">
+                <input name="costAmount" placeholder="成本金额" th:value="${costAmount}" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>瞬时结余库存:</label>
-                <input name="instantRemainingInventory" placeholder="瞬时结余库存" th:value="${instantRemainingInventory}" class="styled-input" type="text">
+                <input name="instantRemainingInventory" placeholder="瞬时结余库存" th:value="${instantRemainingInventory}" class="styled-input" type="number">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>单据时间:</label>
-                <input name="documentTime" placeholder="单据时间" th:value="${documentTime}" class="styled-input" type="text">
+                <input name="documentTime" placeholder="单据时间" th:value="${documentTime}" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>库存变动时间:</label>
-                <input name="inventoryChangeTime" placeholder="库存变动时间" th:value="${inventoryChangeTime}" class="styled-input" type="text">
+                <input name="inventoryChangeTime" placeholder="库存变动时间" th:value="${inventoryChangeTime}" class="time-input time-input2" type="text">
             </div>
         </div>
     </form>
@@ -112,6 +112,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbJxcspmxStoreinventorychanges-edit :input').attr('disabled', 'disabled');
+    });
     function edit() {
         var data = $("#form-SKcBbJxcspmxStoreinventorychanges-edit").serializeArray();
         $.ajax({

health-admin/src/main/resources/templates/kc/bb/SKcBbJxcspmxStoreinventorychangesList.html

@@ -21,7 +21,7 @@
                     </div>
                 </div>
                 <form id="SKcBbJxcspmxStoreinventorychanges-form" class="customize-search-form">
-<div class="customize-form-group-container">
+                     <div class="customize-form-group-container">
                         <div class="customize-form-group">
                             <label>门店编码:</label>
                             <input type="text" class="styled-input" name="storeCode" autocomplete="off"/>
@@ -38,99 +38,19 @@
                             <label>商品名称:</label>
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>剂型:</label>
-                            <input type="text" class="styled-input" name="dosageForm" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>规格:</label>
-                            <input type="text" class="styled-input" name="specification" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>单位:</label>
-                            <input type="text" class="styled-input" name="unit" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>生产厂家:</label>
-                            <input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>批号:</label>
-                            <input type="text" class="styled-input" name="batchNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>批次:</label>
-                            <input type="text" class="styled-input" name="batch" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>库区:</label>
-                            <input type="text" class="styled-input" name="storageArea" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>是否拆零商品:</label>
-                            <input type="text" class="styled-input" name="isDispensed" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>拆零因子:</label>
-                            <input type="text" class="styled-input" name="dispenseFactor" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>源单据号:</label>
-                            <input type="text" class="styled-input" name="sourceDocumentNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>单据编号:</label>
-                            <input type="text" class="styled-input" name="documentNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>单据类型:</label>
-                            <input type="text" class="styled-input" name="documentType" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>库存改变数量:</label>
-                            <input type="text" class="styled-input" name="inventoryChangeQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>变动前库存:</label>
-                            <input type="text" class="styled-input" name="inventoryBeforeChange" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>成本单价:</label>
-                            <input type="text" class="styled-input" name="costUnitPrice" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>成本金额:</label>
-                            <input type="text" class="styled-input" name="costAmount" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>瞬时结余库存:</label>
-                            <input type="text" class="styled-input" name="instantRemainingInventory" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
+                        <div class="customize-form-group select-time">
                             <label>单据时间:</label>
-                            <input type="text" class="styled-input" name="documentTime" autocomplete="off"/>
+                            <input type="text" class="time-input time-input2" name="documentTime" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
+                        <div class="customize-form-group select-time">
                             <label>库存变动时间:</label>
-                            <input type="text" class="styled-input" name="inventoryChangeTime" autocomplete="off"/>
+                            <input type="text" class="time-input time-input2" name="inventoryChangeTime" autocomplete="off"/>
                         </div>
                     </div>
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -191,9 +111,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'storeCode', title: '门店编码', align: 'center' },
                     { field: 'storeName', title: '门店名称', align: 'center' },
@@ -225,12 +143,7 @@
                     formatter: function(value, row, index) {
                         if (row.id) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

health-admin/src/main/resources/templates/kc/bb/SKcBbJxcspmxStoreinventorychangesPageEdit.html

@@ -9,104 +9,104 @@
 
         <div class="customize-form-group-container">
             <input type="hidden" id="id" name="id" th:value="${id}">
-                    <div class="customize-form-group">
-                            <label>门店编码:</label>
-                        <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>门店名称:</label>
-                        <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品编码:</label>
-                        <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>商品名称:</label>
-                        <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>剂型:</label>
-                        <input name="dosageForm" placeholder="剂型" th:value="${dosageForm}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>规格:</label>
-                        <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>单位:</label>
-                        <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>生产厂家:</label>
-                        <input name="manufacturer" placeholder="生产厂家" th:value="${manufacturer}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>批号:</label>
-                        <input name="batchNumber" placeholder="批号" th:value="${batchNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>批次:</label>
-                        <input name="batch" placeholder="批次" th:value="${batch}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>库区:</label>
-                        <input name="storageArea" placeholder="库区" th:value="${storageArea}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>是否拆零商品:</label>
-                        <input name="isDispensed" placeholder="是否拆零商品" th:value="${isDispensed}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>拆零因子:</label>
-                        <input name="dispenseFactor" placeholder="拆零因子" th:value="${dispenseFactor}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>源单据号:</label>
-                        <input name="sourceDocumentNumber" placeholder="源单据号" th:value="${sourceDocumentNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>单据编号:</label>
-                        <input name="documentNumber" placeholder="单据编号" th:value="${documentNumber}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>单据类型:</label>
-                        <input name="documentType" placeholder="单据类型" th:value="${documentType}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>库存改变数量:</label>
-                        <input name="inventoryChangeQuantity" placeholder="库存改变数量" th:value="${inventoryChangeQuantity}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>变动前库存:</label>
-                        <input name="inventoryBeforeChange" placeholder="变动前库存" th:value="${inventoryBeforeChange}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>成本单价:</label>
-                        <input name="costUnitPrice" placeholder="成本单价" th:value="${costUnitPrice}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>成本金额:</label>
-                        <input name="costAmount" placeholder="成本金额" th:value="${costAmount}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>瞬时结余库存:</label>
-                        <input name="instantRemainingInventory" placeholder="瞬时结余库存" th:value="${instantRemainingInventory}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>单据时间:</label>
-                        <input name="documentTime" placeholder="单据时间" th:value="${documentTime}" class="styled-input" type="text">
-                    </div>
-                    <div class="customize-form-group">
-                            <label>库存变动时间:</label>
-                        <input name="inventoryChangeTime" placeholder="库存变动时间" th:value="${inventoryChangeTime}" class="styled-input" type="text">
-                    </div>
+            <div class="customize-form-group">
+                <label>门店编码:</label>
+                <input name="storeCode" placeholder="门店编码" th:value="${storeCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>门店名称:</label>
+                <input name="storeName" placeholder="门店名称" th:value="${storeName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品编码:</label>
+                <input name="productCode" placeholder="商品编码" th:value="${productCode}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>商品名称:</label>
+                <input name="productName" placeholder="商品名称" th:value="${productName}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>剂型:</label>
+                <input name="dosageForm" placeholder="剂型" th:value="${dosageForm}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>规格:</label>
+                <input name="specification" placeholder="规格" th:value="${specification}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>单位:</label>
+                <input name="unit" placeholder="单位" th:value="${unit}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>生产厂家:</label>
+                <input name="manufacturer" placeholder="生产厂家" th:value="${manufacturer}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>批号:</label>
+                <input name="batchNumber" placeholder="批号" th:value="${batchNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>批次:</label>
+                <input name="batch" placeholder="批次" th:value="${batch}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>库区:</label>
+                <input name="storageArea" placeholder="库区" th:value="${storageArea}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>是否拆零商品:</label>
+                <input name="isDispensed" placeholder="是/否" th:value="${isDispensed}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>拆零因子:</label>
+                <input name="dispenseFactor" placeholder="拆零因子" th:value="${dispenseFactor}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>源单据号:</label>
+                <input name="sourceDocumentNumber" placeholder="源单据号" th:value="${sourceDocumentNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>单据编号:</label>
+                <input name="documentNumber" placeholder="单据编号" th:value="${documentNumber}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>单据类型:</label>
+                <input name="documentType" placeholder="单据类型" th:value="${documentType}" class="styled-input" type="text">
+            </div>
+            <div class="customize-form-group">
+                <label>库存改变数量:</label>
+                <input name="inventoryChangeQuantity" placeholder="库存改变数量" th:value="${inventoryChangeQuantity}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>变动前库存:</label>
+                <input name="inventoryBeforeChange" placeholder="变动前库存" th:value="${inventoryBeforeChange}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>成本单价:</label>
+                <input name="costUnitPrice" placeholder="成本单价" th:value="${costUnitPrice}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>成本金额:</label>
+                <input name="costAmount" placeholder="成本金额" th:value="${costAmount}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group">
+                <label>瞬时结余库存:</label>
+                <input name="instantRemainingInventory" placeholder="瞬时结余库存" th:value="${instantRemainingInventory}" class="styled-input" type="number">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>单据时间:</label>
+                <input name="documentTime" placeholder="单据时间" th:value="${documentTime}" class="time-input time-input2" type="text">
+            </div>
+            <div class="customize-form-group select-time">
+                <label>库存变动时间:</label>
+                <input name="inventoryChangeTime" placeholder="库存变动时间" th:value="${inventoryChangeTime}" class="time-input time-input2" type="text">
+            </div>
         </div>
     </form>
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -114,6 +114,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbJxcspmxStoreinventorychanges-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "kc/skcbbjxcspmxstoreinventorychanges";
         if ($.validate.form()) {

health-admin/src/main/resources/templates/kc/bb/SKcBbMaintenanceorderitemsAdd.html

@@ -36,29 +36,29 @@
                 <label>批号:</label>
                 <input name="batchNumber" placeholder="批号"  id="batchNumber" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生产日期:</label>
-                <input name="productionDate" placeholder="生产日期"  id="productionDate" class="styled-input" type="text">
+                <input name="productionDate" placeholder="生产日期"  id="productionDate" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>有效日期:</label>
-                <input name="expiryDate" placeholder="有效日期"  id="expiryDate" class="styled-input" type="text">
+                <input name="expiryDate" placeholder="有效日期"  id="expiryDate" class="time-input2 time-input" type="text">
             </div>
             <div class="customize-form-group">
                 <label>库存数量:</label>
-                <input name="inventoryQuantity" placeholder="库存数量"  id="inventoryQuantity" class="styled-input" type="text">
+                <input name="inventoryQuantity" placeholder="库存数量"  id="inventoryQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>检查数量:</label>
-                <input name="inspectionQuantity" placeholder="检查数量"  id="inspectionQuantity" class="styled-input" type="text">
+                <input name="inspectionQuantity" placeholder="检查数量"  id="inspectionQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>合格数量:</label>
-                <input name="qualifiedQuantity" placeholder="合格数量"  id="qualifiedQuantity" class="styled-input" type="text">
+                <input name="qualifiedQuantity" placeholder="合格数量"  id="qualifiedQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>不合格数量:</label>
-                <input name="unqualifiedQuantity" placeholder="不合格数量"  id="unqualifiedQuantity" class="styled-input" type="text">
+                <input name="unqualifiedQuantity" placeholder="不合格数量"  id="unqualifiedQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>结论:</label>
@@ -68,9 +68,9 @@
                 <label>处理措施:</label>
                 <input name="handlingMeasures" placeholder="处理措施"  id="handlingMeasures" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>检查日期:</label>
-                <input name="inspectionDate" placeholder="检查日期"  id="inspectionDate" class="styled-input" type="text">
+                <input name="inspectionDate" placeholder="检查日期"  id="inspectionDate" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>检查人:</label>

health-admin/src/main/resources/templates/kc/bb/SKcBbMaintenanceorderitemsEdit.html

@@ -92,6 +92,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbMaintenanceorderitems-edit :input').attr('disabled', 'disabled');
+    });
     function edit() {
         var data = $("#form-SKcBbMaintenanceorderitems-edit").serializeArray();
         $.ajax({

health-admin/src/main/resources/templates/kc/bb/SKcBbMaintenanceorderitemsList.html

@@ -22,10 +22,7 @@
                 </div>
                 <form id="SKcBbMaintenanceorderitems-form" class="customize-search-form">
 <div class="customize-form-group-container">
-                        <div class="customize-form-group">
-                            <label>养护级别:</label>
-                            <input type="text" class="styled-input" name="maintenanceLevel" autocomplete="off"/>
-                        </div>
+
                         <div class="customize-form-group">
                             <label>商品编码:</label>
                             <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
@@ -35,82 +32,15 @@
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
                         </div>
                         <div class="customize-form-group">
-                            <label>养护单号:</label>
-                            <input type="text" class="styled-input" name="maintenanceOrderNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>规格:</label>
-                            <input type="text" class="styled-input" name="specification" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>生产厂家:</label>
-                            <input type="text" class="styled-input" name="manufacturer" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>批号:</label>
-                            <input type="text" class="styled-input" name="batchNumber" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
                             <label>生产日期:</label>
                             <input type="text" class="styled-input" name="productionDate" autocomplete="off"/>
                         </div>
-                        <div class="customize-form-group">
-                            <label>有效日期:</label>
-                            <input type="text" class="styled-input" name="expiryDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>库存数量:</label>
-                            <input type="text" class="styled-input" name="inventoryQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>检查数量:</label>
-                            <input type="text" class="styled-input" name="inspectionQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>合格数量:</label>
-                            <input type="text" class="styled-input" name="qualifiedQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>不合格数量:</label>
-                            <input type="text" class="styled-input" name="unqualifiedQuantity" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>结论:</label>
-                            <input type="text" class="styled-input" name="conclusion" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>处理措施:</label>
-                            <input type="text" class="styled-input" name="handlingMeasures" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>检查日期:</label>
-                            <input type="text" class="styled-input" name="inspectionDate" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>检查人:</label>
-                            <input type="text" class="styled-input" name="inspector" autocomplete="off"/>
-                        </div>
-                        <div class="customize-form-group">
-                            <label>养护人:</label>
-                            <input type="text" class="styled-input" name="maintainer" autocomplete="off"/>
-                        </div>
                     </div>
                 </form>
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
-                    <i class="fa fa-plus"></i> 新增
-                </a>
-                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:user:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-                <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
-                    <i class="fa fa-upload"></i> 导入
-                </a>
+
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -171,9 +101,7 @@
             fixedColumns: true,
             //fixedNumber: 3,
             fixedRightNumber: 1,
-            columns: [{
-                checkbox: true
-            },
+            columns: [
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
                     { field: 'maintenanceLevel', title: '养护级别', align: 'center' },
                     { field: 'productCode', title: '商品编码', align: 'center' },
@@ -200,12 +128,7 @@
                     formatter: function(value, row, index) {
                         if (row.id) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                            var more = [];
-                            /*more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-                            more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-                            actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');*/
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="edit_page(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看</a> ');
                             return actions.join('');
                         } else {
                             return "";

health-admin/src/main/resources/templates/kc/bb/SKcBbMaintenanceorderitemsPageEdit.html

@@ -86,7 +86,7 @@
 </div>
 <div class="main-content">
     <div class="col-sm-offset-5 col-sm-10">
-        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+<!--        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;-->
         <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
     </div>
 </div>
@@ -94,6 +94,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbMaintenanceorderitems-edit :input').attr('disabled', 'disabled');
+    });
     function submitHandler() {
         var prefix = ctx + "kc/skcbbmaintenanceorderitems";
         if ($.validate.form()) {

health-admin/src/main/resources/templates/kc/bb/SKcBbProductinspectionAdd.html

@@ -56,17 +56,17 @@
                 <label>批次:</label>
                 <input name="batch" placeholder="批次"  id="batch" class="styled-input" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>验收日期:</label>
-                <input name="inspectionDate" placeholder="验收日期"  id="inspectionDate" class="styled-input" type="text">
+                <input name="inspectionDate" placeholder="验收日期"  id="inspectionDate" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>生产日期:</label>
-                <input name="productionDate" placeholder="生产日期"  id="productionDate" class="styled-input" type="text">
+                <input name="productionDate" placeholder="生产日期"  id="productionDate" class="time-input time-input2" type="text">
             </div>
-            <div class="customize-form-group">
+            <div class="customize-form-group select-time">
                 <label>有效期:</label>
-                <input name="validityPeriod" placeholder="有效期"  id="validityPeriod" class="styled-input" type="text">
+                <input name="validityPeriod" placeholder="有效期"  id="validityPeriod" class="time-input time-input2" type="text">
             </div>
             <div class="customize-form-group">
                 <label>生产厂商:</label>
@@ -78,19 +78,19 @@
             </div>
             <div class="customize-form-group">
                 <label>到货数量:</label>
-                <input name="arrivalQuantity" placeholder="到货数量"  id="arrivalQuantity" class="styled-input" type="text">
+                <input name="arrivalQuantity" placeholder="到货数量"  id="arrivalQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>验收合格数量:</label>
-                <input name="inspectionQualifiedQuantity" placeholder="验收合格数量"  id="inspectionQualifiedQuantity" class="styled-input" type="text">
+                <input name="inspectionQualifiedQuantity" placeholder="验收合格数量"  id="inspectionQualifiedQuantity" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本价/元:</label>
-                <input name="costPrice" placeholder="成本价/元"  id="costPrice" class="styled-input" type="text">
+                <input name="costPrice" placeholder="成本价/元"  id="costPrice" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>成本金额/元:</label>
-                <input name="costAmount" placeholder="成本金额/元"  id="costAmount" class="styled-input" type="text">
+                <input name="costAmount" placeholder="成本金额/元"  id="costAmount" class="styled-input" type="number">
             </div>
             <div class="customize-form-group">
                 <label>SAP配送单单号:</label>

health-admin/src/main/resources/templates/kc/bb/SKcBbProductinspectionEdit.html

@@ -116,6 +116,9 @@
 </body>
 </html>
 <script>
+    $(document).ready(function() {
+        $('#form-SKcBbProductinspection-edit :input').attr('disabled', 'disabled');
+    });
     function edit() {
         var data = $("#form-SKcBbProductinspection-edit").serializeArray();
         $.ajax({