门特门慢处方打印

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

@@ -3487,33 +3487,36 @@ function getXyPrintHtml(list) {
             '    </td>' +
             '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 320;font-size: 13px;">' + tryResult + list[i].drugName +
             '    </td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 180px;text-align: right;font-size: 13px;">' + list[i].specification +
+            '    <td colspan="3" style="margin-bottom: 5px;vertical-align: middle !important;width: 280px;text-align: right;font-size: 13px;">' + list[i].specification + '×' + list[i].quantity +  list[i].ypUnitName +
             '    </td>' +
-            '    <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: 20px;text-align: left;font-size: 13px;">' + list[i].ypUnitName +
+            // '    <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;">' +
             '    </td>' +
+            // '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 20px;text-align: left;font-size: 13px;">' +
+            // '    </td>' +
             '    <td style="vertical-align: middle !important;width: 60px;text-align: left;font-size:25px;font-weight: bold">' + list[i].groupSign +
             '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <td style="margin-bottom: 5px;width: 10px;font-size: 13px;" align="left" valign="top">' +
             '    </td>' +
-            '    <td colspan="4" style="padding-left:0;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 colspan="2" style="padding-left:0;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>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 180px;font-size: 13px;">'  + tryFlag +
+            '    </td>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 220px;font-size: 13px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
             '    </td>' +
-            '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">'  + tryFlag +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;font-size: 13px;">' +
+            '    </td>' +
+            '    <td style="margin-bottom: 5px;vertical-align: middle !important;font-size: 13px;">' +
             '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <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: 13px;">' + (list[i].instructionText == null ? '' : list[i].instructionText) +
-            '    </td>' +
             '</tr>' +
             '<tr>' +
             '    <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: 13px;">' + '货位号:' + list[i].location +
             // '    </td>' +
             // '    <td style="margin-bottom: 5px;vertical-align: middle !important;width: 245px;font-size: 13px;">货位号:' + list[i].location +