Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/saleManage/saleOrder/components/printTemplateHtBatch.vue

@@ -75,11 +75,8 @@
               <td style="padding: 2px; width: 14%"> 批次号</td>
               <td style="padding: 2px; width: 12%"> 裁剪米段</td>
               <td style="padding: 2px; width: 10%"> 盘具</td>
-              <td style="padding: 2px; width: 8%"> 单价</td>
-              <td style="padding: 2px; width: 7%"> 税率</td>
-              <td style="padding: 2px; width: 9%"> 金额</td>
               <td style="padding: 2px; width: 9%"> 颜色 </td>
-              <td style="padding: 2px; width: 13%"> 备注</td>
+              <td style="padding: 2px; width: 21%"> 备注</td>
             </tr>
 
             <tr align="center" v-for="(item, index) in wrapperItem.productList">
@@ -92,9 +89,6 @@
               <td style="padding: 2px"> {{ item.batchNo }}</td>
               <td style="padding: 2px"> {{ item.cuttingLength }}</td>
               <td style="padding: 2px"> {{ item.reelSpecification }}</td>
-              <td style="padding: 2px"> {{ item.singlePrice }}</td>
-              <td style="padding: 2px"> {{ item.taxRate }}{{ item.taxRate !== undefined && item.taxRate !== null ? '%' : '' }}</td>
-              <td style="padding: 2px"> {{ item.totalPrice }}</td>
               <td style="padding: 2px"> {{ item.colorKey }}</td>
               <td style="padding: 2px"> {{ item.remark }}</td>
             </tr>
@@ -107,9 +101,6 @@
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"> </td>
               <td style="padding: 2px"> </td>
-              <td style="padding: 2px">{{ getTotalValue(wrapperItem, 'totalPrice', 2) }}</td>
-              <td style="padding: 2px"> </td>
-              <td style="padding: 2px"> </td>
             </tr>
           </tbody>
         </table>
@@ -340,7 +331,7 @@
         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 = [45, 135, 45, 55, 95, 75, 65, 65, 55, 75, 55, 95];
+        const colWidths = [55, 150, 55, 65, 100, 90, 75, 70, 160];
         const colGroup = colWidths
           .map((w) => `<col width="${w}" style="width:${w}pt;" />`)
           .join('');
@@ -366,9 +357,6 @@
                 <td align="center" valign="middle" style="${td}">${item.batchNo || ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.cuttingLength ?? ''}</td>
                 <td align="center" valign="middle" style="${td}">${item.reelSpecification ?? ''}</td>
-                <td align="center" valign="middle" style="${td}">${item.singlePrice ?? ''}</td>
-                <td align="center" valign="middle" style="${td}">${item.taxRate !== undefined && item.taxRate !== null ? item.taxRate + '%' : ''}</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>
               </tr>`
@@ -380,19 +368,19 @@
             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="12" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
+              <td colspan="9" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
             </tr>
             <tr height="26" style="height:26pt;">
-              <td colspan="8" align="left" valign="middle" style="${labelLeft}"></td>
-              <td colspan="4" align="left" valign="middle" style="${labelLeft}">门店：${wrapperItem.salesDeptName || ''}</td>
+              <td colspan="6" align="left" valign="middle" style="${labelLeft}"></td>
+              <td colspan="3" align="left" valign="middle" style="${labelLeft}">门店：${wrapperItem.salesDeptName || ''}</td>
             </tr>
             <tr height="26" style="height:26pt;">
-              <td colspan="8" align="left" valign="middle" style="${labelLeft}">客户：${wrapperItem.partaName || ''}</td>
-              <td colspan="4" align="left" valign="middle" style="${labelLeft}">单据日期：${wrapperItem.createTime ? wrapperItem.createTime.split(' ')[0] : ''}</td>
+              <td colspan="6" align="left" valign="middle" style="${labelLeft}">客户：${wrapperItem.partaName || ''}</td>
+              <td colspan="3" align="left" valign="middle" style="${labelLeft}">单据日期：${wrapperItem.createTime ? wrapperItem.createTime.split(' ')[0] : ''}</td>
             </tr>
             <tr height="26" style="height:26pt;">
-              <td colspan="8" align="left" valign="middle" style="${labelLeft}">项目名称：${wrapperItem.projectName || ''}</td>
-              <td colspan="4" align="left" valign="middle" style="${labelLeft}">单据编号：${wrapperItem.orderNo || ''}</td>
+              <td colspan="6" align="left" valign="middle" style="${labelLeft}">项目名称：${wrapperItem.projectName || ''}</td>
+              <td colspan="3" align="left" valign="middle" style="${labelLeft}">单据编号：${wrapperItem.orderNo || ''}</td>
             </tr>
 
             <tr height="28" style="height:28pt;">
@@ -403,9 +391,6 @@
               <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>
@@ -419,9 +404,6 @@
               <td align="center" valign="middle" style="${td}"></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}"></td>
             </tr>
             <tr height="28" style="height:28pt;">
               <td colspan="3" align="left" valign="middle" style="${labelLeft}">业务员：${wrapperItem.salesmanName || ''}</td>
@@ -434,7 +416,7 @@
               <td colspan="4" align="left" valign="middle" style="${labelLeft}">客户签字：</td>
             </tr>
             <tr height="28" style="height:28pt;">
-              <td colspan="12" align="left" valign="middle" style="${labelLeft}">备注：${wrapperItem.remark || ''}</td>
+              <td colspan="9" align="left" valign="middle" style="${labelLeft}">备注：${wrapperItem.remark || ''}</td>
             </tr>
           </table>
           <br style="mso-special-character:line-break;page-break-before:always" />`;