Merge branch 'dev-1.0.4' into dev-1.0.5

src/main/resources/static/js/registration.js

@@ -1656,7 +1656,7 @@ function clearRegistration() {
  */
 function prn1Print(patientId, times) {
     setPrint();
-    var height ="93.14mm";
+    var height ="93.18mm";
     // if(countReceiot%2==0){
     //     height ="93.2mm";
     // }

src/main/resources/static/js/registration_list.js

@@ -2019,7 +2019,7 @@ function clearRegistration() {
  */
 function prn1Print(patientId, times) {
     setPrint();
-    var height ="93.14mm";
+    var height ="93.18mm";
     // if(countReceiot%2==0){
     //     height ="93.2mm";
     // }

src/main/resources/static/js/toll_administration.js

@@ -372,7 +372,7 @@ function initFeeTable() {
                     if (payMarkGroup == 1) {
                         str += '<button type="button" class="registration-no-color-foot-button" title="退费" onclick="refundFee(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ',' + row.printFlag + ');"><i class="fa fa-reply"></i></button>';
                         if (row.printFlag == 0) {
-                            str += '<button type="button" class="registration-no-color-foot-button" title="发票打印" onclick="prn1Print(\'' + row.patientId + '\',' + row.times + ',true,' + row.receiptNo + ');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
+                            str += '<button type="button" id="button_'+row.realNo+'" class="registration-no-color-foot-button" title="发票打印" onclick="prn1PrintHand(\'' + row.patientId + '\',' + row.times + ',true,' + row.receiptNo + ','+row.realNo+');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
                         } else if (row.printFlag == 1) {
                             str += '<button type="button" class="registration-no-color-foot-button" title="发票重打" onclick="repPrint(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ');" style="color: #F4BD00;"><i class="fa fa-print"></i></button>';
                             str += '<button type="button" class="registration-no-color-foot-button" title="发票作废重打" onclick="obsoleteAndRepPrint(\'' + row.patientId + '\',' + row.times + ',' + row.receiptNo + ');" style="color: #E73E48;"><i class="fa fa-print"></i></button>';
@@ -1248,6 +1248,18 @@ function saveConfirmFee() {
 }
 
 
+/**
+ * 直接打印发票
+ * @param patientId
+ * @param times
+ * @param chargeFeeFlag 收费 退费标记  true 收费和重打发票来源 false 退费来源
+ */
+function prn1PrintHand(patientId, times, chargeFeeFlag, receiptNo,realNo) {
+    $("#button_"+realNo).css("display","none");
+    prn1Print(patientId, times, chargeFeeFlag, receiptNo);
+}
+
+
 /**
  * 直接打印发票
  * @param patientId
@@ -1365,7 +1377,7 @@ function obsoleteAndRepPrint(patientId, times, receiptNo) {
  */
 function printCommon(url, patientId, times, chargeFeeFlag) {
     setPrint();
-    var height = "93.14mm";
+    var height = "93.18mm";
     // if (countReceiot % 2 == 0) {
     //     height = "93.2mm";
     // }