liujt преди 1 седмица
родител
ревизия
447d647c1f
променени са 2 файла, в които са добавени 79 реда и са изтрити 80 реда
  1. 77 78
      src/views/saleManage/saleOrder/returnGoods/components/printTemplateRt.vue
  2. 2 2
      src/views/saleManage/saleOrder/returnGoods/index.vue

+ 77 - 78
src/views/saleManage/saleOrder/returnGoods/components/printTemplateRt.vue

@@ -12,7 +12,11 @@
           align-items: center;
           justify-content: center;
           flex-direction: column;
+          margin-bottom: 20px;
+          page-break-after: always;
         "
+        v-for="wrapperItem in formData"
+        :key="wrapperItem.id"
       >
         <div style="width: 100%;">
           <div
@@ -24,7 +28,7 @@
               margin: 0 auto;
             "
           >
-            {{ saleOrderData?.salesDeptName }}{{ saleOrderData?.saleTypeName }}退货单
+            {{ wrapperItem.saleOrderData?.salesDeptName }}{{ wrapperItem.saleOrderData?.saleTypeName }}退货单
           </div>
         </div>
         <div
@@ -37,8 +41,8 @@
             margin-top: 20px;
           "
         >
-          <span style="width: 25%">制单日期:{{ formData.createTime ? formData.createTime.split(' ')[0] : '' }}</span>
-          <span style="width: 25%">单据编号:{{ formData.returnNo }}</span>
+          <span style="width: 25%">制单日期:{{ wrapperItem.createTime ? wrapperItem.createTime.split(' ')[0] : '' }}</span>
+          <span style="width: 25%">单据编号:{{ wrapperItem.returnNo }}</span>
           <span style="width: 50%">退货原因:</span>
         </div>
         <div
@@ -50,9 +54,9 @@
             margin-bottom: 10px;
           "
         >
-          <span style="width: 50%">退货单位:{{ formData.contactName }}</span>
-          <span style="width: 25%">制单人:{{ formData.makerName }}</span>
-          <span style="width: 25%">退货人:{{ formData.makerName }}</span>
+          <span style="width: 50%">退货单位:{{ wrapperItem.contactName }}</span>
+          <span style="width: 25%">制单人:{{ wrapperItem.makerName }}</span>
+          <span style="width: 25%">退货人:{{ wrapperItem.makerName }}</span>
         </div>
         <table
           cellspacing="0"
@@ -78,7 +82,7 @@
               <td style="padding: 2px; width: 10%"> 备注</td>
             </tr>
 
-            <tr align="center" v-for="(item, index) in formData.productList" :key="item.id">
+            <tr align="center" v-for="item in wrapperItem.productList" :key="item.id">
               <!-- <td style="padding: 2px"> {{ index + 1 }} </td> -->
               <td style="padding: 2px"> {{ item.productCode }} </td>
               <td style="padding: 2px"> {{ item.productName }} </td>
@@ -94,13 +98,10 @@
             </tr>
             <tr align="center">
               <td style="padding: 2px"> 合计 </td>
-              <!-- <td style="padding: 2px" colspan="2">{{ numberToChinese(getTotalValue(formData, 'totalPrice', 2)) }}</td> -->
-              
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"></td>
-              <!-- <td style="padding: 2px">{{ getTotalValue(formData, 'totalCount', 2) ? '-' + getTotalValue(formData, 'totalPrice', 2) : ''}}</td> -->
-              <td style="padding: 2px">{{ getTotalValue(formData, 'totalCount', 2) }} </td>
+              <td style="padding: 2px">{{ getTotalValue(wrapperItem, 'totalCount', 2) }} </td>
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"> </td>
@@ -138,26 +139,30 @@
         checked: '',
         QRvisible: false,
         isPrintPrice: false,
