Merge tag 'Hotfix-zh-172' into develop

Finish Hotfix-zh-172

src/views/supply/deliver/components/design/panel.js

@@ -215,7 +215,7 @@ export default {
       , {
       "options": {
         "left": 40,
-        "top": 343,
+        "top": 360,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -231,7 +231,7 @@ export default {
       "options": {
         
         "left": 40,
-        "top": 365,
+        "top": 381,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -246,7 +246,7 @@ export default {
     {
       "options": {
         "left": 238,
-        "top": 365,
+        "top": 381,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -261,7 +261,7 @@ export default {
     {
       "options": {
         "left": 238,
-        "top": 343,
+        "top": 360,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -276,7 +276,7 @@ export default {
     {
       "options": {
         "left": 463,
-        "top": 343,
+        "top": 360,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -291,7 +291,7 @@ export default {
     {
       "options": {
         "left": 463,
-        "top": 365,
+        "top": 381,
         "height": 13,
         "width": 218,
         "fontSize": 13,
@@ -305,6 +305,6 @@ export default {
     }],
 
     "paperNumberLeft": 0,
-    "paperNumberTop": 450
+    "paperNumberTop": 380
   }]
 }

src/views/supply/deliver/components/design/print-data.js

@@ -28,7 +28,7 @@ function getDetail(ids) {
           enginOrderType: e.enginOrderType == 'HOME' || e.enginOrderType == 'TRADE' ? e.enginOrderNo : e.mainOrderId,
           materialName: e.materialName || '',
           specification: e.specification || '',
-          refundableQty: 100,
+          refundableQty: e.refundableQty || 0,
           // headerRemark:e.headerRemark,
           pjxh1Text: e.pjxh1Text || ''
         })