|
@@ -47,7 +47,7 @@
|
|
|
<tr>
|
|
<tr>
|
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">编号</th>
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">编号</th>
|
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center; width: 180px;">名称</th>
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center; width: 180px;">名称</th>
|
|
|
- <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 140px;">规格</th>
|
|
|
|
|
|
|
+ <th style="border: 1px solid #000; padding: 8px; text-align: center; width: 140px;">型号规格</th>
|
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">单位</th>
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">单位</th>
|
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">入库数量</th>
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">入库数量</th>
|
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">单价</th>
|
|
<th style="border: 1px solid #000; padding: 8px; text-align: center;">单价</th>
|
|
@@ -59,7 +59,7 @@
|
|
|
<tr v-for="(row, index) in rowList.outInDetailList" :key="index">
|
|
<tr v-for="(row, index) in rowList.outInDetailList" :key="index">
|
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ index + 1 }}</td>
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ index + 1 }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.categoryName || '' }}</td>
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.categoryName || '' }}</td>
|
|
|
- <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.specification || '' }}</td>
|
|
|
|
|
|
|
+ <td style="border: 1px solid #000; padding: 8px; text-align: center;">{{row.categoryModel || '' }}{{ row.categoryModel && row?.specification ? '/' : '' }}{{ row?.specification || '' }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.measureUnit || '' }}</td>
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.measureUnit || '' }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.measureQuantity || '' }}</td>
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.measureQuantity || '' }}</td>
|
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.unitPrice || 0 }}</td>
|
|
<td style="border: 1px solid #000; padding: 8px; text-align: center;">{{ row?.unitPrice || 0 }}</td>
|