【修改】打印模板

src/mixin/print.js

@@ -277,6 +277,8 @@ export default {
       salesOrderId = data.invoicePickBeans[0].salesOrderId;
       invoiceId = data.invoicePickBeans[0].invoiceId;
       let tuiHuoRen = data.createBy
+      // 数量合计
+      let total = 0
       // 初始化打印次数
       let printNum = 0;
       //避免数据发生改变
@@ -294,7 +296,7 @@ export default {
           const newInvoicePickBeans = invoicePickBeans.splice(0, 5);
           for (let e = newInvoicePickBeans.length; e > 0; e--) {
             const tempData = newInvoicePickBeans[e - 1];
-
+            total += +tempData.refundableQty
             //添加表格数据
             table.push({
               id: tempData.id,
@@ -326,6 +328,7 @@ export default {
           takerPhone: data.takerPhone || "",
           headerRemark: data.remark,
           total_num: data.total_num,
+          total:total,
           company:
             data.type === 2
               ? `${this.company}销售退货单`

src/styles/index.scss

@@ -454,4 +454,17 @@ input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer
     font-weight: 600;
     padding-left: 10px;
   }
-}
+}
+.hiprint-printElement-text-content{
+  white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+@media print {
+  .hiprint-printElement-text-content{
+    white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+  }
+}

src/utils/panel.js

@@ -1,376 +1,432 @@
-
 export default {
-  "panels": [{
-    "index": 0,
-    "height": 150,
-    "width": 241,
-    "paperCount": 222,
-    "printElements": [{
-      "options": {
-        "left": 0,
-        "top": 15,
-        "height": 27,
-        "width": 656,
-        "field": "company",
-        "fontSize": 19,
-        "fontWeight": "600",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "textAlign": "center",
-        "lineHeight": 26
-      }, "printElementType": { "title": "", "type": "text" }
-    }, {
-      "options": {
-        "left": 40,
-        "top": 50,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "经销商编码",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "customerNumber",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
+  panels: [
     {
-      "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": 12.5,
-        "title": "打印日期",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "nowDate",
-        "testData": "",
-        "color": "#000",
-
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }
-      , {
-      "options": {
-        "left": 40,
-        "top": 70,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "经销商",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "customerName",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }, {
-      "options": {
-        "left": 348,
-        "top": 70,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "仓库",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "correspondName",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-
-    , {
-      "options": {
-        "left": 40,
-        "top": 90,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "出库单号",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "salesId",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 348,
-        "top": 90,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "发货单号",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "invoiceId",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    , {
-      "options": {
-        "left": 40,
-        "top": 110,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "工程登录编号",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "refEnginRecordNo",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 348,
-        "top": 110,
-        "height": 13,
-        "width": 328,
-        "fontSize": 12.5,
-        "title": "使用单位",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "refUseUnit",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 40,
-        "top": 130,
-        "height": 13,
-        "width": 633,
-        "fontSize": 12.5,
-        "title": "备注",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "headerRemark",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" ,"fontSize": 8,}
-    },
-    {
-      "options": {
-        "left": 23,
-        "top": 145,
-        "height": 410,
-        "width": 633,
-        "fontSize": 12.5,
-        "field": "table",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "lineHeight": 16,
-        "tableFooterRepeat": "",
-        "columns": [[
-         {
-            "title": "订单号",
-            "field": "enginOrderType",
-            "width": 60,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 12.5,
-
-          } , {
-            "title": "发货日期",
-            "field": "createTime",
-            "width": 50,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 12.5,
-
-
-          }
+      index: 0,
+      height: 150,
+      width: 241,
+      paperCount: 222,
+      printElements: [
+        {
+          options: {
+            left: 0,
+            top: 5,
+            height: 27,
+            lineHeight: 27,
+            width: 656,
+            field: "company",
+            fontSize: 19,
+            fontWeight: "600",
+            fontFamily: "黑体,宋体,微软雅黑",
+            textAlign: "center",
+            lineHeight: 26,
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 14,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "打印日期",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "nowDate",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 590,
+            top: 14,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "打印次数",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "printNum",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        // {
+        //   "options": {
+        //     "left": 40,
+        //     "top": 35,
+        //     "height": 13,
+        //     "lineHeight": 13,
+        //     "width": 328,
+        //     "fontSize": 12.5,
+        //     "title": "经销商编码",
+        //     "fontFamily": '黑体,宋体,微软雅黑',
+        //     "field": "customerNumber",
+        //     "color": "#000",
+        //     "textAlign": "left"
+        //   }, "printElementType": { "title": "", "type": "text" }
+        // },
 
-          , {
-            "title": "存货名称",
-            "field": "materialName",
-            "width": 100,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 12.5,
+        {
+          options: {
+            left: 40,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 280,
+            fontSize: 12.5,
+            title: "经销商",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "customerName",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
 
+        ,
+        {
+          options: {
+            left: 250,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 200,
+            fontSize: 12.5,
+            title: "出库单号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "salesId",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 450,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 200,
+            fontSize: 12.5,
+            title: "发货单号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "invoiceId",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
 
-          }, {
-            "title": "规格型号",
-            "field": "specification",
-            "width": 140,
-            "align": "left",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 12.5,
+        {
+          options: {
+            left: 585,
+            top: 35,
+            height: 13,
+            lineHeight: 13,
+            width: 300,
+            fontSize: 12.5,
+            title: "仓库",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "correspondName",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 55,
+            height: 13,
+            lineHeight: 13,
+            width: 328,
+            fontSize: 12.5,
+            title: "工程登录编号",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "refEnginRecordNo",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 250,
+            top: 55,
+            height: 13,
+            lineHeight: 13,
+            width: 410,
+            fontSize: 12.5,
+            title: "使用单位",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "refUseUnit",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 75,
+            height: 13,
+            lineHeight: 13,
+            width: 633,
+            fontSize: 12.5,
+            title: "备注",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "headerRemark",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text", fontSize: 8 },
+        },
+        {
+          options: {
+            left: 23,
+            top: 95,
+            height: 410,
+            width: 633,
+            fontSize: 12.5,
+            field: "table",
+            fontFamily: "黑体,宋体,微软雅黑",
+            lineHeight: 16,
+            tableFooterRepeat: "",
+            columns: [
+              [
+                {
+                  title: "订单号",
+                  field: "enginOrderType",
+                  width: 60,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "发货日期",
+                  field: "createTime",
+                  width: 50,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
 
+                {
+                  title: "存货名称",
+                  field: "materialName",
+                  width: 100,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "规格型号",
+                  field: "specification",
+                  width: 140,
+                  align: "left",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+                {
+                  title: "数量",
+                  field: "refundableQty",
+                  width: 23,
+                  align: "center",
+                  colspan: 1,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                  tableSummary: "sum",
+                },
+                // , {
+                //   "title": "订单备注",
+                //   "field": "headerRemark",
+                //   "width": 40,
+                //   "align": "center",
+                //   "colspan": 1,
+                //   "rowspan": 1,
+                //   "fontSize": 12.5,
+                // }
 
-          }
-          , {
-            "title": "数量",
-            "field": "refundableQty",
-            "width": 23,
-            "align": "center",
-            "colspan": 1,
-            "rowspan": 1,
-            "fontSize": 12.5,
-            "tableSummary": "sum"
-
-          }
-          // , {
-          //   "title": "订单备注",
-          //   "field": "headerRemark",
-          //   "width": 40,
-          //   "align": "center",
-          //   "colspan": 1,
-          //   "rowspan": 1,
-          //   "fontSize": 12.5,
-          // }
-
-          ,
-
-          {
-            "title": "备注说明",
-            "field": "pjxh1Text",
-            "width": 40,
-            "align": "left",
-            "colspan": 2,
-            "rowspan": 1,
-            "fontSize": 12.5,
-          }]]
-      }, "printElementType": {
-        "title": "表格", "type": "table",
-        editable: true,
-        columnDisplayEditable: true,//列显示是否能编辑
-        columnDisplayIndexEditable: true,//列顺序显示是否能编辑
-        columnTitleEditable: true,//列标题是否能编辑
-        columnResizable: true, //列宽是否能调整
-        columnAlignEditable: true,//列对齐是否调整
-        isEnableEditField: true, //编辑字段
-        isEnableContextMenu: true, //开启右键菜单 默认true
-        isEnableInsertRow: true, //插入行
-        isEnableDeleteRow: true, //删除行
-        isEnableInsertColumn: true, //插入列
-        isEnableDeleteColumn: true, //删除列
-        isEnableMergeCell: true, //合并单元格
-      }
-
-    },
-      , {
-      "options": {
-        "left": 40,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "takerName",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
+                {
+                  title: "备注说明",
+                  field: "pjxh1Text",
+                  width: 40,
+                  align: "left",
+                  colspan: 2,
+                  rowspan: 1,
+                  fontSize: 12.5,
+                },
+              ],
+            ],
+          },
+          printElementType: {
+            title: "表格",
+            type: "table",
+            editable: true,
+            columnDisplayEditable: true, //列显示是否能编辑
+            columnDisplayIndexEditable: true, //列顺序显示是否能编辑
+            columnTitleEditable: true, //列标题是否能编辑
+            columnResizable: true, //列宽是否能调整
+            columnAlignEditable: true, //列对齐是否调整
+            isEnableEditField: true, //编辑字段
+            isEnableContextMenu: true, //开启右键菜单 默认true
+            isEnableInsertRow: true, //插入行
+            isEnableDeleteRow: true, //删除行
+            isEnableInsertColumn: true, //插入列
+            isEnableDeleteColumn: true, //删除列
+            isEnableMergeCell: true, //合并单元格
+          },
+        },
+        ,
+        {
+          options: {
+            left: 40,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerName",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 40,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "打单",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "createBy",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 238,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "车辆",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "pickCar",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 238,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "联系方式",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerPhone",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 463,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "提单",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "takerDa",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 463,
+            top: 410,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "仓库",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "correspondNames",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        {
+          options: {
+            left: 600,
+            top: 390,
+            height: 13,
+            lineHeight: 13,
+            width: 218,
+            fontSize: 12.5,
+            title: "合计",
+            fontFamily: "黑体,宋体,微软雅黑",
+            field: "total",
+            testData: "",
+            color: "#000",
+            textAlign: "left",
+          },
+          printElementType: { title: "", type: "text" },
+        },
+        // {
+        //   options: {
+        //     left: 650,
+        //     top: 410,
+        //     height: 13,
+        //     lineHeight: 13,
+        //     width: 218,
+        //     fontSize: 16,
+        //     title: "",
+        //     fontFamily: "黑体,宋体,微软雅黑",
+        //     field: "pageNumber",
+        //     testData: "",
+        //     color: "#000",
+        //     textAlign: "left",
+        //   },
+        //   printElementType: { title: "", type: "text" },
+        // },
+      ],
+      paperNumberDisabled: true,
     },
-    {
-      "options": {
-
-        "left": 40,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "打单",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "createBy",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 238,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "车辆",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "pickCar",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 238,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "联系方式",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "takerPhone",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 463,
-        "top": 390,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "提单",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "takerDa",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 463,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 12.5,
-        "title": "仓库",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "correspondNames",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    },
-    {
-      "options": {
-        "left": 650,
-        "top": 410,
-        "height": 13,
-        "width": 218,
-        "fontSize": 16,
-        "title": "",
-        "fontFamily": '黑体,宋体,微软雅黑',
-        "field": "pageNumber",
-        "testData": "",
-        "color": "#000",
-        "textAlign": "left"
-      }, "printElementType": { "title": "", "type": "text" }
-    }],
-    "paperNumberDisabled": true
-  }]
-}
+  ],
+};

src/views/supply/pickup/pickup_list.vue

@@ -3,63 +3,77 @@
     <div v-show="!isShowForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="100px"
-          size="mini"
-          label-position="left"
-        >
-          <el-row :gutter="20">
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请发货单号" prop="orderNum">
-                <el-input
-                  v-model="screenForm.orderNum"
-                  placeholder="请输入申请发货单号"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请人" prop="applyName">
-                <el-input
-                  v-model="screenForm.applyName"
-                  placeholder="请输入申请人"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="提货仓库" prop="warehouse">
-                <el-input
-                  v-model="screenForm.warehouse"
-                  placeholder="请输入提货仓库"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="提货日期" prop="date">
-                <el-date-picker
-                  v-model="screenForm.date"
-                  type="datetimerange"
-                  range-separator="至"
-                  style="width: 100%"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请发货单号" prop="orderNum">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="jxsName">
+              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="jxsNum">
+              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓库" prop="warehouse">
+              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="screenForm.status" placeholder="请选择">
+                <el-option label="未打单" :value="0">
+                </el-option>
+                <el-option label="已打单" :value="1">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="手机号" prop="takerPhone">
+              <el-input type="number" v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人" prop="takerId">
+              <el-select v-model="screenForm.takerId" placeholder="请选择">
+                <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
+                </el-option>
 
-            <el-col :xs="24" :sm="24" :lg="24" class="tr">
-              <el-form-item label="">
-                <el-button @click="resetScreenForm">清空</el-button>
-                <el-button type="primary" @click="submitScreenForm"
-                  >搜索</el-button
-                >
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请日期" prop="date">
+              <el-date-picker v-model="screenForm.date" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="打印时间" prop="printTime">
+              <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="出库单号" prop="salesOrderId">
+              <el-input type="number" v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-form-item label="">
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       </div>
 
       <div class="mymain-container">
@@ -351,7 +365,8 @@
 </template>
 
 <script>
-import { getPickupList, cancelData } from "@/api/supply/pickup";
+import { getPickupList, cancelData,getPickupManList } from "@/api/supply/pickup";
+
 import PickupForm from "@/views/supply/pickup/components/pickup_form";
 
 export default {
@@ -368,11 +383,17 @@ export default {
       screenForm: {
         // 筛选表单数据
         orderNum: "",
-        applyName: "",
+        jxsName: "",
+        jxsNum: "",
         warehouse: "",
         date: "",
+        status: "",
+        takerPhone: "",
+        takerId: "",
+        printTime: "",
+        salesOrderId: "",
       },
-
+      pickupManList: "",
       queryItem: {},
       isShowForm: false,
     };
@@ -385,16 +406,25 @@ export default {
     exParams() {
       return {
         invoiceId: this.screenForm.orderNum,
-        createBy: this.screenForm.applyName,
+        customerName: this.screenForm.jxsName,
+        customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        takerId: this.screenForm.takerId,
+        printStartTime: this.screenForm.printTime[0],
+        printEndTime: this.screenForm.printTime[1],
+        salesOrderId: this.screenForm.salesOrderId,
+
       };
     },
   },
 
   created() {
     this.getList();
+    this.getPickupManList()
   },
 
   methods: {
@@ -406,7 +436,11 @@ export default {
       // return index >= 0;
       return true;
     },
-
+    getPickupManList() {
+      getPickupManList({ pageNum: 1, pageSize: -1 }).then((res) => {
+        this.pickupManList = res.data.records;
+      });
+    },
     // 查询列表
     getList() {
       this.listLoading = true;
@@ -415,10 +449,17 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         invoiceId: this.screenForm.orderNum,
-        createBy: this.screenForm.applyName,
+        customerName: this.screenForm.jxsName,
+        customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        pickStartTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        pickEndTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
+        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        status: this.screenForm.status,
+        takerPhone: this.screenForm.takerPhone,
+        takerId: this.screenForm.takerId,
+        printStartTime: this.screenForm.printTime[0],
+        printEndTime: this.screenForm.printTime[1],
+        salesOrderId: this.screenForm.salesOrderId,
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;