【修改】bug

src/mixin/print.js

@@ -301,6 +301,7 @@ export default {
           for (let e = newInvoicePickBeans.length; e > 0; e--) {
             const tempData = newInvoicePickBeans[e - 1];
             total += Math.abs(+tempData.refundableQty)
+
             //添加表格数据
             table.push({
               id: tempData.id,
@@ -312,10 +313,10 @@ export default {
                 tempData.orderType === "REQUISITION_HOME"
                   ? tempData.enginOrderNo
                   : tempData.mainOrderId,
-              materialName: tempData.materialName,
-              specification: tempData.specification,
+              materialName: tempData.materialName.substr(0,20),
+              specification: tempData.specification.substr(0,30),
               refundableQty: tempData.refundableQty,
-              pjxh1Text: tempData.pjxh1Text,
+              pjxh1Text: tempData.pjxh1Text.substr(0,8),
             });
           }
         }

src/utils/panel.js

@@ -73,7 +73,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 50,
+            top: 55,
             height: 13,
             lineHeight: 13,
             width: 656,
@@ -91,7 +91,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 65,
+            top: 72,
             height: 13,
             lineHeight: 13,
             width: 150,
@@ -107,7 +107,7 @@ export default {
         {
           options: {
             left: 300,
-            top: 65,
+            top: 72,
             height: 13,
             lineHeight: 13,
             width: 200,
@@ -124,7 +124,7 @@ export default {
         {
           options: {
             left: 585,
-            top: 65,
+            top: 72,
             height: 13,
             lineHeight: 13,
             width: 300,
@@ -141,7 +141,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 80,
+            top: 89,
             height: 13,
             lineHeight: 13,
             width: 328,
@@ -157,7 +157,7 @@ export default {
         {
           options: {
             left: 300,
-            top: 80,
+            top: 89,
             height: 13,
             lineHeight: 13,
             width: 410,
@@ -173,7 +173,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 95,
+            top: 106,
             height: 13,
             lineHeight: 13,
             width: 633,
@@ -190,14 +190,13 @@ export default {
         {
           options: {
             left: 23,
-            top: 110,
+            top: 123,
             height: 410,
             width: 656,
             fontSize: 12.5,
             field: "table",
             fontFamily: "黑体,宋体,微软雅黑",
             lineHeight: 16,
-            tableFooter:true,
             tableFooterRepeat:'last',
             columns: [
               [
@@ -258,7 +257,6 @@ export default {
                 //   "rowspan": 1,
                 //   "fontSize": 12.5,
                 // }
-
                 {
                   title: "备注说明",
                   field: "pjxh1Text",
@@ -268,7 +266,6 @@ export default {
                   rowspan: 1,
                   fontSize: 12.5,
                 },
-
               ],
             ],
           },
@@ -294,7 +291,7 @@ export default {
         {
           options: {
             left: 25,
-            top: 395,
+            top: 393,
             height: 13,
             lineHeight: 13,
             width: 218,
@@ -345,7 +342,7 @@ export default {
         {
           options: {
             left: 238,
-            top: 395,
+            top: 393,
             height: 13,
             lineHeight: 13,
             width: 218,
@@ -362,7 +359,7 @@ export default {
         {
           options: {
             left: 463,
-            top: 395,
+            top: 393,
             height: 13,
             lineHeight: 13,
             width: 218,
@@ -396,7 +393,7 @@ export default {
         {
           options: {
             left: 600,
-            top: 395,
+            top: 393,
             height: 13,
             lineHeight: 13,
             width: 218,

src/views/deposit_home/deposit_list.vue

@@ -482,34 +482,34 @@
             <el-table-column
               align="right"
               label="合同数量"
-              prop="contractQty"
+              prop="itemContractQty"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractQty || 0}}
+                {{ scope.row.itemContractQty || 0}}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
               label="合同单价"
-              prop="contractPrice"
+              prop="itemContractPrice"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractPrice | numToFixed }}
+                {{ scope.row.itemContractPrice | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
               label="合同金额"
-              prop="contractAmount"
+              prop="itemContractAmount"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractAmount | numToFixed }}
+                {{ scope.row.itemContractAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column
@@ -734,9 +734,9 @@ export default {
 
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
           item.sums1 = ['qty','orderHasSendQty','itemDataQty',
-          "contractQty"]
-          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice',"contractPrice",
-          "contractAmount",
+          "itemContractQty"]
+          item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice',"itemContractPrice",
+          "itemContractAmount",
      ]
         })
         this.listLoading = false

src/views/deposit_home/refund_list.vue

@@ -645,34 +645,34 @@
             <el-table-column
               align="right"
               label="合同数量"
-              prop="contractQty"
+              prop="itemContractQty"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractQty || 0}}
+                {{ scope.row.itemContractQty || 0}}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
               label="合同单价"
-              prop="contractPrice"
+              prop="itemContractPrice"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractPrice | numToFixed }}
+                {{ scope.row.itemContractPrice | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column
               align="right"
               label="合同金额"
-              prop="contractAmount"
+              prop="itemContractAmount"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                {{ scope.row.contractAmount | numToFixed }}
+                {{ scope.row.itemContractAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column
@@ -1078,7 +1078,7 @@ export default {
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
         item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty","hasSendQty",
-          "contractQty"];
+          "itemContractQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",
@@ -1086,8 +1086,8 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
-          "contractPrice",
-          "contractAmount",
+          "itemContractPrice",
+          "itemContractAmount",
 
         ];
       });