Accueil Explorer Aide
S'inscrire Connexion
bzd_lxf
/
health_manage
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

update 页面显示数据问题 表格宽度设定 数据长度控制显示与隐藏 以及页面布局调整

bzd_lxf il y a 1 an
Parent
d3aab321e9
commit
bfba7f7030
100 fichiers modifiés avec 856 ajouts et 1106 suppressions
Vue séparée Afficher les stats Diff
  1. 0 0
      health-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css
  2. 12 0
      health-admin/src/main/resources/static/health/css/input-styles.css
  3. 33 1
      health-admin/src/main/resources/static/health/js/ry-ui.js
  4. 1 4
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailEdit.html
  5. 18 18
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailList.html
  6. 1 4
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailPageEdit.html
  7. 1 4
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxEdit.html
  8. 18 18
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxList.html
  9. 1 4
      health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxPageEdit.html
  10. 1 4
      health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordEdit.html
  11. 9 9
      health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordList.html
  12. 1 4
      health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordPageEdit.html
  13. 1 4
      health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjEdit.html
  14. 9 9
      health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjList.html
  15. 1 4
      health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjPageEdit.html
  16. 1 4
      health-admin/src/main/resources/templates/daas/SDaasChannelManagementEdit.html
  17. 14 14
      health-admin/src/main/resources/templates/daas/SDaasChannelManagementList.html
  18. 1 4
      health-admin/src/main/resources/templates/daas/SDaasChannelManagementPageEdit.html
  19. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpEdit.html
  20. 7 7
      health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpList.html
  21. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpPageEdit.html
  22. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoEdit.html
  23. 15 15
      health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoList.html
  24. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoPageEdit.html
  25. 16 16
      health-admin/src/main/resources/templates/ddgl/SDdglFpglinvoice.html
  26. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreEdit.html
  27. 11 11
      health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreList.html
  28. 1 4
      health-admin/src/main/resources/templates/ddgl/SDdglOrderStorePageEdit.html
  29. 6 6
      health-admin/src/main/resources/templates/demo/table/fixedColumns.html
  30. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskEdit.html
  31. 15 15
      health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskList.html
  32. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskPageEdit.html
  33. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsEdit.html
  34. 11 11
      health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsList.html
  35. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsPageEdit.html
  36. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskEdit.html
  37. 14 13
      health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskList.html
  38. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskPageEdit.html
  39. 1 1
      health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordAdd.html
  40. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordEdit.html
  41. 7 7
      health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordList.html
  42. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordPageEdit.html
  43. 1 1
      health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementAdd.html
  44. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementEdit.html
  45. 9 9
      health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementList.html
  46. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementPageEdit.html
  47. 1 1
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopAdd.html
  48. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopEdit.html
  49. 10 10
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html
  50. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopPageEdit.html
  51. 1 1
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateAdd.html
  52. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateEdit.html
  53. 11 11
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateList.html
  54. 13 16
      health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplatePageEdit.html
  55. 1 1
      health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktAdd.html
  56. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktEdit.html
  57. 8 8
      health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktList.html
  58. 2 5
      health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktPageEdit.html
  59. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsEdit.html
  60. 9 9
      health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsList.html
  61. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsPageEdit.html
  62. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceEdit.html
  63. 11 11
      health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceList.html
  64. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidancePageEdit.html
  65. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareEdit.html
  66. 8 8
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareList.html
  67. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalSharePageEdit.html
  68. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceEdit.html
  69. 8 8
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceList.html
  70. 1 4
      health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilancePageEdit.html
  71. 62 65
      health-admin/src/main/resources/templates/dtp/cold/cold.html
  72. 21 13
      health-admin/src/main/resources/templates/dtp/configInfo/AssociatedPrescription.html
  73. 31 31
      health-admin/src/main/resources/templates/dtp/configInfo/drugList.html
  74. 24 13
      health-admin/src/main/resources/templates/dtp/configInfo/dtpHospital.html
  75. 26 20
      health-admin/src/main/resources/templates/dtp/configInfo/storeTag.html
  76. 81 109
      health-admin/src/main/resources/templates/dtp/followUp/followUpList.html
  77. 35 119
      health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignList.html
  78. 31 56
      health-admin/src/main/resources/templates/dtp/followUpEvaluation/followUpEvaluationList.html
  79. 33 60
      health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingList.html
  80. 31 31
      health-admin/src/main/resources/templates/dtp/print/print.html
  81. 57 61
      health-admin/src/main/resources/templates/dtp/recipe/recipe.html
  82. 1 0
      health-admin/src/main/resources/templates/dtp/recipe/view.html
  83. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoEdit.html
  84. 12 14
      health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoList.html
  85. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoPageEdit.html
  86. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServerinfoEdit.html
  87. 7 7
      health-admin/src/main/resources/templates/fwgl/SFwglServerinfoList.html
  88. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServerinfoPageEdit.html
  89. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoEdit.html
  90. 8 8
      health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoList.html
  91. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoPageEdit.html
  92. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoEdit.html
  93. 11 7
      health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoList.html
  94. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoPageEdit.html
  95. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoEdit.html
  96. 11 14
      health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoList.html
  97. 1 4
      health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoPageEdit.html
  98. 1 1
      health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoAdd.html
  99. 2 5
      health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoEdit.html
  100. 6 2
      health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoList.html

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
health-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.css


+ 12 - 0
health-admin/src/main/resources/static/health/css/input-styles.css
Voir le fichier 

@@ -165,3 +165,15 @@ li {
 
 	margin-top: 0.2em; /* 顶部外边距 */
 
 }
 
 /*---------页面查询表单自适应 样式-------------*/
 
+
 
+.fixed-layout-table {
 
+	table-layout: fixed; /* 固定表格布局 */
 
+}
 
+.fixed-layout-table td, .fixed-layout-table th {
 
+	min-width: 120px; /* 设置最小宽度 */
 
+	/*word-wrap: break-word !important; !* 允许内容换行 *!*/
 
+	width: 140px; /* 设置最小宽度 */
 
+	white-space: nowrap;
 
+	overflow: hidden;
 
+	text-overflow: ellipsis;
 
+}

+ 33 - 1
health-admin/src/main/resources/static/health/js/ry-ui.js
Voir le fichier 

@@ -289,6 +289,38 @@ var table = {
 
                 if (typeof table.options.onLoadSuccess == "function") {
 
                     table.options.onLoadSuccess(data);
 
                 }
 
+                $('td').each(function() {
 
+                    var $this = $(this);
 
+                    // 检查当前元素是否属于表头行
 
+                    if ($this.find('input[type="checkbox"]').length === 0) {
 
+                        // 获取单元格的实际宽度
 
+                        var cellWidth = $this.width();
 
+                        // 创建一个临时的 span 元素来测量文本宽度
 
+                        var tempSpan = $('<span style="visibility: hidden; white-space: nowrap; position: absolute;">' + $this.text() + '</span>');
 
+                        $this.append(tempSpan);
 
+                        // 获取文本的实际宽度
 
+                        var textWidth = tempSpan[0].getBoundingClientRect().width;
 
+                        // 移除临时 span 元素
 
+                        tempSpan.remove();
 
+                        // 如果文本宽度超过单元格宽度，则添加 tooltip
 
+                        if (textWidth > cellWidth) {
 
+                            $this.html($.table.tooltip2($this.text()));
 
+                        }
 
+                    }
 
+                });
 
+            },
 
