|
|
@@ -53,12 +53,14 @@
|
|
|
<thead>
|
|
|
<tr>
|
|
|
<th style="border: 1px solid #000; padding: 4px; text-align: center; width: 5%;">编号</th>
|
|
|
- <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 25%;">型号规格</th>
|
|
|
- <th v-if="rowItem.bizType == 6" style="border: 1px solid #000; padding: 4px; text-align: center; width: 15%;">客户</th>
|
|
|
- <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 10%;">颜色</th>
|
|
|
- <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 10%;">单位</th>
|
|
|
- <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 10%;">入库数量</th>
|
|
|
- <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 12%;">批次号</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 20%;">型号规格</th>
|
|
|
+ <th v-if="rowItem.bizType == 6" style="border: 1px solid #000; padding: 4px; text-align: center; width: 12%;">客户</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 8%;">颜色</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 8%;">单位</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 8%;">入库数量</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 10%;">批次号</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 8%;">单价</th>
|
|
|
+ <th style="border: 1px solid #000; padding: 4px; text-align: center; width: 10%;">金额</th>
|
|
|
</tr>
|
|
|
</thead>
|
|
|
<tbody>
|
|
|
@@ -70,6 +72,8 @@
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.measureUnit || '' }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.measureQuantity || '' }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ row?.batchNo || '' }}</td>
|
|
|
+ <td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
+ <td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
</tr>
|
|
|
|
|
|
<!-- 合计行 -->
|
|
|
@@ -80,6 +84,8 @@
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;">{{ getTotalAmount(rowItem) }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
+ <td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
+ <td style="border: 1px solid #000; padding: 4px; text-align: center;"></td>
|
|
|
</tr>
|
|
|
</tbody>
|
|
|
</table>
|
|
|
@@ -206,10 +212,10 @@
|
|
|
const isBizType6 = rowItem.bizType == 6;
|
|
|
const supplierValue = rowItem.extInfo?.supplierName || '';
|
|
|
|
|
|
- const totalCols = isBizType6 ? 7 : 6;
|
|
|
+ const totalCols = isBizType6 ? 9 : 8;
|
|
|
const colWidths = isBizType6
|
|
|
- ? [55, 250, 120, 90, 70, 90, 100]
|
|
|
- : [55, 250, 90, 70, 90, 100];
|
|
|
+ ? [55, 200, 100, 70, 70, 70, 80, 70, 80]
|
|
|
+ : [55, 200, 70, 70, 70, 80, 70, 80];
|
|
|
const colGroup = colWidths
|
|
|
.map((w) => `<col width="${w}" style="width:${w}pt;" />`)
|
|
|
.join('');
|
|
|
@@ -229,6 +235,8 @@
|
|
|
<td align="center" valign="middle" style="${td}">${item.measureUnit || ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.measureQuantity || ''}</td>
|
|
|
<td align="center" valign="middle" style="${td}">${item.batchNo || ''}</td>
|
|
|
+ <td align="center" valign="middle" style="${td}"></td>
|
|
|
+ <td align="center" valign="middle" style="${td}"></td>
|
|
|
</tr>`
|
|
|
)
|
|
|
.join('');
|
|
|
@@ -258,6 +266,8 @@
|
|
|
<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;">
|
|
|
@@ -267,12 +277,14 @@
|
|
|
<td align="center" valign="middle" style="${td}"></td>
|
|
|
<td align="center" valign="middle" style="${td};font-weight:bold;">${totalAmount}</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 align="left" valign="middle" style="${labelLeft}">主管:${rowItem.verifyName || ''}</td>
|
|
|
<td align="left" valign="middle" style="${labelLeft}">仓库:${warehouseName}</td>
|
|
|
<td align="left" valign="middle" style="${labelLeft}">记账:${rowItem.extInfo?.createUserName || ''}</td>
|
|
|
- <td colspan="${isBizType6 ? 4 : 3}" align="left" valign="middle" style="${labelLeft}">经手人:${rowItem.fromUser || ''}</td>
|
|
|
+ <td colspan="${isBizType6 ? 6 : 5}" align="left" valign="middle" style="${labelLeft}">经手人:${rowItem.fromUser || ''}</td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
<br style="mso-special-character:line-break;page-break-before:always" />`;
|