hurugang преди 5 години
родител
ревизия
6c28224eb4
променени са 3 файла, в които са добавени 10 реда и са изтрити 4 реда
  1. 7 2
      src/main/resources/static/js/registration.js
  2. 2 1
      src/main/resources/static/js/toll_administration.js
  3. 1 1
      src/main/resources/templates/menu.html

+ 7 - 2
src/main/resources/static/js/registration.js

@@ -182,6 +182,11 @@ $(function () {
             });
             return;
         }
+        var realMoney = parseFloat($("#realMoney").val());
+        realMoney = realMoney.toFixed(2);
+        if (parseFloat(cash) < realMoney) {
+            return;
+        }
         var patientId = $("#patientId").val();
         if (patientId == null || patientId == "") {
             savePatient(true);
@@ -742,8 +747,8 @@ function confirmFeeModal() {
         prevAll = $("#changeAmountParent").prevAll();
     }
     $("#realMoney").val($("#amountMoneyConfirm").text());
-    //$("#cash").val($("#amountMoneyConfirm").text());
-    $("#cash").val(null);
+    $("#cash").val($("#amountMoneyConfirm").text());
+    //$("#cash").val(null);
     $("#confirmFeeModal").modal();
 }
 

+ 2 - 1
src/main/resources/static/js/toll_administration.js

@@ -797,7 +797,8 @@ function confirmFeeModal(times, totalCharge, receiptNo) {
     $("#confirmFeeModal").modal();
     $("#amountMoneyConfirm").text(data);
     $("#realMoney").val(data);
-    $("#cash").val(null);
+    $("#cash").val(data);
+   // $("#cash").val(null);
     setTimeout(function () {
         //默认光标在卡号输入框
         $("#cash").focus();

+ 1 - 1
src/main/resources/templates/menu.html

@@ -29,7 +29,7 @@
     <link href="/thmz/css/pnotify/pnotify.nonblock.css" rel="stylesheet">
 </head>
 
-<body class="nav-md" style="background: #FFFFFF">
+<body class="nav-md" style="background: #FFFFFF; color: #333333;">
 <div class="container body">
     <div class="main_container">
         <div class="col-md-3 left_col">