【修改】bug

src/mixin/print.js

@@ -108,6 +108,7 @@ export default {
      * @param {Array} ids
      */
     async getDateil(ids, funcType = 'getDeliverDetail') {
+      // 兼容多个打印数据
       ids = ids instanceof Array ? ids : [ids]
       console.log(ids);
       // 清空之前打印的数据
@@ -153,7 +154,6 @@ export default {
           setTimeout(async () => {
             const requestParams = { id: formatting[i - 1] }
             try {
-
               const { data } = await getDeliverDetail(requestParams);
               this.mySetData(data)
             } catch (error) {
@@ -168,19 +168,25 @@ export default {
     },
 
     mySetData(data) {
+      // 初始化打印次数
+      let printNum = 0
       //避免数据发生改变
       this.clonelData.push(JSON.parse(JSON.stringify(data)))
       // 需要计算长度和数据裁切
       let invoicePickBeans = data.invoicePickBeans;
+
       // 获取length向上取整
       let len = Math.ceil(invoicePickBeans.length / 5);
       for (let index = 0; index < len; index++) {
         const table = [];
         //  length <= 0 则不执行打印
         if (invoicePickBeans.length) {
+          // 取第一个条数据printNum
+          printNum = invoicePickBeans[0].printNum
           const newInvoicePickBeans = invoicePickBeans.splice(0, 5);
           for (let e = newInvoicePickBeans.length; e > 0; e--) {
             const tempData = newInvoicePickBeans[e - 1];
+
             //添加表格数据
             table.push({
               salesId: tempData.salesOrderId,
@@ -203,6 +209,7 @@ export default {
         // 添加print输出数据
         this.outputData.push({
           pageNumber: `${len}-${index + 1}`,
+          printNum,
           type: data.type,
           tiTui: data.type === 2 ? `退货人` : `提货人`,
           takerPhone: data.takerPhone || '',

src/utils/panel.js

@@ -4,7 +4,7 @@ export default {
     "index": 0,
     "height": 150,
     "width": 241,
-    "paperCount":222,
+    "paperCount": 222,
     "printElements": [{
       "options": {
         "left": 0,
@@ -24,20 +24,34 @@ export default {
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商编码",
         "fontFamily": '黑体',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 550,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "打印次数",
+        "fontFamily": '黑体',
+        "field": "printNum",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }, {
       "options": {
         "left": 348,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打印日期",
         "fontFamily": '黑体',
         "field": "nowDate",
@@ -46,14 +60,14 @@ export default {
 
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
-    },
+    }
       , {
       "options": {
         "left": 40,
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商",
         "fontFamily": '黑体',
         "field": "customerName",
@@ -66,7 +80,7 @@ export default {
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondName",
@@ -75,13 +89,13 @@ export default {
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
     },
-    , {
+    {
       "options": {
         "left": 40,
         "top": 90,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "备注",
         "fontFamily": '黑体',
         "field": "headerRemark",
@@ -93,10 +107,10 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 115,
+        "top": 105,
         "height": 400,
         "width": 633,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "field": "table",
         "fontFamily": '黑体',
         "lineHeight": 16,
@@ -109,7 +123,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }, {
             "title": "发货单号",
@@ -118,7 +132,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -129,7 +143,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -140,7 +154,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }
           , {
@@ -150,7 +164,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }, {
@@ -160,18 +174,18 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
           , {
-             "title": "数量",
+            "title": "数量",
             "field": "refundableQty",
             "width": 23,
             "align": "center",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
             "tableSummary": "sum"
 
           }
@@ -182,7 +196,7 @@ export default {
           //   "align": "center",
           //   "colspan": 1,
           //   "rowspan": 1,
-          //   "fontSize": 13,
+          //   "fontSize": 12.5,
           // }
 
           ,
@@ -194,7 +208,7 @@ export default {
             "align": "left",
             "colspan": 2,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
           }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
@@ -220,7 +234,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
@@ -236,7 +250,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打单",
         "fontFamily": '黑体',
         "field": "createBy",
@@ -251,7 +265,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "车辆",
         "fontFamily": '黑体',
         "field": "pickCar",
@@ -266,7 +280,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "联系方式",
         "fontFamily": '黑体',
         "field": "takerPhone",
@@ -281,7 +295,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "提单",
         "fontFamily": '黑体',
         "field": "takerDa",
@@ -296,7 +310,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondNames",

src/views/finance/components/design/panel.js

@@ -18,26 +18,40 @@ export default {
         "textAlign": "center",
         "lineHeight": 26
       }, "printElementType": { "title": "", "type": "text" }
-    }, {
+    },  {
       "options": {
         "left": 40,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商编码",
         "fontFamily": '黑体',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 550,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "打印次数",
+        "fontFamily": '黑体',
+        "field": "printNum",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }, {
       "options": {
         "left": 348,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打印日期",
         "fontFamily": '黑体',
         "field": "nowDate",
@@ -46,14 +60,14 @@ export default {
 
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
-    },
-      , {
+    }
+       ,{
       "options": {
         "left": 40,
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商",
         "fontFamily": '黑体',
         "field": "customerName",
@@ -66,7 +80,7 @@ export default {
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondName",
@@ -81,7 +95,7 @@ export default {
         "top": 90,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "备注",
         "fontFamily": '黑体',
         "field": "headerRemark",
@@ -93,10 +107,10 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 115,
+        "top": 105,
         "height": 381,
         "width": 633,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "field": "table",
         "fontFamily": '黑体',
         "lineHeight": 16,
@@ -109,7 +123,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }, {
             "title": "发货单号",
@@ -118,8 +132,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -129,8 +143,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-           
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -140,8 +154,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
           }
           , {
             "title": "存货名称",
@@ -150,7 +164,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }, {
@@ -160,7 +174,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -171,7 +185,7 @@ export default {
             "align": "center",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
             "tableSummary": "sum"
 
           }
@@ -182,11 +196,11 @@ export default {
           //   "align": "center",
           //   "colspan": 1,
           //   "rowspan": 1,
-          //   "fontSize": 13,
+          //   "fontSize": 12.5,
           // }
-          
-          , 
-          
+
+          ,
+
           {
             "title": "备注说明",
             "field": "pjxh1Text",
@@ -194,7 +208,7 @@ export default {
             "align": "left",
             "colspan": 2,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
           }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
@@ -220,7 +234,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
@@ -231,12 +245,12 @@ export default {
     },
     {
       "options": {
-        
+
         "left": 40,
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打单",
         "fontFamily": '黑体',
         "field": "createBy",
@@ -251,7 +265,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "车辆",
         "fontFamily": '黑体',
         "field": "pickCar",
@@ -266,7 +280,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "联系方式",
         "fontFamily": '黑体',
         "field": "takerPhone",
@@ -281,7 +295,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "提单",
         "fontFamily": '黑体',
         "field": "takerDa",
@@ -296,7 +310,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondNames",

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

@@ -18,26 +18,40 @@ export default {
         "textAlign": "center",
         "lineHeight": 26
       }, "printElementType": { "title": "", "type": "text" }
-    }, {
+    },  {
       "options": {
         "left": 40,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商编码",
         "fontFamily": '黑体',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 550,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "打印次数",
+        "fontFamily": '黑体',
+        "field": "printNum",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }, {
       "options": {
         "left": 348,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打印日期",
         "fontFamily": '黑体',
         "field": "nowDate",
@@ -46,14 +60,14 @@ export default {
 
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
-    },
-      , {
+    }
+       ,{
       "options": {
         "left": 40,
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商",
         "fontFamily": '黑体',
         "field": "customerName",
@@ -66,7 +80,7 @@ export default {
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondName",
@@ -81,7 +95,7 @@ export default {
         "top": 90,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "备注",
         "fontFamily": '黑体',
         "field": "headerRemark",
@@ -93,10 +107,10 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 115,
+        "top": 105,
         "height": 381,
         "width": 650,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "field": "table",
         "fontFamily": '黑体',
         "lineHeight": 16,
@@ -109,7 +123,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }, {
             "title": "发货单号",
@@ -118,8 +132,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -129,8 +143,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-           
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -140,8 +154,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
           }
           , {
             "title": "存货名称",
@@ -150,7 +164,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }, {
@@ -160,7 +174,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -171,7 +185,7 @@ export default {
             "align": "center",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
             "tableSummary": "sum"
 
           }
@@ -182,11 +196,11 @@ export default {
           //   "align": "center",
           //   "colspan": 1,
           //   "rowspan": 1,
-          //   "fontSize": 13,
+          //   "fontSize": 12.5,
           // }
-          
-          , 
-          
+
+          ,
+
           {
             "title": "备注说明",
             "field": "pjxh1Text",
@@ -194,7 +208,7 @@ export default {
             "align": "left",
             "colspan": 2,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
           }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
@@ -220,7 +234,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
@@ -231,12 +245,12 @@ export default {
     },
     {
       "options": {
-        
+
         "left": 40,
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打单",
         "fontFamily": '黑体',
         "field": "createBy",
@@ -251,7 +265,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "车辆",
         "fontFamily": '黑体',
         "field": "pickCar",
@@ -266,7 +280,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "联系方式",
         "fontFamily": '黑体',
         "field": "takerPhone",
@@ -281,7 +295,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "提单",
         "fontFamily": '黑体',
         "field": "takerDa",
@@ -296,7 +310,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondNames",
@@ -311,7 +325,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "pageNumber",

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

@@ -18,26 +18,40 @@ export default {
         "textAlign": "center",
         "lineHeight": 26
       }, "printElementType": { "title": "", "type": "text" }
-    }, {
+    },  {
       "options": {
         "left": 40,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商编码",
         "fontFamily": '黑体',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 550,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "打印次数",
+        "fontFamily": '黑体',
+        "field": "printNum",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }, {
       "options": {
         "left": 348,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打印日期",
         "fontFamily": '黑体',
         "field": "nowDate",
@@ -46,14 +60,14 @@ export default {
 
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
-    },
+    }
       , {
       "options": {
         "left": 40,
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商",
         "fontFamily": '黑体',
         "field": "customerName",
@@ -66,7 +80,7 @@ export default {
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondName",
@@ -81,7 +95,7 @@ export default {
         "top": 90,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "备注",
         "fontFamily": '黑体',
         "field": "headerRemark",
@@ -93,10 +107,10 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 115,
+        "top": 105,
         "height": 381,
         "width": 633,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "field": "table",
         "fontFamily": '黑体',
         "lineHeight": 16,
@@ -109,7 +123,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }, {
             "title": "发货单号",
@@ -118,8 +132,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -129,8 +143,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-           
+            "fontSize": 12.5,
+
 
           }
           , {
@@ -140,8 +154,8 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
-            
+            "fontSize": 12.5,
+
           }
           , {
             "title": "存货名称",
@@ -150,7 +164,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }, {
@@ -160,7 +174,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -171,7 +185,7 @@ export default {
             "align": "center",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
             "tableSummary": "sum"
 
           }
@@ -182,11 +196,11 @@ export default {
           //   "align": "center",
           //   "colspan": 1,
           //   "rowspan": 1,
-          //   "fontSize": 13,
+          //   "fontSize": 12.5,
           // }
-          
-          , 
-          
+
+          ,
+
           {
             "title": "备注说明",
             "field": "pjxh1Text",
@@ -194,7 +208,7 @@ export default {
             "align": "left",
             "colspan": 2,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
           }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
@@ -220,7 +234,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
@@ -231,12 +245,12 @@ export default {
     },
     {
       "options": {
-        
+
         "left": 40,
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打单",
         "fontFamily": '黑体',
         "field": "createBy",
@@ -251,7 +265,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "车辆",
         "fontFamily": '黑体',
         "field": "pickCar",
@@ -266,7 +280,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "联系方式",
         "fontFamily": '黑体',
         "field": "takerPhone",
@@ -281,7 +295,7 @@ export default {
         "top": 360,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "提单",
         "fontFamily": '黑体',
         "field": "takerDa",
@@ -296,7 +310,7 @@ export default {
         "top": 381,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondNames",

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

@@ -24,20 +24,34 @@ export default {
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商编码",
         "fontFamily": '黑体',
         "field": "customerNumber",
         "color": "#000",
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 550,
+        "top": 50,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "打印次数",
+        "fontFamily": '黑体',
+        "field": "printNum",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
     }, {
       "options": {
         "left": 348,
         "top": 50,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打印日期",
         "fontFamily": '黑体',
         "field": "nowDate",
@@ -46,14 +60,14 @@ export default {
 
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
-    },
-      , {
+    }
+       ,{
       "options": {
         "left": 40,
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "经销商",
         "fontFamily": '黑体',
         "field": "customerName",
@@ -66,7 +80,7 @@ export default {
         "top": 70,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondName",
@@ -81,7 +95,7 @@ export default {
         "top": 90,
         "height": 13,
         "width": 328,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "备注",
         "fontFamily": '黑体',
         "field": "headerRemark",
@@ -93,10 +107,10 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 115,
+        "top": 105,
         "height": 400,
         "width": 633,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "field": "table",
         "fontFamily": '黑体',
         "lineHeight": 16,
@@ -110,7 +124,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }, {
             "title": "发货单号",
@@ -119,7 +133,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -130,7 +144,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -141,7 +155,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
           }
           , {
@@ -151,7 +165,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }, {
@@ -161,7 +175,7 @@ export default {
             "align": "left",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
 
 
           }
@@ -172,7 +186,7 @@ export default {
             "align": "center",
             "colspan": 1,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
             "tableSummary": "sum"
           }
           // , {
@@ -182,7 +196,7 @@ export default {
           //   "align": "center",
           //   "colspan": 1,
           //   "rowspan": 1,
-          //   "fontSize": 13,
+          //   "fontSize": 12.5,
           // }
 
           ,
@@ -194,7 +208,7 @@ export default {
             "align": "left",
             "colspan": 2,
             "rowspan": 1,
-            "fontSize": 13,
+            "fontSize": 12.5,
           }]]
       }, "printElementType": {
         "title": "表格", "type": "table",
@@ -220,7 +234,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "",
         "fontFamily": '黑体',
         "field": "takerName",
@@ -236,7 +250,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "打单",
         "fontFamily": '黑体',
         "field": "createBy",
@@ -251,7 +265,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "车辆",
         "fontFamily": '黑体',
         "field": "pickCar",
@@ -266,7 +280,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "联系方式",
         "fontFamily": '黑体',
         "field": "takerPhone",
@@ -281,7 +295,7 @@ export default {
         "top": 380,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "提单",
         "fontFamily": '黑体',
         "field": "takerDa",
@@ -296,7 +310,7 @@ export default {
         "top": 400,
         "height": 13,
         "width": 218,
-        "fontSize": 13,
+        "fontSize": 12.5,
         "title": "仓库",
         "fontFamily": '黑体',
         "field": "correspondNames",

src/views/supply/policy/components/retail_form.vue

@@ -64,7 +64,10 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe
+      <el-table :data="goodsList" element-loading-text="Loading" border fit
+      show-summary
+            :summary-method="$getSummaries"
+      highlight-current-row stripe
         max-height="400">
         <el-table-column align="left" label="序号" type="index" width="50" />
         <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
@@ -256,10 +259,10 @@
               <el-option
                 v-for="item in policyList"
                 :key="item.code" :label="item.title" :value="item.code">
-                 
+
                     <span>{{ item.title }}</span>
                    <span v-if="item.policyRemark" style="margin-left:15px;color:#f00;font-size:12px">（ {{ item.policyRemark }} ）</span>
-                 
+
               </el-option>
             </el-select>
               </el-form-item>
@@ -648,6 +651,10 @@ export default {
   watch: {
     goodsList: {
       handler(newValue, oldValue) {
+        // oldValue.forEach(item => {
+        //   item.sums1 = ['qty', 'directTransferQty', 'hasSendQty', 'refundableQty','payRebateAmount'];
+        //   item.sums2 = ['price', 'payAmount', 'rebateAmount', 'payRebateAmount', 'totalDiscAmount'];
+        // })
         this.goodsList = newValue
       },
       immediate: true,
@@ -1559,7 +1566,7 @@ export default {
           //   ].dictValue;
            this.goodsList.userList = []
            this.goodsList.forEach(k=>{
-              delete  k.userList 
+              delete  k.userList
            })
 
           const params = {