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_sales_return.js

@@ -264,7 +264,7 @@ function initTbTable() {
             },
             {
                 field: 'amountOut',
-                title: '退库量',
+                title: '退货量',
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
@@ -706,6 +706,7 @@ function initPrintHtml(){
     $('.sjh').remove();
     for (let i = 0; i < datas.length; i++) {
         let data = datas[i];
+        console.log(data);
         let packRetprice = keepTwoDecimal(parseFloat(data['buyAmt']) * parseFloat(data['packRetprice']));
         let buyPrice = keepTwoDecimal(parseFloat(data['buyAmt']) * parseFloat(data['buyPrice']));
         packRetpriceSum += packRetprice;
@@ -720,7 +721,7 @@ function initPrintHtml(){
         html += '<tr class="sjh">';
         html += '<td class="xtd" style="text-align: center;">' + data['chargeCode'] + '</td>';
         html += '<td class="xtd" style="text-align: left;">' + data['drugName']+'/<br>'+data['specification'] + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + data['buyAmt'] + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + data['amountOut'] + '</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>';