+            tooltip2: function (value, length, target) {
 
+                var _length = $.common.isEmpty(length) ? 19 : length;
 
+                var _text = "";
 
+                var _value = $.common.nullToStr(value);
 
+                var _target = $.common.isEmpty(target) ? 'copy' : target;
 
+                _text = _value.substr(0, _length) + "...";
 
+                _value = _value.replace(/\'/g,"&apos;");
 
+                _value = _value.replace(/\"/g,"&quot;");
 
+                var actions = [];
 
+                actions.push($.common.sprintf('<input style="opacity: 0;position: absolute;z-index:-1" type="text" value="%s"/>', _value));
 
+                actions.push($.common.sprintf('<a href="###" class="tooltip-show" data-toggle="tooltip" data-target="%s" title="%s">%s</a>', _target, _value, _text));
 
+                return actions.join('');
 
             },
 
             // 表格销毁
 
             destroy: function (tableId) {
 
@@ -310,7 +342,7 @@ var table = {
 
             },
 
             // 列超出指定长度浮动提示 target（copy单击复制文本 open弹窗打开文本）
 
             tooltip: function (value, length, target) {
 
-                var _length = $.common.isEmpty(length) ? 20 : length;
 
+                var _length = $.common.isEmpty(length) ? 19 : length;
 
                 var _text = "";
 
                 var _value = $.common.nullToStr(value);
 
                 var _target = $.common.isEmpty(target) ? 'copy' : target;

+ 1 - 4
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SBbfxKcbbInventoryShortageDetail-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 18 - 18
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailList.html
Voir le fichier 

@@ -21,53 +21,49 @@
 
                     </div>
 
                 </div>
 
                 <form id="SBbfxKcbbInventoryShortageDetail-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>商品ID: </label>
 
+                            <label>商品ID:</label>
 
                             <input type="text" class="styled-input" name="productId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品名称: </label>
 
+                            <label>商品名称:</label>
 
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品编码: </label>
 
+                            <label>商品编码:</label>
 
                             <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品类别: </label>
 
+                            <label>商品类别:</label>
 
                             <input type="text" class="styled-input" name="category" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>供应商: </label>
 
+                            <label>供应商:</label>
 
                             <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>库存数量: </label>
 
+                            <label>库存数量:</label>
 
                             <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>再订货水平: </label>
 
+                            <label>再订货水平:</label>
 
                             <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>缺货数量: </label>
 
+                            <label>缺货数量:</label>
 
                             <input type="text" class="styled-input" name="shortageQuantity" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后库存检查时间: </label>
 
+                            <label>最后库存检查时间:</label>
 
                             <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后编辑人: </label>
 
+                            <label>最后编辑人:</label>
 
                             <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后编辑时间: </label>
 
+                            <label>最后编辑时间:</label>
 
                             <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
@@ -92,8 +88,8 @@
 
                 </a>
 
             </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>
 
@@ -101,6 +97,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')}]];
 
@@ -143,6 +140,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbInventoryShortageDetailPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SBbfxKcbbInventoryShortageDetail-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SBbfxKcbbJgkcmx-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 18 - 18
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxList.html
Voir le fichier 

@@ -21,53 +21,49 @@
 
                     </div>
 
                 </div>
 
                 <form id="SBbfxKcbbJgkcmx-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>机构ID: </label>
 
+                            <label>机构ID:</label>
 
                             <input type="text" class="styled-input" name="organizationId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品ID: </label>
 
+                            <label>商品ID:</label>
 
                             <input type="text" class="styled-input" name="productId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品名称: </label>
 
+                            <label>商品名称:</label>
 
                             <input type="text" class="styled-input" name="productName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品编码: </label>
 
+                            <label>商品编码:</label>
 
                             <input type="text" class="styled-input" name="productCode" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>商品类别: </label>
 
+                            <label>商品类别:</label>
 
                             <input type="text" class="styled-input" name="category" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>供应商: </label>
 
+                            <label>供应商:</label>
 
                             <input type="text" class="styled-input" name="supplier" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>库存数量: </label>
 
+                            <label>库存数量:</label>
 
                             <input type="text" class="styled-input" name="stockQuantity" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>再订货水平: </label>
 
+                            <label>再订货水平:</label>
 
                             <input type="text" class="styled-input" name="reorderLevel" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后库存检查时间: </label>
 
+                            <label>最后库存检查时间:</label>
 
                             <input type="text" class="styled-input" name="lastStockCheckTime" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后编辑人: </label>
 
+                            <label>最后编辑人:</label>
 
                             <input type="text" class="styled-input" name="lastEditor" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>最后编辑时间: </label>
 
+                            <label>最后编辑时间:</label>
 
                             <input type="text" class="styled-input" name="lastEditTime" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
@@ -92,8 +88,8 @@
 
                 </a>
 
             </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>
 
@@ -101,6 +97,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')}]];
 
@@ -143,6 +140,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/bbfx/SBbfxKcbbJgkcmxPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SBbfxKcbbJgkcmx-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SCgxsCfdjPrescriptionRecord-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 9 - 9
health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordList.html
Voir le fichier 

@@ -21,17 +21,13 @@
 
                     </div>
 
                 </div>
 
                 <form id="SCgxsCfdjPrescriptionRecord-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>销售单号: </label>
 
+                            <label>销售单号:</label>
 
                             <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
 
                         </div>
 
                             <!--<li>
 
-                                销售时间: </label>
 
+                                销售时间:</label>
 
                             <input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
 
                             </li>-->
 
                         <div class="customize-form-group select-time">
 
@@ -62,8 +58,8 @@
 
                 </a>
 
             </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>
 
@@ -71,6 +67,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')}]];
 
@@ -113,6 +110,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/cgxs/SCgxsCfdjPrescriptionRecordPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SCgxsCfdjPrescriptionRecord-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SCgxsTgypTgypdj-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 9 - 9
health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjList.html
Voir le fichier 

@@ -21,17 +21,13 @@
 
                     </div>
 
                 </div>
 
                 <form id="SCgxsTgypTgypdj-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>销售单号: </label>
 
+                            <label>销售单号:</label>
 
                             <input type="text" class="styled-input" name="saleOrderNumber" autocomplete="off"/>
 
                         </div>
 
                             <!--<li>
 
-                                销售时间: </label>
 
+                                销售时间:</label>
 
                             <input type="text" class="styled-input" name="saleTime" autocomplete="off"/>
 
                             </li>-->
 
                         <div class="customize-form-group select-time">
 
@@ -62,8 +58,8 @@
 
                 </a>
 
             </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>
 
@@ -71,6 +67,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')}]];
 
@@ -113,6 +110,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/cgxs/SCgxsTgypTgypdjPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SCgxsTgypTgypdj-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/daas/SDaasChannelManagementEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDaasChannelManagement-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 14 - 14
health-admin/src/main/resources/templates/daas/SDaasChannelManagementList.html
Voir le fichier 

@@ -22,12 +22,8 @@
 
                 </div>
 
                 <form id="SDaasChannelManagement-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>渠道名称: </label>
 
+                            <label>渠道名称:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入渠道名称" name="channelName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -40,11 +36,11 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>联系人: </label>
 
+                            <label>联系人:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入联系人" name="contactPerson" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>联系电话: </label>
 
+                            <label>联系电话:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入联系电话" name="contactPhone" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -55,11 +51,11 @@
 
                                     <option value="启用">停用</option>
 
                                 </select>
 
                         </div>
 
-                        <div class="customize-form-group">
 
-                                <label>创建时间:</label>
 
-                                <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="beginTime"/>
 
-                                <span>-</span>
 
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
 
+                        <div class="customize-form-group select-time">
 
+                            <label>创建时间:</label>
 
+                            <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="params[beginTime]">
 
+                            <span>-</span>
 
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
 
                         </div>
 
                     </div>
 
                 </form>
 
@@ -77,8 +73,8 @@
 
                 </a>
 
             </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>
 
@@ -86,6 +82,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')}]];
 
@@ -128,6 +125,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/daas/SDaasChannelManagementPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDaasChannelManagement-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglFpglDsfzfkp-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 7 - 7
health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpList.html
Voir le fichier 

@@ -22,12 +22,8 @@
 
                 </div>
 
                 <form id="SDdglFpglDsfzfkp-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>订单号: </label>
 
+                            <label>订单号:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入订单号" name="orderNo" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -54,8 +50,8 @@
 
 
 
 
-            <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>
 
@@ -63,6 +59,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')}]];
 
@@ -105,6 +102,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [
 
                 { field: 'id', title: '主键', align: 'center' ,visible:false},
 
                     { field: 'orderNo', title: '订单号', align: 'center' },

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglFpglDsfzfkpPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglFpglDsfzfkp-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglFpglInvoiceinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 15 - 15
health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoList.html
Voir le fichier 

@@ -22,44 +22,40 @@
 
                 </div>
 
                 <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>订单号: </label>
 
+                            <label>订单号:</label>
 
                             <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>发票类型: </label>
 
+                            <label>发票类型:</label>
 
                             <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>抬头类型: </label>
 
+                            <label>抬头类型:</label>
 
                             <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>开票类型: </label>
 
+                            <label>开票类型:</label>
 
                             <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>店铺名称: </label>
 
+                            <label>店铺名称:</label>
 
                             <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>审核类型: </label>
 
+                            <label>审核类型:</label>
 
                             <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>审核状态: </label>
 
+                            <label>审核状态:</label>
 
                             <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>开票状态: </label>
 
+                            <label>开票状态:</label>
 
                             <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>创建时间: </label>
 
+                            <label>创建时间:</label>
 
                             <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
 
                             </div>
 
                     </div>
 
@@ -80,8 +76,8 @@
 
                     <i class="fa fa-success"></i>批量开发票
 
                 </a>
 
             </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>
 
@@ -89,6 +85,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')}]];
 
@@ -131,6 +128,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglFpglInvoiceinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglFpglInvoiceinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 16 - 16
health-admin/src/main/resources/templates/ddgl/SDdglFpglinvoice.html
Voir le fichier 

@@ -21,45 +21,41 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDdglFpglInvoiceinfo-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>订单号: </label>
 
+                            <label>订单号:</label>
 
                             <input type="text" class="styled-input" name="orderNo" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>发票类型: </label>
 
+                            <label>发票类型:</label>
 
                             <input type="text" class="styled-input" name="invoiceType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>抬头类型: </label>
 
+                            <label>抬头类型:</label>
 
                             <input type="text" class="styled-input" name="headerType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>开票类型: </label>
 
+                            <label>开票类型:</label>
 
                             <input type="text" class="styled-input" name="billingType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>店铺名称: </label>
 
+                            <label>店铺名称:</label>
 
                             <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>审核类型: </label>
 
+                            <label>审核类型:</label>
 
                             <input type="text" class="styled-input" name="auditType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>审核状态: </label>
 
+                            <label>审核状态:</label>
 
                             <input type="text" class="styled-input" name="auditStatus" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>开票状态: </label>
 
+                            <label>开票状态:</label>
 
                             <input type="text" class="styled-input" name="billingStatus" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>创建时间: </label>
 
+                            <label>创建时间:</label>
 
                             <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
 
                             </div>
 
                     </div>
 
@@ -67,8 +63,8 @@
 
             </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>
 
@@ -76,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')}]];
 
@@ -118,6 +115,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglOrderStore-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 11 - 11
health-admin/src/main/resources/templates/ddgl/SDdglOrderStoreList.html
Voir le fichier 

@@ -22,22 +22,18 @@
 
                 </div>
 
                 <form id="SDdglOrderStore-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group select-time">
 
-                            <label for="startTime">订单日期:</label>
 
+                            <label>订单日期:</label>
 
                             <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]">
 
                             <span>-</span>
 
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>订单号: </label>
 
+                            <label>订单号:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入订单号" name="orderId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                                <label>配送类型</label>
 
+                                <label>配送类型:</label>
 
                                 <select name="deliveryType"  class="styled-input">
 
                                     <option value="">全部</option>
 
                                     <option value="自提">自提</option>
 
@@ -45,7 +41,7 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                                <label>渠道名称</label>
 
+                                <label>渠道名称:</label>
 
                                 <select name="channelName"  class="styled-input">
 
                                     <option value="">全部</option>
 
                                     <option value="药急送">药急送</option>
 
@@ -56,7 +52,7 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                                <label>订单状态</label>
 
+                                <label>订单状态:</label>
 
                                 <select name="orderStatus"  th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
 
                                     <option value="">全部</option>
 
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
@@ -85,8 +81,8 @@
 
                 </a>
 
             </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>
 
@@ -94,6 +90,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')}]];
 
@@ -136,6 +133,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/ddgl/SDdglOrderStorePageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDdglOrderStore-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 6 - 6
health-admin/src/main/resources/templates/demo/table/fixedColumns.html
Voir le fichier 

@@ -42,23 +42,23 @@
 
 		            checkbox: true
 
 		        },
 
 				{
 
-					field : 'userId', 
+					field : 'userId',
 
 					title : '用户ID'
 
 				},
 
 				{
 
-					field : 'userCode', 
+					field : 'userCode',
 
 					title : '用户编号'
 
 				},
 
 				{
 
-					field : 'userName', 
+					field : 'userName',
 
 					title : '用户姓名'
 
 				},
 
 				{
 
-					field : 'userPhone', 
+					field : 'userPhone',
 
 					title : '用户手机'
 
 				},
 
 				{
 
-					field : 'userEmail', 
+					field : 'userEmail',
 
 					title : '用户邮箱'
 
 				},
 
 				{
 
@@ -142,4 +142,4 @@
 
         });
 
     </script>
 
 </body>
 
-</html>
 
+</html>

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpRwglBusinesstask-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 15 - 15
health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskList.html
Voir le fichier 

@@ -22,44 +22,40 @@
 
                 </div>
 
                 <form id="SDtpRwglBusinesstask-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>业务归属: </label>
 
+                            <label>业务归属:</label>
 
                             <input type="text" class="styled-input" name="businessBelonging" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>任务类型: </label>
 
+                            <label>任务类型:</label>
 
                             <input type="text" class="styled-input" name="taskType" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>患者姓名: </label>
 
+                            <label>患者姓名:</label>
 
                             <input type="text" class="styled-input" name="patientName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>创建时间: </label>
 
+                            <label>创建时间:</label>
 
                             <input type="text" class="styled-input" name="createTime" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>完成时间: </label>
 
+                            <label>完成时间:</label>
 
                             <input type="text" class="styled-input" name="completeTime" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>跟进人: </label>
 
+                            <label>跟进人:</label>
 
                             <input type="text" class="styled-input" name="follower" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>门店: </label>
 
+                            <label>门店:</label>
 
                             <input type="text" class="styled-input" name="store" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>连锁: </label>
 
+                            <label>连锁:</label>
 
                             <input type="text" class="styled-input" name="chain" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>状态: </label>
 
+                            <label>状态:</label>
 
                             <input type="text" class="styled-input" name="status" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
@@ -84,8 +80,8 @@
 
                 </a>
 
             </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>
 
@@ -93,6 +89,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')}]];
 
@@ -135,6 +132,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpRwglBusinesstaskPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpRwglBusinesstask-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpSjdcFollowUpStatistics-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 11 - 11
health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsList.html
Voir le fichier 

@@ -21,13 +21,9 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpSjdcFollowUpStatistics-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>跟进人: </label>
 
+                            <label>跟进人:</label>
 
                             <input type="text" class="styled-input" name="follower" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group select-time">
 
@@ -37,15 +33,15 @@
 
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>业务归属: </label>
 
+                            <label>业务归属:</label>
 
                             <input type="text" class="styled-input" name="patientCount" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>门店: </label>
 
+                            <label>门店:</label>
 
                             <input type="text" class="styled-input" name="storeName" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
@@ -58,8 +54,8 @@
 
                 </a>
 
             </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>
 
@@ -67,6 +63,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')}]];
 
@@ -109,6 +106,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpSjdcFollowUpStatisticsPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpSjdcFollowUpStatistics-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpSjdcQualityInspectionTask-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 14 - 13
health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskList.html
Voir le fichier 

@@ -21,25 +21,21 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpSjdcQualityInspectionTask-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>连锁ID: </label>
 
+                            <label>连锁ID:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入连锁ID" name="query" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>连锁id: </label>
 
+                            <label>连锁id:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入连锁ID" name="chainName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>门店id: </label>
 
+                            <label>门店id:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入连锁ID" name="storeName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>质检状态:</label>>
 
+                            <label>质检状态:</label>
 
                                 <select name="inspectionStatus"  class="styled-input">
 
                                     <option value="">全部</option>
 
                                     <option value="进行中">进行中</option>
 
@@ -55,8 +51,9 @@
 
                         </div>
 
                         <div class="customize-form-group">
 
                             <label>分数范围:</label>
 
-                            <input type="number" class="styled-input" placeholder="最大" name="maxInspectionScore" autocomplete="off"/>-
 
-                            <input type="number" class="styled-input" placeholder="最小" name="minInspectionScore" autocomplete="off"/>
 
+                            <input type="number" class="styled-input" style="width: 92px;" placeholder="最大" name="maxInspectionScore" autocomplete="off"/>
 
+                            <span style="margin: 5px 5px;">-</span>
 
+                            <input type="number" class="styled-input" style="width: 92px;" placeholder="最小" name="minInspectionScore" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
                 </form>
 
@@ -68,8 +65,8 @@
 
                 </a>
 
             </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>
 
@@ -77,6 +74,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')}]];
 
@@ -119,6 +117,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpSjdcQualityInspectionTaskPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpSjdcQualityInspectionTask-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 1
health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordAdd.html
Voir le fichier 

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

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzCallWord-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -34,7 +31,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">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>创建时间:</label>

+ 7 - 7
health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordList.html
Voir le fichier 

@@ -21,11 +21,7 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpYypzCallWord-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <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">
 
@@ -51,8 +47,8 @@
 
 
             </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>
 
@@ -60,6 +56,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')}]];
 
@@ -102,6 +99,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzCallWordPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzCallWord-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">
 
@@ -34,7 +31,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">
 
                     </div>
 
                     <div class="customize-form-group">
 
                             <label>创建时间:</label>

+ 1 - 1
health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementAdd.html
Voir le fichier 

@@ -38,7 +38,7 @@
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>状态:</label>
 
-                <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
 
+                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>最后编辑时间:</label>

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFaqManagement-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -42,7 +39,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">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>最后编辑时间:</label>

+ 9 - 9
health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementList.html
Voir le fichier 

@@ -21,11 +21,7 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpYypzFaqManagement-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <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">
 
@@ -43,7 +39,7 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>问答摘要: </label>
 
+                            <label>问答摘要:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入问答摘要" name="summary" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -78,8 +74,8 @@
 
                 </a>
 
             </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>
 
@@ -87,6 +83,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')}]];
 
@@ -129,6 +126,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },
 
@@ -140,7 +140,7 @@
 
                     { field: 'answerContent', title: '回答内容', align: 'center' },
 
                     { field: 'applicableDrugs', title: '适用药品', align: 'center' },
 
                     { field: 'sortWeight', title: '排序权重', align: 'center' },
 
-                    { field: 'status', title: '状态：启用，禁用', align: 'center' },
 
+                    { field: 'status', title: '状态', align: 'center' },
 
                     { field: 'lastEditTime', title: '最后编辑时间', align: 'center' },
 
                     { field: 'lastEditor', title: '最后编辑人', align: 'center' },

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFaqManagementPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFaqManagement-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">
 
@@ -42,7 +39,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">
 
                     </div>
 
                     <div class="customize-form-group">
 
                             <label>最后编辑时间:</label>

+ 1 - 1
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopAdd.html
Voir le fichier 

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

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFollowUpSop-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -34,7 +31,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">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>创建时间:</label>

+ 10 - 10
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopList.html
Voir le fichier 

@@ -21,11 +21,7 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpYypzFollowUpSop-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
                             <label>业务归属:</label>
 
                                 <select name="businessBelonging"  class="styled-input">
 
@@ -35,15 +31,15 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="drug" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>模板名称: </label>
 
+                            <label>模板名称:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>模版ID: </label>
 
+                            <label>模版ID:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入模版ID" name="templateId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group select-time">
 
@@ -77,8 +73,8 @@
 
                 </a>
 
             </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>
 
@@ -86,6 +82,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')}]];
 
@@ -128,6 +125,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpSopPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFollowUpSop-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">
 
@@ -34,7 +31,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">
 
                     </div>
 
                     <div class="customize-form-group">
 
                             <label>创建时间:</label>

+ 1 - 1
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateAdd.html
Voir le fichier 

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

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFollowUpTemplate-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -46,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">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>创建时间:</label>

+ 11 - 11
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplateList.html
Voir le fichier 

@@ -21,25 +21,21 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpYypzFollowUpTemplate-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>关联药品: </label>
 
+                            <label>关联药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码" name="query" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>模板名称: </label>
 
+                            <label>模板名称:</label>
 
                             <input type="text" class="styled-input"  placeholder="请输入模板名称" name="templateName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>模版ID: </label>
 
+                            <label>模版ID:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入模版ID"  name="templateId" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -75,8 +71,8 @@
 
                 </a>
 
             </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>
 
@@ -84,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:pmService:edit')}]];
 
@@ -126,6 +123,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 13 - 16
health-admin/src/main/resources/templates/dtp/SDtpYypzFollowUpTemplatePageEdit.html
Voir le fichier 

@@ -6,54 +6,51 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzFollowUpTemplate-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">
 
-                            <label>药品:</label>
 
+                        <label>药品:</label>
 
                         <input name="drug" placeholder="药品" th:value="${drug}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>事件标签:</label>
 
+                        <label>事件标签:</label>
 
                         <input name="eventTag" placeholder="事件标签" th:value="${eventTag}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>模版ID:</label>
 
+                        <label>模版ID:</label>
 
                         <input name="templateId" placeholder="模版ID" th:value="${templateId}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>模板名称:</label>
 
+                        <label>模板名称:</label>
 
                         <input name="templateName" placeholder="模板名称" th:value="${templateName}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>任务数:</label>
 
+                        <label>任务数:</label>
 
                         <input name="taskCount" placeholder="任务数" th:value="${taskCount}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>业务域:</label>
 
+                        <label>业务域:</label>
 
                         <input name="businessDomain" placeholder="业务域" th:value="${businessDomain}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>创建人:</label>
 
+                        <label>创建人:</label>
 
                         <input name="createdBy" placeholder="创建人" th:value="${createdBy}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>更新人:</label>
 
+                        <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">
 
+                        <label>状态:</label>
 
+                        <input name="status" placeholder="状态：" th:value="${status}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>创建时间:</label>
 
+                        <label>创建时间:</label>
 
                         <input name="createdTime" placeholder="创建时间" th:value="${createdTime}" class="styled-input" type="text">
 
                     </div>
 
                     <div class="customize-form-group">
 
-                            <label>更新时间:</label>
 
+                        <label>更新时间:</label>
 
                         <input name="updatedTime" placeholder="更新时间" th:value="${updatedTime}" class="styled-input" type="text">
 
                     </div>
 
         </div>

+ 1 - 1
health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktAdd.html
Voir le fichier 

@@ -34,7 +34,7 @@
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>状态:</label>
 
-                <input name="status" placeholder="状态：启用，禁用"  id="status" class="styled-input" type="text">
 
+                <input name="status" placeholder="状态："  id="status" class="styled-input" type="text">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>最后操作时间:</label>

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzVerbalTrickt-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -38,7 +35,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">
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>最后操作时间:</label>

+ 8 - 8
health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktList.html
Voir le fichier 

@@ -31,11 +31,7 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpYypzVerbalTrickt-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <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">
 
@@ -45,7 +41,7 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>话术主题: </label>
 
+                            <label>话术主题:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入话术主题" name="scriptTheme" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -90,8 +86,8 @@
 
 
             </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>
 
@@ -99,6 +95,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')}]];
 
@@ -141,6 +138,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 2 - 5
health-admin/src/main/resources/templates/dtp/SDtpYypzVerbalTricktPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpYypzVerbalTrickt-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">
 
@@ -38,7 +35,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">
 
                     </div>
 
                     <div class="customize-form-group">
 
                             <label>最后操作时间:</label>

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxDrugInstructions-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 9 - 9
health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsList.html
Voir le fichier 

@@ -21,17 +21,13 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpZskcxDrugInstructions-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入商品名/通用名/MDM编码"  name="query" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>生产厂家: </label>
 
+                            <label>生产厂家:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入生产厂家"  name="manufacturer" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -59,8 +55,8 @@
 
 
             </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>
 
@@ -68,6 +64,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')}]];
 
@@ -110,6 +107,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxDrugInstructionsPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxDrugInstructions-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxFollowUpGuidance-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 11 - 11
health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidanceList.html
Voir le fichier 

@@ -21,13 +21,9 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpZskcxFollowUpGuidance-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>标题: </label>
 
+                            <label>标题:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入标题" name="title" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -41,15 +37,15 @@
 
                                 </select>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>关联药品: </label>
 
+                            <label>关联药品:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入关联药品" name="associatedDrugs" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>关联疾病: </label>
 
+                            <label>关联疾病:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入关联疾病" name="associatedDiseases" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>创建人: </label>
 
+                            <label>创建人:</label>
 
                             <input type="text" class="styled-input" placeholder="请输入创建人" name="createdBy" autocomplete="off"/>
 
                             </div>
 
                     </div>
 
@@ -71,8 +67,8 @@
 
                 </a>
 
             </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>
 
@@ -80,6 +76,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')}]];
 
@@ -122,6 +119,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxFollowUpGuidancePageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxFollowUpGuidance-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxPharmaceuticalShare-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 8 - 8
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalShareList.html
Voir le fichier 

@@ -21,13 +21,9 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpZskcxPharmaceuticalShare-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
@@ -43,8 +39,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>
 
@@ -52,6 +48,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')}]];
 
@@ -94,6 +91,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmaceuticalSharePageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxPharmaceuticalShare-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxPharmacovigilance-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 8 - 8
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilanceList.html
Voir le fichier 

@@ -21,21 +21,17 @@
 
                     </div>
 
                 </div>
 
                 <form id="SDtpZskcxPharmacovigilance-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>药品: </label>
 
+                            <label>药品:</label>
 
                             <input type="text" class="styled-input"  placeholder="请输入关键字" name="name" autocomplete="off"/>
 
                         </div>
 
                     </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>
 
@@ -43,6 +39,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')}]];
 
@@ -85,6 +82,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/dtp/SDtpZskcxPharmacovigilancePageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SDtpZskcxPharmacovigilance-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 62 - 65
health-admin/src/main/resources/templates/dtp/cold/cold.html
Voir le fichier 

@@ -6,7 +6,6 @@
 
 	<th:block th:include="include :: ztree-css" />
 
 </head>
 
 <body class="gray-bg">
 
-
 
 	<div class="ui-layout-center">
 
 		<div class="container-div">
 
 			<div class="row">
 
@@ -18,68 +17,63 @@
 
 							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
 					</div>
 
-					<form id="user-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-		                <input type="hidden" id="parentId" name="parentId">
 
-						<div class="select-list">
 
-							<ul>
 
-								<li  class="select-time">
 
-									<label>创建日期</label>
 
-									<input type="text" class="time-input" id="creationTimeStart" placeholder="开始时间" name="creationTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="creationTimeEnd" placeholder="结束时间" name="creationTimeEnd"/>
 
-								</li>
 
-								<li  class="select-time">
 
-									<label>实际送达</label>
 
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="actualDeliveryTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="actualDeliveryTimeEnd"/>
 
-								</li>
 
-								<li>
 
-									<label>订单号：</label>
 
-									                            <input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
 
-								</li>
 
-								<li>
 
-									<label>配送员：</label>
 
-									                            <input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
 
-								</li>
 
-								<li>
 
-									<label>收货人：</label>
 
-									                            <input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
 
-								</li>
 
-								<li>
 
-									<label>收货电话：</label>
 
-								                            <input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
 
-								</li>
 
-								<li>
 
-									<label>配送状态:</label>
 
-									<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									<label>所属连锁:</label>
 
-										<input name="chainName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 
-								</li>
 
-								<li>
 
-									<label>冷链类型:</label>
 
-									<select name="coldChainType"  th:with="type=${@dict.getType('sys_select_cold_type')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
-												></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									<label>付款顺序:</label>
 
-									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
-										></option>
 
-									</select>
 
-								</li>
 
-
 
-							</ul>
 
+					<form id="user-form" class="customize-search-form">
 
+						<div class="customize-form-group-container">
 
+							<div class="customize-form-group select-time">
 
+								<label>创建日期:</label>
 
+								<input type="text" class="time-input" id="creationTimeStart" placeholder="开始时间" name="creationTimeStart"/>
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="creationTimeEnd" placeholder="结束时间" name="creationTimeEnd"/>
 
+							</div>
 
+							<div class="customize-form-group select-time">
 
+								<label>实际送达:</label>
 
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="actualDeliveryTimeStart"/>
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="actualDeliveryTimeEnd"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>订单号:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>配送员:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>收货人:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>收货电话:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>配送状态:</label>
 
+								<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
+								</select>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>所属连锁:</label>
 
+								<input name="chainName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>冷链类型:</label>
 
+								<select name="coldChainType"  th:with="type=${@dict.getType('sys_select_cold_type')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+									></option>
 
+								</select>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>付款顺序:</label>
 
+								<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+									></option>
 
+								</select>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -102,8 +96,8 @@
 
 			        </a>
 
 		        </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>
 
@@ -151,6 +145,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 21 - 13
health-admin/src/main/resources/templates/dtp/configInfo/AssociatedPrescription.html
Voir le fichier 

@@ -11,19 +11,23 @@
 
 	<div class="container-div">
 
 		<div class="row">
 
 			<div class="col-sm-12 search-collapse">
 
-				<form id="tag-form">
 
-					<input type="hidden" id="deptId" name="deptId">
 
-					<input type="hidden" id="parentId" name="parentId">
 
-					<div class="select-list">
 
-						<ul>
 
-							<li>
 
-								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
-							</li>
 
-							<li>
 
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-							</li>
 
-						</ul>
 
+				<div class="query-condition-container">
 
+					<h4 class="query-condition-title">查询条件</h4>
 
+					<div class="query-buttons">
 
+						<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+						<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+					</div>
 
+				</div>
 
+				<form id="tag-form"  class="customize-search-form">
 
+					<div class="customize-form-group-container">
 
+					</div>
 
+					<div class="customize-form-group-container">
 
+					</div>
 
+					<div class="customize-form-group-container">
 
+						<div class="customize-form-group">
 
+							<label>医院名称:</label>
 
+							<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
+						</div>
 
 					</div>
 
 				</form>
 
 			</div>
 
@@ -36,6 +40,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 GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
 
@@ -68,6 +73,9 @@
 
 			showFooter:true,  //是否显示表格底部区域。
 
 			clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 			singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 			columns: [
 
 				{
 
 					field: "id",

+ 31 - 31
health-admin/src/main/resources/templates/dtp/configInfo/drugList.html
Voir le fichier 

@@ -18,35 +18,32 @@
 
 							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
 					</div>
 
-					<form id="user-form">
 
-						<div class="select-list">
 
-							<ul>
 
-
 
-								<li>
 
-									<label>配送时间 </label>
 
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="deliveryTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="deliveryTimeEnd"/>
 
-								</li>
 
-								<li>
 
-									<label style="width: 90px; float: left;">打印申请时间 </label>
 
-									<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="printRequestTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="printRequestTimeEnd"/>
 
-								</li>
 
-								<li>
 
-									<label>配送人： </label>
 
-									<input type="text"  placeholder="请输入配送人姓名" name="deliverer"/>
 
-								</li>
 
-								<li>
 
-									<label>打印状态:</label>
 
-									<select name="status"  th:with="type=${@dict.getType('sys_select_print_status')}">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
-												></option>
 
-									</select>
 
-								</li>
 
-							</ul>
 
+					<form id="user-form"  class="customize-search-form">
 
+						<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]"><!--deliveryTimeStart-->
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"><!--deliveryTimeEnd-->
 
+							</div>
 
+							<div class="customize-form-group select-time">
 
+								<label>打印申请时间:</label>
 
+								<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="params[beginTime]"/>
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="params[endTime]"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>配送人:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入配送人姓名" name="deliverer"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>打印状态:</label>
 
+								<select name="status" class="styled-input" th:with="type=${@dict.getType('sys_select_print_status')}">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+									></option>
 
+								</select>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -63,8 +60,8 @@
 
 			        </a>
 
 		        </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>
 
@@ -111,6 +108,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 24 - 13
health-admin/src/main/resources/templates/dtp/configInfo/dtpHospital.html
Voir le fichier 

@@ -11,19 +11,23 @@
 
 	<div class="container-div">
 
 		<div class="row">
 
 			<div class="col-sm-12 search-collapse">
 
-				<form id="tag-form">
 
-					<input type="hidden" id="deptId" name="deptId">
 
-					<input type="hidden" id="parentId" name="parentId">
 
-					<div class="select-list">
 
-						<ul>
 
-							<li>
 
-								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
-							</li>
 
-							<li>
 
-								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-							</li>
 
-						</ul>
 
+				<div class="query-condition-container">
 
+					<h4 class="query-condition-title">查询条件</h4>
 
+					<div class="query-buttons">
 
+						<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+						<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+					</div>
 
+				</div>
 
+				<form id="tag-form"  class="customize-search-form">
 
+					<div class="customize-form-group-container">
 
+					</div>
 
+					<div class="customize-form-group-container">
 
+					</div>
 
+					<div class="customize-form-group-container">
 
+						<div class="customize-form-group">
 
+							<label>医院名称:</label>
 
+							<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
+						</div>
 
 					</div>
 
 				</form>
 
 			</div>
 
@@ -36,6 +40,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 GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
 
@@ -68,6 +73,12 @@
 
 			showFooter:true,  //是否显示表格底部区域。
 
 			clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 			singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 			columns: [
 
 				{
 
 					field: "id",

+ 26 - 20
health-admin/src/main/resources/templates/dtp/configInfo/storeTag.html
Voir le fichier 

@@ -11,29 +11,32 @@
 
 		<div class="container-div">
 
 			<div class="row">
 
 				<div class="col-sm-12 search-collapse">
 
-					<form id="tag-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-						<input type="hidden" id="parentId" name="parentId">
 
-						<div class="select-list">
 
-							<ul>
 
-								<li>
 
-									MDM编码：<input type="text"  class="styled-input" placeholder="请输入MDM编码" name="mdmCode"/>
 
-								</li>
 
-								<li>
 
-									<label>门店:</label>
 
-									<input name="storeName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 
-								</li>
 
-
 
-								<li>
 
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-								</li>
 
-							</ul>
 
+					<div class="query-condition-container">
 
+						<h4 class="query-condition-title">查询条件</h4>
 
+						<div class="query-buttons">
 
+							<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+						</div>
 
+					</div>
 
+					<form id="tag-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="query"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>MDM编码:</label>
 
+								<input type="text"  class="styled-input" placeholder="请输入MDM编码" name="mdmCode"/>
 
+							</div>
 
+							<div class="customize-form-group">>
 
+								<label>门店:</label>
 
+								<input name="storeName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 
+							</div>
 
 						</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>
 
@@ -74,6 +77,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [
 
 					{
 
 						field: "id",

+ 81 - 109
health-admin/src/main/resources/templates/dtp/followUp/followUpList.html
Voir le fichier 

@@ -5,33 +5,6 @@
 
 	<th:block th:include="include :: layout-latest-css" />
 
 	<th:block th:include="include :: ztree-css" />
 
 </head>
 
-<style>
 
-	/* 设置 ul 的基本样式 */
 
-	ul {
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(5, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul{
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(4, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul li{
 
-		/*padding: 10px;*/ /* 内边距 */
 
-		text-align: left; /* 文本居中 */
 
-	}
 
-
 
-	/* 设置 li 的基本样式 */
 
-	li {
 
-		/*background-color: lightblue; *//* 背景颜色 */
 
-		/*padding: 1px; !* 内边距 *!*/
 
-		text-align: right; /* 文本居中 */
 
-	}
 
-</style>
 
-
 
 <body class="gray-bg">
 
 	<div class="ui-layout-center">
 
 		<div class="container-div">
 
@@ -44,93 +17,89 @@
 
 							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
 					</div>
 
-					<form id="followUp-form">
 
+					<form id="followUp-form" class="customize-search-form">
 
 						<input type="hidden" id="deptId" name="deptId">
 
 		                <input type="hidden" id="parentId" name="parentId">
 
+						<div class="customize-form-group-container">
 
+							<div class="customize-form-group">
 
+								<label>患者信息:</label>
 
+								<input type="text" class="styled-input" name="patientName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>药品:</label>
 
+								<input type="text"  class="styled-input" name="genericName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>预约日期:</label>
 
+								<input type="text" disabled="" class="styled-input time-input" id="t" placeholder="预约日期" name="appointmentDate"  required/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>任务跟进人:</label>
 
+								<input type="text"  class="styled-input" name="taskFollower"/>
 
+							</div>
 
 
-						<div class="select-list" >
 
-							<ul>
 
-								<li>
 
-									患者信息：                            <input type="text" class="styled-input" name="patientName"/>
 
-								</li>
 
-								<li>
 
-									药品：<input type="text"  class="styled-input" name="genericName"/>
 
-								</li>
 
-								<li>
 
-									预约日期：
 
-									<input type="text" disabled="" class="styled-input time-input" id="t" placeholder="预约日期" name="appointmentDate"  required/>
 
-								</li>
 
-								<li>
 
-									任务跟进人：<input type="text"  class="styled-input" name="taskFollower"/>
 
-								</li>
 
-
 
-							</ul>
 
-						</div>
 
-
 
-						<div class="ul-list select-list">
 
-							<ul>
 
-								<li>
 
-									门店：<input type="text"  class="styled-input" name="storeName"/>
 
-								</li>
 
-								<li>
 
-									任务状态：
 
-									<select name="flipStatus"  disabled="" class="styled-input" th:with="type=${@dict.getType('sys_up_yes_no')}" >
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									最后外呼状态：
 
-									<select name="followUpStatus" class="styled-input" th:with="type=${@dict.getType('sys_follow_up_visit')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									最后外呼标记：
 
+							<div class="customize-form-group">
 
+								<label>门店:</label>
 
+								<input type="text"  class="styled-input" name="storeName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>任务状态:</label>
 
+								<select name="flipStatus"  disabled="" class="styled-input" th:with="type=${@dict.getType('sys_up_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>
 
+								<select name="followUpStatus" class="styled-input" th:with="type=${@dict.getType('sys_follow_up_visit')}">
 
+									<option value="">所有</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
+								</select>
 
+							</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>
 
-								</li>
 
-							</ul>
 
-							<ul>
 
-								<li>
 
-									下次外呼时间：<input type="text" class="styled-input time-input" id="updateTime" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
 
-								</li>
 
-								<li>
 
-									疾病：<input type="text"  class="styled-input" name="disease"/>
 
-								</li>
 
-								<li>
 
-									随访小结：
 
-									<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									完成日期：<input type="text"  disabled="" class="styled-input time-input" id="a" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
 
-								</li>
 
-							</ul>
 
-							<ul>
 
-								<li>
 
-									任务主题：
 
-									<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									任务名称：<input type="text"  class="styled-input" name="taskName"/>
 
-								</li>
 
-								<li>
 
-									业务归属：
 
-									<select name="gender" class="styled-input" disabled="" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-							</ul>
 
+							</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')}">
 
+									<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"  disabled="" class="styled-input time-input" id="a" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>任务主题:</label>
 
+								<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
 
+									<option value="">所有</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
+								</select>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>任务名称:</label>
 
+								<input type="text"  class="styled-input" name="taskName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>业务归属:</label>
 
+								<select name="gender" class="styled-input" disabled="" th:with="type=${@dict.getType('sys_user_sex')}">
 
+									<option value="">所有</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
+								</select>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -153,8 +122,8 @@
 
 			        </a>-->
 
 		        </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>
 
@@ -204,6 +173,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 35 - 119
health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignList.html
Voir le fichier 

@@ -7,128 +7,41 @@
 
 	<th:block th:include="include :: layout-latest-css" />
 
 	<th:block th:include="include :: ztree-css" />
 
 </head>
 
-<style>
 
-	/* 设置 ul 的基本样式 */
 
-	ul {
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(5, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul{
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(4, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul li{
 
-		/*padding: 10px;*/ /* 内边距 */
 
-		text-align: left; /* 文本居中 */
 
-	}
 
-
 
-	/* 设置 li 的基本样式 */
 
-	li {
 
-		/*background-color: lightblue; *//* 背景颜色 */
 
-		/*padding: 1px; !* 内边距 *!*/
 
-		text-align: right; /* 文本居中 */
 
-	}
 
-</style>
 
-
 
 <body class="gray-bg">
 
 	<div class="ui-layout-center">
 
 		<div class="container-div">
 
 			<div class="row">
 
-				<div class="col-sm-12 search-collapse" >
 
-					<form id="followUpAssign-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-		                <input type="hidden" id="parentId" name="parentId">
 
-
 
-						<div class="select-list" >
 
-							<ul>
 
-								<li>
 
-									患者信息：<input type="text" class="styled-input" name="patientName" autocomplete="off"/>
 
-								</li>
 
-								<li>
 
-									门店：<input type="text" class="styled-input" name="storeName"/>
 
-								</li>
 
-								<li>
 
-									药品：<input type="text"  class="styled-input" name="medicineName"/>
 
-								</li>
 
-								<li>
 
-									随访跟进人：<input type="text"  class="styled-input" name="followUpPersonName"/>
 
-								</li>
 
-								<li style="text-align: center">
 
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-								</li>
 
-							</ul>
 
+				<div class="col-sm-12 search-collapse">
 
+				<div class="query-condition-container">
 
+					<h4 class="query-condition-title">查询条件</h4>
 
+					<div class="query-buttons">
 
+						<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+						<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+					</div>
 
+				</div>
 
+					<form id="followUpAssign-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="query"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>患者信息:</label>
 
+								<input type="text" class="styled-input" name="patientName" autocomplete="off"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>门店:</label>
 
+								<input type="text" class="styled-input" name="storeName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>药品:</label>
 
+								<input type="text"  class="styled-input" name="medicineName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>随访跟进人:</label>
 
+								<input type="text"  class="styled-input" name="followUpPersonName"/>
 
+							</div>
 
 						</div>
 
-
 
-						<!--<div class="ul-list select-list">
 
-							<ul>
 
-								<li>
 
-									门店：<input type="text"  class="styled-input" name="storeName"/>
 
-								</li>
 
-								<li>
 
-									任务状态：
 
-									<select name="flipStatus"  disabled="" class="styled-input" th:with="type=${@dict.getType('sys_up_yes_no')}" >
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									最后外呼状态：
 
-									<select name="followUpStatus" class="styled-input" th:with="type=${@dict.getType('sys_follow_up_visit')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									最后外呼标记：
 
-									<select name="realNameStatus" class="styled-input" th:with="type=${@dict.getType('sys_real_yes_no')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
-									</select>
 
-								</li>
 
-							</ul>
 
-							<ul>
 
-								<li>
 
-									下次外呼时间：<input type="text" class="styled-input time-input" id="updateTime" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
 
-								</li>
 
-								<li>
 
-									疾病：<input type="text"  class="styled-input" name="disease"/>
 
-								</li>
 
-								<li>
 
-									随访小结：
 
-									<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									完成日期：<input type="text"  disabled="" class="styled-input time-input" id="a" placeholder="更新时间" name="updateTime" th:value="${updateTime}" required/>
 
-								</li>
 
-							</ul>
 
-							<ul>
 
-								<li>
 
-									任务主题：
 
-									<select name="gender" class="styled-input" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									任务名称：<input type="text"  class="styled-input" name="taskName"/>
 
-								</li>
 
-								<li>
 
-									业务归属：
 
-									<select name="gender" class="styled-input" disabled="" th:with="type=${@dict.getType('sys_user_sex')}">
 
-										<option value="">所有</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" ></option>
 
-									</select>
 
-								</li>
 
-							</ul>
 
-						</div>-->
 
 					</form>
 
 				</div>
 
 
@@ -150,8 +63,8 @@
 
 			        </a>-->
 
 		        </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>
 
@@ -201,6 +114,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 31 - 56
health-admin/src/main/resources/templates/dtp/followUpEvaluation/followUpEvaluationList.html
Voir le fichier 

@@ -7,65 +7,37 @@
 
 	<th:block th:include="include :: layout-latest-css" />
 
 	<th:block th:include="include :: ztree-css" />
 
 </head>
 
-<style>
 
-	/* 设置 ul 的基本样式 */
 
-	ul {
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(5, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul{
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(4, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul li{
 
-		/*padding: 10px;*/ /* 内边距 */
 
-		text-align: left; /* 文本居中 */
 
-	}
 
-
 
-	/* 设置 li 的基本样式 */
 
-	li {
 
-		/*background-color: lightblue; *//* 背景颜色 */
 
-		/*padding: 1px; !* 内边距 *!*/
 
-		text-align: left; /* 文本居中 */
 
-	}
 
-
 
-</style>
 
-
 
 <body class="gray-bg">
 
 	<div class="ui-layout-center">
 
 		<div class="container-div">
 
 			<div class="row">
 
 				<div class="col-sm-12 search-collapse" >
 
-					<form id="followUpEvaluation-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-		                <input type="hidden" id="parentId" name="parentId">
 
-
 
-						<div class="select-list" >
 
-							<ul>
 
-								<li>
 
-									连锁店：                            <input type="text" class="styled-input" name="chainStoreName" autocomplete="off"/>
 
-								</li>
 
-								<li>
 
-									门店：                            <input type="text" class="styled-input" name="storeName"/>
 
-								</li>
 
-								<li>
 
-									评价日期：
 
-									<input type="text" disabled="" class="styled-input time-input"
 
-										   placeholder="评价日期" name="evaluationDate"  required/>
 
-								</li>
 
-								<li>
 
-									任务跟进人：<input type="text"  class="styled-input" name="taskFollower"/>
 
-								</li>
 
-
 
-								<li style="text-align: center">
 
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-								</li>
 
-							</ul>
 
+					<div class="query-condition-container">
 
+						<h4 class="query-condition-title">查询条件</h4>
 
+						<div class="query-buttons">
 
+							<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+						</div>
 
+					</div>
 
+					<form id="followUpEvaluation-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="chainStoreName" autocomplete="off"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>门店:</label>
 
+								<input type="text" class="styled-input" name="storeName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>评价日期:</label>
 
+								<input type="text" disabled="" class="styled-input time-input"
 
+									   placeholder="评价日期" name="evaluationDate"  required/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>任务跟进人:</label>
 
+								<input type="text"  class="styled-input" name="taskFollower"/>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -88,8 +60,8 @@
 
 			        </a>-->
 
 		        </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>
 
@@ -139,6 +111,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 33 - 60
health-admin/src/main/resources/templates/dtp/patientCounseling/patientCounselingList.html
Voir le fichier 

@@ -7,71 +7,41 @@
 
 	<th:block th:include="include :: layout-latest-css" />
 
 	<th:block th:include="include :: ztree-css" />
 
 </head>
 
-<style>
 
-	/* 设置 ul 的基本样式 */
 
-	ul {
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(5, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul{
 
-		list-style-type: none; /* 去掉项目符号 */
 
-		padding: 0; /* 去掉默认的内边距 */
 
-		display: grid; /* 使用网格布局 */
 
-		grid-template-columns: repeat(4, 1fr); /* 设置三列 */
 
-	}
 
-	ul-list ul li{
 
-		/*padding: 10px;*/ /* 内边距 */
 
-		text-align: left; /* 文本居中 */
 
-	}
 
-
 
-	/* 设置 li 的基本样式 */
 
-	li {
 
-		/*background-color: lightblue; *//* 背景颜色 */
 
-		/*padding: 1px; !* 内边距 *!*/
 
-		text-align: right; /* 文本居中 */
 
-	}
 
-</style>
 
-
 
 <body class="gray-bg">
 
 	<div class="ui-layout-center">
 
 		<div class="container-div">
 
 			<div class="row">
 
 				<div class="col-sm-12 search-collapse" >
 
-					<form id="patientCounseling-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-		                <input type="hidden" id="parentId" name="parentId">
 
-
 
-						<div class="select-list" >
 
-							<ul>
 
-								<li>
 
-									患者信息：                            <input type="text" class="styled-input" name="patientName" autocomplete="off"/>
 
-								</li>
 
-								<li>
 
-									疾病：                            <input type="text" class="styled-input" name="disease"/>
 
-								</li>
 
-								<li>
 
-									咨询问题：<input type="text"  class="styled-input" name="consultationQuestion"/>
 
-								</li>
 
-								<li>
 
-									问题类型：<input type="text"  class="styled-input" name="questionType"/>
 
-								</li>
 
-
 
-								<li style="text-align: center">
 
-									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-								</li>
 
-							</ul>
 
+					<div class="query-condition-container">
 
+						<h4 class="query-condition-title">查询条件</h4>
 
+						<div class="query-buttons">
 
+							<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
-						<div class="select-list" >
 
-							<ul>
 
-								<li>
 
-									药品：<input type="text"  class="styled-input" name="followUpPersonName"/>
 
-								</li>
 
-							</ul>
 
+					</div>
 
+					<form id="patientCounseling-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="patientName" autocomplete="off"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>疾病:</label>
 
+								<input type="text" class="styled-input" name="disease"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>咨询问题:</label>
 
+								<input type="text"  class="styled-input" name="consultationQuestion"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>问题类型:</label>
 
+								<input type="text"  class="styled-input" name="questionType"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>药品:</label>
 
+								<input type="text"  class="styled-input" name="followUpPersonName"/>
 
+							</div>
 
 						</div>
 
-
 
 					</form>
 
 				</div>
 
 
@@ -93,8 +63,8 @@
 
 			        </a>-->
 
 		        </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>
 
@@ -144,6 +114,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 31 - 31
health-admin/src/main/resources/templates/dtp/print/print.html
Voir le fichier 

@@ -18,35 +18,32 @@
 
 							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
 					</div>
 
-					<form id="user-form">
 
-						<div class="select-list">
 
-							<ul>
 
-
 
-								<li>
 
-									<label>配送时间 </label>
 
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="deliveryTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="deliveryTimeEnd"/>
 
-								</li>
 
-								<li>
 
-									<label style="width: 90px; float: left;">打印申请时间 </label>
 
-									<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="printRequestTimeStart"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="printRequestTimeEnd"/>
 
-								</li>
 
-								<li>
 
-									<label>配送人： </label>
 
-									<input type="text"  placeholder="请输入配送人姓名" name="deliverer"/>
 
-								</li>
 
-								<li>
 
-									<label>打印状态:</label>
 
-									<select name="status"  th:with="type=${@dict.getType('sys_select_print_status')}">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
-												></option>
 
-									</select>
 
-								</li>
 
-							</ul>
 
+					<form id="user-form"  class="customize-search-form">
 
+						<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]"><!--deliveryTimeStart-->
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"><!--deliveryTimeEnd-->
 
+							</div>
 
+							<div class="customize-form-group select-time">
 
+								<label>打印申请时间:</label>
 
+								<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="params[beginTime]"/>
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="params[endTime]"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>配送人:</label>
 
+								<input type="text" class="styled-input" placeholder="请输入配送人姓名" name="deliverer"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>打印状态:</label>
 
+								<select name="status" class="styled-input" th:with="type=${@dict.getType('sys_select_print_status')}">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+											></option>
 
+								</select>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -63,8 +60,8 @@
 
 			        </a>
 
 		        </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>
 
@@ -111,6 +108,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 57 - 61
health-admin/src/main/resources/templates/dtp/recipe/recipe.html
Voir le fichier 

@@ -18,65 +18,58 @@
 
 							<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
 						</div>
 
 					</div>
 
-					<form id="user-form">
 
-						<input type="hidden" id="deptId" name="deptId">
 
-		                <input type="hidden" id="parentId" name="parentId">
 
-						<div class="select-list">
 
-							<ul>
 
-								<li>
 
-									患者信息：                            <input type="text" class="styled-input" placeholder="请输入患者姓名或手机号" name="query"/>
 
-								</li>
 
-								<li>
 
-									药品：                            <input type="text" class="styled-input" name="genericName"/>
 
-								</li>
 
-								<li>
 
-								<li>
 
-									订单编号：                            <input type="text" class="styled-input" name="orderId"/>
 
-								</li>
 
-								<li>
 
-									销售单号：                            <input type="text" class="styled-input" name="saleOrderNumber"/>
 
-								</li>：
 
-								</li>
 
-								<li>
 
-									处方单号：                            <input type="text" class="styled-input" name="prescriptionNumber"/>
 
-								</li>
 
-								<li>
 
-									<label>处方类型</label>
 
-									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
-												></option>
 
-									</select>
 
-								</li>
 
-								<li>
 
-									<label>配送方式</label>
 
-									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
-												></option>
 
-									</select>
 
-								</li>
 
-
 
-								<li>
 
-									<label>订单日期 </label>
 
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
 
-									<span>-</span>
 
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
 
-								</li>
 
-
 
-
 
-								<li>
 
-									<label>订单状态</label>
 
-									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
 
-										<option value="">全部</option>
 
-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
-										></option>
 
-									</select>
 
-								</li>
 
-								</li>
 
-
 
-
 
-							</ul>
 
+					<form id="user-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="query"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>药品:</label>
 
+								<input type="text" class="styled-input" name="genericName"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>订单编号:</label>
 
+								<input type="text" class="styled-input" name="orderId"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>销售单号:</label>
 
+								<input type="text" class="styled-input" name="saleOrderNumber"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>处方单号:</label>
 
+								<input type="text" class="styled-input" name="prescriptionNumber"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>处方类型</label>
 
+								<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+									></option>
 
+								</select>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>配送方式</label>
 
+								<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+									></option>
 
+								</select>
 
+							</div>
 
+							<div class="customize-form-group select-time">
 
+								<label>订单日期:</label>
 
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
 
+								<span>-</span>
 
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
 
+							</div>
 
+							<div class="customize-form-group">
 
+								<label>订单状态</label>
 
+								<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
 
+									<option value="">全部</option>
 
+									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+									></option>
 
+								</select>
 
+							</div>
 
 						</div>
 
 					</form>
 
 				</div>
 
@@ -96,8 +89,8 @@
 
 			        </a>
 
 		        </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>
 
@@ -145,6 +138,9 @@
 
 				showFooter:true,  //是否显示表格底部区域。
 
 				clickToSelect: true, //是否启用点击行时选中整行的功能。
 
 				singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
 		        columns: [{
 
 		            checkbox: true
 
 		        },

+ 1 - 0
health-admin/src/main/resources/templates/dtp/recipe/view.html
Voir le fichier 

@@ -104,6 +104,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 prefix = ctx + "dtp/report";

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServercommissionrewardinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 12 - 14
health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoList.html
Voir le fichier 

@@ -22,20 +22,16 @@
 
                 </div>
 
                 <form id="SFwglServercommissionrewardinfo-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>订单号: </label>
 
+                            <label>订单号:</label>
 
                             <input type="text" class="styled-input" name="servicePackageOrderNumber" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>券码: </label>
 
+                            <label>券码:</label>
 
                             <input type="text" class="styled-input" name="voucherCode" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>店员工号: </label>
 
+                            <label>店员工号:</label>
 
                             <input type="text" class="styled-input" name="staffNumber" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group select-time">
 
@@ -44,12 +40,10 @@
 
                                 <span>-</span>
 
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
 
                         </div>
 
-
 
-
 
                     </div>
 
                     <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>状态: </label>
 
+                            <label>状态:</label>
 
                             <input type="text" class="styled-input" name="status" autocomplete="off"/>
 
                             </div>
 
                     </div>
 
@@ -66,16 +60,16 @@
 
                 <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">
 
+                <!--<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>-->
 
             </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>
 
@@ -83,6 +77,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')}]];
 
@@ -125,6 +120,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServercommissionrewardinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServercommissionrewardinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServerinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServerinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 7 - 7
health-admin/src/main/resources/templates/fwgl/SFwglServerinfoList.html
Voir le fichier 

@@ -21,11 +21,7 @@
 
                     </div>
 
                 </div>
 
                 <form id="SFwglServerinfo-form" class="customize-search-form">
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
+<div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
                             <label>商品名称:</label>
 
                             <input type="text" placeholder="商品名称" class="styled-input" name="productName" autocomplete="off"/>
 
@@ -60,8 +56,8 @@
 
                 </a>
 
             </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>
 
@@ -69,6 +65,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')}]];
 
@@ -111,6 +108,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServerinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServerinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServerorderinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 8 - 8
health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoList.html
Voir le fichier 

@@ -23,10 +23,6 @@
 
 
                 <form id="SFwglServerorderinfo-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <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]"/>
 
@@ -71,16 +67,16 @@
 
                 <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">
 
+                <!--<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>-->
 
             </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>
 
@@ -88,6 +84,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')}]];
 
@@ -130,6 +127,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServerorderinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServerorderinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServicepackageinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 11 - 7
health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoList.html
Voir le fichier 

@@ -33,15 +33,15 @@
 
                             <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]">
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>订单编号: </label>
 
+                            <label>订单编号:</label>
 
                             <input type="text" class="styled-input" name="orderNumber" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>服务包名称: </label>
 
+                            <label>服务包名称:</label>
 
                             <input type="text" class="styled-input" name="servicePackageName" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label>下单手机号: </label>
 
+                            <label>下单手机号:</label>
 
                             <input type="text" class="styled-input" name="orderingPhone" autocomplete="off"/>
 
                         </div>
 
                     </div>
 
@@ -58,16 +58,16 @@
 
                 <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">
 
+                <!--<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>-->
 
             </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>
 
@@ -75,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')}]];
 
@@ -117,6 +118,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServicepackageinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServicepackageinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServicetypeinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">

+ 11 - 14
health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoList.html
Voir le fichier 

@@ -22,21 +22,14 @@
 
                 </div>
 
                 <form id="SFwglServicetypeinfo-form" class="customize-search-form">
 
                     <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
-                    </div>
 
-                    <div class="customize-form-group-container">
 
                         <div class="customize-form-group">
 
-                            <label>服务类型编号: </label>
 
+                            <label>服务类型编号:</label>
 
                             <input type="text" class="styled-input" name="serviceTypeNumber" autocomplete="off"/>
 
                         </div>
 
                         <div class="customize-form-group">
 
-                            <label> <!-- 字段需要添加-->
 
-                                状态: </label>
 
+                            <label>状态:</label>
 
                             <input type="text" class="styled-input" name="fulfillmentParty" autocomplete="off"/>
 
-                            </li>
 
-
 
-
 
+                        </div>
 
                     </div>
 
                 </form>
 
             </div>
 
@@ -51,16 +44,16 @@
 
                 <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">
 
+                <!--<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>-->
 
             </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>
 
@@ -68,6 +61,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')}]];
 
@@ -110,6 +104,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

+ 1 - 4
health-admin/src/main/resources/templates/fwgl/SFwglServicetypeinfoPageEdit.html
Voir le fichier 

@@ -6,10 +6,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SFwglServicetypeinfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
                     <div class="customize-form-group">

+ 1 - 1
health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoAdd.html
Voir le fichier 

@@ -42,7 +42,7 @@
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>报告生成时间:</label>
 
-                <input name="reportGenerationTime" id="reportGenerationTime" class="styled-input" type="text" maxlength="255" >
 
+                <input name="reportGenerationTime" id="reportGenerationTime" class="styled-input time-input" type="text" maxlength="255" >
 
             </div>
 
         </div>
 
     </form>

+ 2 - 5
health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoEdit.html
Voir le fichier 

@@ -12,10 +12,7 @@
 
 <body>
 
 <div class="ui-layout-center">
 
     <form id="form-SGjgztHealthplaninfo-edit" class="customize-search-form">
 
-        <div class="customize-form-group-container">
 
-        </div>
 
-        <div class="customize-form-group-container">
 
-        </div>
 
+
 
         <div class="customize-form-group-container">
 
             <input type="hidden" id="id" name="id" th:value="${id}">
 
             <div class="customize-form-group">
 
@@ -53,7 +50,7 @@
 
             </div>
 
             <div class="customize-form-group">
 
                 <label>报告生成时间:</label>
 
-                <input name="reportGenerationTime" placeholder="报告生成时间" th:value="${reportGenerationTime}" class="styled-input" type="text" maxlength="255" required>
 
+                <input name="reportGenerationTime" placeholder="报告生成时间" th:value="${reportGenerationTime}" class="styled-input time-input" type="text" maxlength="255" required>
 
             </div>
 
         </div>
 
     </form>

+ 6 - 2
health-admin/src/main/resources/templates/gjgzt/SGjgztHealthplaninfoList.html
Voir le fichier 

@@ -63,14 +63,15 @@
 
                 </a>-->
 
             </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>
 
 </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('dtp:pmService:edit')}]];
 
@@ -116,6 +117,9 @@
 
             showFooter:true,  //是否显示表格底部区域。
 
             clickToSelect: true, //是否启用点击行时选中整行的功能。
 
             singleSelect: false, //是否仅允许选择一行
 
+            fixedColumns: true,
 
+            //fixedNumber: 3,
 
+            fixedRightNumber: 1,
 
             columns: [{
 
                 checkbox: true
 
             },

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff