Merge branch 'dev-1.1.4' into 'dev-1.1.4'

中药口服/外用添加醒目标签

See merge request lihong/thmz_system!78

src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -99,9 +99,9 @@ $(function () {
         $("#zyypbq_date").attr("value", $("#dateLabel").val());
         $("#zyypbq_comm").text($("#yfLabel").val());
         if ($("#syfsLabel").val() == 0) {
-            $("#zybq_title").text("中药口服标签");
+            $("#zybq_title").text("中药【口服】标签");
         } else {
-            $("#zybq_title").text("中药外用标签");
+            $("#zybq_title").text("中药【外用】标签");
         }
         LODOP = getLodop();
         LODOP.PRINT_INITA(6, 0, "50mm", "30mm", "中药标签");

src/main/resources/static/js/yf/ward_prescription.js

@@ -78,9 +78,9 @@ $(function () {
         $("#zyypbq_date").attr("value", $("#dateLabel").val());
         $("#zyypbq_comm").text($("#yfLabel").val());
         if ($("#syfsLabel").val() == 0) {
-            $("#zybq_title").text("中药口服标签");
+            $("#zybq_title").text("中药【口服】标签");
         } else {
-            $("#zybq_title").text("中药外用标签");
+            $("#zybq_title").text("中药【外用】标签");
         }
         LODOP = getLodop();
         LODOP.PRINT_INITA(6, 0, "50mm", "30mm", "中药标签");

src/main/resources/templates/mz/west_pharmacy_send.html

@@ -269,7 +269,7 @@
                     <!--药品标签打印结束-->
                     <!--中药药品标签打印开始-->
                     <div id="print_view_zybq">
-                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <span style="font-size:16px;font-weight: 700;" id="zybq_title"></span>
                         </span>
                         <form style="font-size: 14px;margin-bottom: 5px;">

src/main/resources/templates/yf/ward_prescription.html

@@ -297,7 +297,7 @@
                 </div>
                 <!--中药药品标签打印开始-->
                 <div id="print_view_zybq">
-                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                        <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                             <span style="font-size:14px;font-weight: 700;" id="zybq_title"></span>
                         </span>
                     <form style="font-size: 12px;margin-bottom: 5px;">