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

门诊处方打印优化

See merge request lihong/thmz_system!34

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

@@ -915,42 +915,42 @@ function getXyPrintHtml(list) {
         var number = i + 1;
         let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
         tr += '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' + number + "." +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + tryResult + list[i].drugName +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + tryResult + list[i].drugName +
             '    </td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 14px;">' + list[i].specification +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 70px;text-align: right;font-size: 13px;">' + list[i].specification +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">×</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 14px;">' + list[i].quantity +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 13px;">×</td>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 5px;text-align: left;font-size: 13px;">' + list[i].quantity +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 14px;">' + list[i].ypUnitName +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 25px;text-align: left;font-size: 13px;">' + list[i].ypUnitName +
             '</td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
             '</td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + manufactoryName + tryFlag +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + manufactoryName + tryFlag +
             '    </td>' +
-            '    <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法：' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
+            '    <td colspan="4" style="padding-left:0px;margin-bottom: 5px;width:220px;vertical-align: middle !important;text-align: left;font-size: 13px;">用法：' + list[i].drugQuan + "&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequencyName + '&nbsp;&nbsp;' + printName +
             '</td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
             '</td>' +
-            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
+            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
             '    </td>' +
             '</tr>' +
             '<tr>' +
-            '    <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
+            '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
             '</td>' +
-            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 14px;">' + '货位号:' + list[i].location +
+            '    <td colspan="5" style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">' + '货位号:' + list[i].location +
             '    </td>' +
             '</tr><tr style="height: 5px;"><td><img src="about:blank" width="5" height="5" /></td></tr>';
     }
     $('#yxwk').remove();
     if (list.length < 5) {
-        $('#div_yp').append('<span id="yxwk" style="margin-bottom: 5px;font-size: 14px;">以下为空</span>');
+        $('#div_yp').append('<span id="yxwk" style="margin-bottom: 5px;font-size: 13px;">以下为空</span>');
     }
     return tr;
 }