-        formData: {
-          contactName: '',
-          createTime: '',
-          docNo: '',
-          partbAddress: '',
-          partbLinkName: '',
-          productList: [],
-          totalCount: 0
-        }
+        formData: []
       };
     },
 
     methods: {
-      async open(id) {
-        this.formData = await getReturnSaleOrderrecordDetail(id);
-        this.saleOrderData = await getSaleOrderDetail(this.formData?.returnOrderList?.[0]?.orderId);
-        console.log('formData~~~', this.formData, this.saleOrderData);
+      // ids: 退货单 id 数组(兼容传单个 id)
+      async open(ids) {
+        const idList = Array.isArray(ids) ? ids : [ids];
+        // 并行获取每条退货单详情
+        const details = await Promise.all(
+          idList.map((id) => getReturnSaleOrderrecordDetail(id))
+        );
+        // 并行获取每条对应的销售单信息(用于标题)
+        await Promise.all(
+          details.map(async (detail) => {
+            const orderId = detail?.returnOrderList?.[0]?.orderId;
+            detail.saleOrderData = orderId
+              ? await getSaleOrderDetail(orderId).catch(() => ({}))
+              : {};
+          })
+        );
+        this.formData = details;
+        console.log('formData~~~', this.formData);
         this.QRvisible = true;
-
-        //包装维度
       },
       close() {
         this.QRvisible = false;
@@ -233,11 +238,6 @@
         return negative + intStr + decStr;
       },
       exportExcel() {
-        const list = this.formData.productList || [];
-        const totalCount = this.getTotalValue(this.formData, 'totalCount', 2);
-        const totalPrice = this.getTotalValue(this.formData, 'totalPrice', 2);
-        const totalChinese = this.numberToChinese(totalPrice);
-
         const border =
           'border-top:1px solid #000;border-right:1px solid #000;border-bottom:1px solid #000;border-left:1px solid #000;';
         const cellBase = `${border}padding:4px;mso-number-format:"\\@";vertical-align:middle;text-align:center;mso-horizontal-align:center;`;
@@ -245,84 +245,80 @@
         const td = `${cellBase}font-family:'宋体';font-size:11pt;`;
         const labelLeft = `${border}padding:4px;mso-number-format:"\\@";vertical-align:middle;text-align:left;mso-horizontal-align:left;font-family:'宋体';font-size:11pt;`;
 
-        const colWidths = [55, 170, 55, 70, 75, 65, 90, 70, 110];
+        // 与打印模板列对应:物料编号/物料名称/规格/单位/数量/原领料单单号/仓库/备注
+        const colWidths = [110, 110, 120, 45, 55, 90, 70, 90];
         const colGroup = colWidths
           .map((w) => `<col width="${w}" style="width:${w}pt;" />`)
           .join('');
 
-        const title = `${this.groupName || ''}退货单`;
+        // 遍历多个单据生成多个表格(与打印一致)
+        let tables = '';
+        this.formData.forEach((wrapperItem) => {
+          const list = wrapperItem.productList || [];
+          const totalCount = this.getTotalValue(wrapperItem, 'totalCount', 2);
+          const tableTitle = `${wrapperItem.saleOrderData?.salesDeptName || ''}${
+            wrapperItem.saleOrderData?.saleTypeName || ''
+          }退货单`;
 
-        const rows = list
-          .map(
-            (item, index) => `
+          const rows = list
+            .map(
+              (item) => `
               <tr height="24" style="height:24pt;">
-                <td align="center" valign="middle" style="${td}">${index + 1}</td>
-                <td align="center" valign="middle" style="${td}">${item.modelType || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.productCode || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.productName || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.specification || ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.measuringUnit || ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.totalCount ?? ''}</td>
-                <td align="center" valign="middle" style="${td}">${item.singlePrice ?? ''}</td>
-                <td align="center" valign="middle" style="${td}">${
-              item.taxRate ? item.taxRate + '%' : '0%'
-            }</td>
-                <td align="center" valign="middle" style="${td}">${item.totalPrice ?? ''}</td>
-                <td align="center" valign="middle" style="${td}">${item.colorKey || ''}</td>
-                <td align="center" valign="middle" style="${td}">${item.remark || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.orderNo || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.warehouseName || ''}</td>
+                <td align="center" valign="middle" style="${td}">${item.returnReason || ''}</td>
               </tr>`
-          )
-          .join('');
+            )
+            .join('');
 
-        const table = `
+          tables += `
           <table border="1" cellspacing="0" cellpadding="0" align="center"
             style="border-collapse:collapse;border:1px solid #000;mso-border-alt:solid #000 0.5pt;font-family:'宋体';font-size:11pt;text-align:center;">
             <colgroup>${colGroup}</colgroup>
             <tr height="40" style="height:40pt;">
-              <td colspan="9" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
+              <td colspan="8" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${tableTitle}</td>
             </tr>
             <tr height="26" style="height:26pt;">
-              <td colspan="6" align="left" valign="middle" style="${labelLeft}">客户:${this.formData.contactName || ''}</td>
-              <td colspan="3" align="left" valign="middle" style="${labelLeft}">单据日期:${this.formData.createTime ? this.formData.createTime.split(' ')[0] : ''}</td>
+              <td colspan="2" align="left" valign="middle" style="${labelLeft}">制单日期:${wrapperItem.createTime ? wrapperItem.createTime.split(' ')[0] : ''}</td>
+              <td colspan="3" align="left" valign="middle" style="${labelLeft}">单据编号:${wrapperItem.returnNo || ''}</td>
+              <td colspan="3" align="left" valign="middle" style="${labelLeft}">退货原因:</td>
             </tr>
             <tr height="26" style="height:26pt;">
-              <td colspan="6" align="left" valign="middle" style="${labelLeft}">发货单号:${this.formData.sendNo || ''}</td>
-              <td colspan="3" align="left" valign="middle" style="${labelLeft}">退货单号:${this.formData.returnNo || ''}</td>
+              <td colspan="4" align="left" valign="middle" style="${labelLeft}">退货单位:${wrapperItem.contactName || ''}</td>
+              <td colspan="2" align="left" valign="middle" style="${labelLeft}">制单人:${wrapperItem.makerName || ''}</td>
+              <td colspan="2" align="left" valign="middle" style="${labelLeft}">退货人:${wrapperItem.makerName || ''}</td>
             </tr>
-
             <tr height="28" style="height:28pt;">
-              <td align="center" valign="middle" style="${th}">序号</td>
-              <td align="center" valign="middle" style="${th}">规格型号</td>
+              <td align="center" valign="middle" style="${th}">物料编号</td>
+              <td align="center" valign="middle" style="${th}">物料名称</td>
+              <td align="center" valign="middle" style="${th}">规格</td>
               <td align="center" valign="middle" style="${th}">单位</td>
               <td align="center" valign="middle" style="${th}">数量</td>
-              <td align="center" valign="middle" style="${th}">单价</td>
-              <td align="center" valign="middle" style="${th}">税率</td>
-              <td align="center" valign="middle" style="${th}">金额</td>
-              <td align="center" valign="middle" style="${th}">颜色</td>
+              <td align="center" valign="middle" style="${th}">原领料单单号</td>
+              <td align="center" valign="middle" style="${th}">仓库</td>
               <td align="center" valign="middle" style="${th}">备注</td>
             </tr>
             ${rows}
             <tr height="26" style="height:26pt;">
               <td align="center" valign="middle" style="${td};font-weight:bold;">合计</td>
-              <td colspan="2" align="center" valign="middle" style="${td};font-weight:bold;">${totalChinese}</td>
-              <td align="center" valign="middle" style="${td};font-weight:bold;">${totalCount}</td>
               <td align="center" valign="middle" style="${td}"></td>
               <td align="center" valign="middle" style="${td}"></td>
-              <td align="center" valign="middle" style="${td};font-weight:bold;">${totalPrice}</td>
+              <td align="center" valign="middle" style="${td}"></td>
+              <td align="center" valign="middle" style="${td};font-weight:bold;">${totalCount}</td>
+              <td align="center" valign="middle" style="${td}"></td>
               <td align="center" valign="middle" style="${td}"></td>
               <td align="center" valign="middle" style="${td}"></td>
             </tr>
-            <tr height="28" style="height:28pt;">
-              <td colspan="3" align="left" valign="middle" style="${labelLeft}">业务员:${this.formData.salesmanName || ''}</td>
-              <td colspan="2" align="left" valign="middle" style="${labelLeft}">制单人:${this.formData.makerName || ''}</td>
-              <td colspan="2" align="left" valign="middle" style="${labelLeft}">核对人:${this.formData.reviewerName || ''}</td>
-              <td colspan="2" align="left" valign="middle" style="${labelLeft}">发货人:</td>
-            </tr>
-            <tr height="28" style="height:28pt;">
-              <td colspan="9" align="left" valign="middle" style="${labelLeft}">客户签字:</td>
-            </tr>
-            <tr height="28" style="height:28pt;">
-              <td colspan="9" align="left" valign="middle" style="${labelLeft}">备注:${this.formData.remark || ''}</td>
-            </tr>
-          </table>`;
+          </table>
+          <br style="mso-special-character:line-break;page-break-before:always" />`;
+        });
 
+        const title = '退货单';
         const html = `<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40">
         <head>
         <meta charset="UTF-8" />
@@ -343,12 +339,15 @@
         </x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook>
         </xml><![endif]-->
         </head>
-        <body>${table}</body></html>`;
+        <body>${tables}</body></html>`;
 
         const blob = new Blob(['' + html], {
           type: 'application/vnd.ms-excel;charset=utf-8'
         });
-        saveAs(blob, `${title}_${this.formData.returnNo || ''}.xls`);
+        const firstReturnNo = this.formData[0]?.returnNo || '';
+        const suffix =
+          this.formData.length > 1 ? `等${this.formData.length}条` : firstReturnNo;
+        saveAs(blob, `${title}_${suffix}.xls`);
       }
     }
   };

+ 2 - 2
src/views/saleManage/saleOrder/returnGoods/index.vue

@@ -465,8 +465,8 @@
         this.$refs.printTemplateHtRef.open(this.selection[0].id);
       },
       handleRtPrintRt() {
-        if (this.selection.length > 1) return this.$message.warning('请选择一条');
-        this.$refs.printTemplateRtRef.open(this.selection[0].id);
+        // if (this.selection.length > 1) return this.$message.warning('请选择一条');
+        this.$refs.printTemplateRtRef.open(this.selection.map((v) => v.id));
       },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {