修改发货清单

src/components/orderParts/parts/detail-2.vue

@@ -50,6 +50,9 @@ export default {
         { label: '商品名称', model: 'goods.name' },
         { label: '商品规格', model: 'name' },
         { label: '商品数量', model: 'buy_num' },
+        { label: '赠品名称', model: 'gift_name' },
+        { label: '赠品规格', model: 'gift_spec' },
+        { label: '赠品数量', model: 'gift_num' },
       ],
       selected: [],
       fileList: [],
@@ -64,7 +67,6 @@ export default {
       let data = this.deliverList;
       if (data) {
         let test = _(data).groupBy('address._id').values().value();
-
         let list = [];
         for (const p1 of test) {
           let goodsList = [];
@@ -86,6 +88,17 @@ export default {
                 }
               }
               info.push(...p2.goods);
+              console.log(info);
+              for (const p5 of info) {
+                if (p5.gift && p5.gift.length != 0) {
+                  for (const p6 of p5.gift) {
+                    p6.gift_name = p6.goods_name;
+                    p6.gift_spec = p6.spec_name;
+                    p6.gift_num = p6.num;
+                    info.push(p6);
+                  }
+                }
+              }
               goodsList = info.filter((f) => f.is_set != '0');
               let i = 0;
               for (const p4 of info) {
@@ -130,12 +143,12 @@ export default {
         // 获取单元格位置
         let titleCell = worksheet.getCell('A1');
         // 合并单元格
-        worksheet.mergeCells('A1:D1');
+        worksheet.mergeCells('A1:G1');
         // 单元格内容
         titleCell.value = '发货清单';
         worksheet.columns.forEach(function (column, i) {
           column.font = { size: 14 };
-          column.width = 38;
+          column.width = 26;
           column.alignment = { wrapText: true, vertical: 'middle', horizontal: 'left' };
           column.border = { top: { style: 'thin' }, left: { style: 'thin' }, bottom: { style: 'thin' }, right: { style: 'thin' } };
         });
@@ -147,13 +160,13 @@ export default {
         };
         // 设置标题-end
         let data = [
-          ['收获人', p1.address.name],
+          ['收货人', p1.address.name],
           ['联系电话', p1.address.phone],
           ['收货地址', p1.address.province + p1.address.city + p1.address.area + p1.address.address],
-          ['订单号', '产品名称', '产品规格', '购买数量'],
+          ['订单号', '产品名称', '产品规格', '购买数量', '赠品名称', '赠品规格', '赠品数量'],
         ];
         for (const p2 of p1.goodsList) {
-          let p4 = [[p2.order_no, p2.goods.name, p2.name, p2.buy_num]];
+          let p4 = [[p2.order_no, p2.goods.name, p2.name, p2.buy_num, p2.gift_name, p2.gift_spec, p2.gift_num]];
           data.push(...p4);
         }
         const row = worksheet.getRow(1);