Merge remote-tracking branch 'origin/master'

zkqy-ui/src/utils/print/outBoundPrint.js

@@ -13,6 +13,7 @@ function outBoundPrint(data, domId, isRetail = false) {
   if (dd < 10) {
     dd = "0" + dd;
   }
+  isRetail = false;
   let tableHeader = ``
   if (isRetail) { //零售
     tableHeader = `<td style="width: 100px;">名称</td>
@@ -94,4 +95,4 @@ function outBoundPrint(data, domId, isRetail = false) {
   return false;
 
 }
-export default outBoundPrint
+export default outBoundPrint

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -299,7 +299,7 @@ export default {
                 ).toFixed(2);
               }
             }
-            item.unit = "";
+            item.unit = "KG";
           });
           this.tableData = res.data;
           this.allTableData = JSON.parse(JSON.stringify(res.data));

zkqy-ui/src/views/orderMange/retailMange/index.vue

@@ -2533,11 +2533,11 @@ export default {
            <td></td>
           <td></td>
           <td></td>
+          <td></td>
           <td>${amountTotal}</td>
           <td>${singlTotal}</td>
           <td>${moneyTotal}</td>
           <td></td>
-          <td></td>
         </tr>`;
       printStr += `<tr align="left">
                     <td colspan="10">订单备注:${orderRemark}</td>