Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

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

@@ -644,28 +644,31 @@ function setPrintHtml() {
             buyPriceSum += buyPrice;
             if (i === 0) {
                 $(".printDate").html(format(new Date(), "yyyy-MM-dd HH:mm"));
-                $(".groupName").html($("#groupNoLabel").val());
+                let w_code = $("#deptCode").find("option:selected").text();
+                $(".groupName").html(w_code.substring(0, w_code.lastIndexOf("(")));
                 $(".drawNo").html(data['drawNo']);
                 $(".planDate").html($("#planDateLabel").html());
                 $(".confirmDate").html(format(data['confirmDate'], "yyyy-MM-dd HH:mm"));
                 $(".lister").html($(".current_user")[0].innerText);
                 $(".listerAudit").html(data['confirmName']);
             }
-            html += '<tr class="sjh">';
-            html += '<td class="xtd" style="text-align: center;">' + data['chargeCode'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['location'] + '</td>';
-            html += '<td class="xtd" style="text-align: left;">' + data['name'] + '</td>';
-            html += '<td class="xtd" style="text-align: left;">' + data['specification'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['outAmt'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['buyPrice'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['packRetprice'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + buyPrice + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + packRetprice + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + data['manuNo'] + '</td>';
-            html += '<td class="xtd" style="text-align: left;">' + data['manufactoryName'] + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + format(data['effDate'], "yyyy-MM-dd") + '</td>';
-            html += '<td class="xtd" style="text-align: center;">' + keepTwoDecimal(data['stockAmount']) + '</td>';
-            html += '</tr>';
+            if(data['outAmt'] != 0) {
+                html += '<tr class="sjh">';
+                html += '<td class="xtd" style="text-align: center;">' + data['chargeCode'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data['location'] + '</td>';
+                html += '<td class="xtd" style="text-align: left;">' + data['name'] + '</td>';
+                html += '<td class="xtd" style="text-align: left;">' + data['specification'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data['outAmt'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data['buyPrice'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data['packRetprice'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + buyPrice + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + packRetprice + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + data['manuNo'] + '</td>';
+                html += '<td class="xtd" style="text-align: left;">' + data['manufactoryName'] + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + format(data['effDate'], "yyyy-MM-dd") + '</td>';
+                html += '<td class="xtd" style="text-align: center;">' + keepTwoDecimal(data['stockAmount']) + '</td>';
+                html += '</tr>';
+            }
         }
         $("#base_tr").after(html);
         $(".packRetpriceSum").html(keepTwoDecimal(packRetpriceSum));

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

@@ -12,7 +12,7 @@
 <script src="/thmz/js/common/pharmacy-com.js"></script>
 <script src="/thmz/js/yk/drug_delivery.js"></script>
 <script src="/thmz/js/dependent/LodopFuncs.js"></script>
-<title>药品入库</title>
+<title>药品出库</title>
 <style type="text/css">
     .alignLeft {
         text-align: left !important;