摆药机提示修改

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

@@ -1697,7 +1697,7 @@ function sendXy(flag) {
                 } else {
                     getPrintDetail(1);
                 }
-                if (!confirm("是否需要打印当前药单的口服标签并使用摆药机？")) {
+                if (confirm("是否需要打印当前药单的口服标签并使用摆药机？")) {
                     if (res.data) {
                         printLabelData(flag, 1);//口服药单，并使用摆药机
                         request({

src/main/resources/static/js/yk/in_storage_acc_sum.js

@@ -80,15 +80,15 @@ function setGridPrintDate(data) {
     let sum_html = '';
     for (let j = 0; j < data.ypInDetlVoGroupList.length; j++) {
         let ypInDetls = data.ypInDetlVoGroupList[j];
-        html+='<table id="qbtj_table" class="table table-striped" style="margin-top: 0px;border: transparent !important;">\n' +
+        html+='<div class="qbtj_table"><table class="table table-striped" style="margin-top: 0px;border: transparent !important;">\n' +
             '                        <tr style="font-weight: 700;background-color: #EBEBE4;height: 70px;">\n' +
-            '                            <td colspan="14" style="font-size: 21px;text-align: center;border: transparent !important;"><span class="title">泰和医院入库验收单</span></td>\n' +
+            '                            <td colspan="13" style="font-size: 21px;text-align: center;border: transparent !important;"><span class="title">泰和医院入库验收单</span></td>\n' +
             '                        </tr>' +
             '<tr style="font-weight: 700;background-color: #EBEBE4">\n' +
             '                            <td colspan="2" style="text-align: left;border: transparent !important;">库房：'+groupName+'</td>\n' +
             '                            <td colspan="4" style="text-align: left;border: transparent !important;">供货单位：'+ypInDetls[0]['supplyName']+'</td>\n' +
-            '                            <td colspan="4" style="text-align: left;border: transparent !important;">日期范围：'+now+'</td>\n' +
-            '                            <td colspan="4" style="text-align: left;border: transparent !important;">打印日期：'+$('#reportrange span').html()+'</td>\n' +
+            '                            <td colspan="4" style="text-align: left;border: transparent !important;">日期范围：'+$('#reportrange span').html()+'</td>\n' +
+            '                            <td colspan="3" style="text-align: left;border: transparent !important;">打印日期：'+now+'</td>\n' +
             '                        </tr>' +
             '<tr>\n' +
             '                            <td class="xtd" style="text-align: center;width: 100px;">单号</td>\n' +
@@ -99,7 +99,6 @@ function setGridPrintDate(data) {
             '                            <td class="xtd" style="text-align: center;width: 100px;">规格</td>\n' +
             '                            <td class="xtd" style="text-align: center;width: 40px;">剂型</td>\n' +
             '                            <td class="xtd" style="text-align: center;width: 120px;">批准文号</td>\n' +
-            '                            <td class="xtd" style="text-align: center;width: 60px;">外观情况</td>\n' +
             '                            <td class="xtd" style="text-align: center;width: 60px;">复核人</td>\n' +
             '                            <td class="xtd" style="text-align: center;width: 60px;">购入价</td>\n' +
             '                            <td class="xtd" style="text-align: center;width: 60px;">购入金额</td>\n' +
@@ -121,7 +120,6 @@ function setGridPrintDate(data) {
             html += '<td class="xtd" style="text-align: left;">' + d['specification'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + d['dosageName'] + '</td>';
             html += '<td class="xtd" style="text-align: left;">' + (isEmpty(d['licenseNo'])?'-':d['licenseNo']) + '</td>';
-            html += '<td class="xtd" style="text-align: left;">' + (isEmpty(d['wgType'])?'-':d['wgType']) + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + d['confirmName'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + d['buyPrice'] + '</td>';
             html += '<td class="xtd" style="text-align: center;">' + (d['buyPrice'] * d['buyAmt']).toFixed(2) + '</td>';
@@ -184,10 +182,10 @@ function setGridPrintDate(data) {
             }
             html+=sum_html;
         }else {
-            html += '</table>';
+            html += '</table></div>';
         }
     }
-    $("#report_table_1").html(html);
+    $("#report_table").html(html);
 }
 
 function sumHtmlAfter(ypInDetlMap) {
@@ -280,7 +278,10 @@ function print() {
     LODOP.SET_PRINT_STYLEA(0, "ItemType", 2);
     var strStyle = "<style>table,td,th {border-width: 1px;" +
         "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 14px}</style>";
-    LODOP.ADD_PRINT_HTM("2mm", "4mm", "RightMargin:4mm", "BottomMargin:15mm", strStyle + document.getElementById("report_table_1").innerHTML);
+    for (let i = 0; i < $(".qbtj_table").length; i++) {
+        LODOP.ADD_PRINT_HTM("2mm", "4mm", "RightMargin:4mm", "BottomMargin:15mm", strStyle + $(".qbtj_table")[i].innerHTML);
+        LODOP.NewPageA();
+    }
     LODOP.PRINT();
     //LODOP.PREVIEW();
 }

src/main/resources/templates/yk/in_storage_acc_sum.html

@@ -61,9 +61,9 @@
                     </div>
                 </form>
             </div>
-            <div id="report_table"
+            <div id="report_div"
                  style="width:1300px;height: calc(100% - 160px);margin:0 auto;border: 1px solid #337ab7;font-size: 14px;padding: 40px 10px 40px 10px;overflow: scroll">
-                <div id="report_table_1">
+                <div id="report_table">
                     <!--<table id="qbtj_table" class="table table-striped" style="margin-top: 0px;border: transparent !important;">
                         <tr style="font-weight: 700;background-color: #EBEBE4;height: 70px;">
                             <td colspan="14" style="font-size: 21px;text-align: center;border: transparent !important;"><span class="title">泰和医院入库验收单</span></td>