fix: 发货单数量校验问题

src/views/purchasingManage/purchaseOrder/invoice/components/print-template-ht.vue

@@ -80,6 +80,7 @@
             <td style="padding: 5px"> 单价</td>
             <td style="padding: 5px"> 金额</td>
             <td style="padding: 5px"> 批次号</td>
+            <td style="padding: 5px"> 税率</td>
             <td style="padding: 5px"> 备注</td>
           </tr>
 
@@ -95,11 +96,12 @@
             <td style="padding: 5px"> {{ showPrice ? item.discountSinglePrice : ''}} </td>
             <td style="padding: 5px"> {{ showPrice ? item.discountTotalPrice : ''}} </td>
             <td style="padding: 5px"> {{ item.batchNo }}</td>
+            <td style="padding: 5px"> {{ item.taxRate ? item.taxRate + '%' : '' }}</td>
             <td style="padding: 5px"> {{ item.remark }}</td>
           </tr>
           <tr align="center">
             <td style="padding: 5px" colspan="2">合计 </td>
-            <td style="padding: 5px; text-align: left;" colspan="8">
+            <td style="padding: 5px; text-align: left;" colspan="9">
               <div style="display: flex;">
                 <span style="flex: 1"
                   >本页数量小计：{{ getAll(record, 'receiveTotalCount') }}</span
@@ -118,7 +120,7 @@
           </tr>
           <tr align="center">
             <td style="padding: 5px" colspan="2">合计金额（大写金额） </td>
-            <td style="padding: 5px; text-align: left;" colspan="8">
+            <td style="padding: 5px; text-align: left;" colspan="9">
               <div style="display: flex; margin-top: 6px;">
                 <span style="flex: 1"
                   >{{ showPrice ? convertToChinese(getAll(record, 'discountTotalPrice')) : '' }}</span
@@ -276,9 +278,9 @@ export default {
       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 = [50, 100, 120, 100, 60, 80, 90, 100, 80, 120];
+      const colWidths = [50, 100, 120, 100, 60, 80, 90, 100, 80, 60, 120];
       const colGroup = colWidths.map((w) => `<col width="${w}" style="width:${w}pt;" />`).join('');
-      const title = `${this.groupName || ''}入库单`;
+      const title = `${this.groupName ? this.groupName + '入库单' : '采购入库单'}`;
 
       // 遍历多个入库单，分别生成表格
       let tables = '';
@@ -313,6 +315,7 @@ export default {
             <td align="center" valign="middle" style="${td}">${this.showPrice ? item.discountSinglePrice : ''}</td>
             <td align="center" valign="middle" style="${td}">${rowTotal}</td>
             <td align="center" valign="middle" style="${td}">${item.batchNo || ''}</td>
+            <td align="center" valign="middle" style="${td}">${item.taxRate ? item.taxRate + '%' : ''}</td>
             <td align="center" valign="middle" style="${td}">${item.remark || ''}</td>
           </tr>`;
         }).join('');
@@ -322,15 +325,15 @@ export default {
           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="10" align="center" valign="middle" style="${border}padding:6px;text-align:center;font-family:'宋体';font-size:22pt;font-weight:bold;">${title}</td>
+            <td colspan="11" 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="4" align="left" valign="middle" style="${labelLeft}">供应商：${record.supplierName || ''}</td>
+            <td colspan="5" align="left" valign="middle" style="${labelLeft}">供应商：${record.supplierName || ''}</td>
             <td colspan="3" align="left" valign="middle" style="${labelLeft}">日期：${record.receiveDate || ''}</td>
             <td colspan="3" align="left" valign="middle" style="${labelLeft}">编号：${record.receiveNo || ''}</td>
           </tr>
           <tr height="26" style="height:26pt;">
-            <td colspan="10" align="left" valign="middle" style="${labelLeft}">摘要：</td>
+            <td colspan="11" align="left" valign="middle" style="${labelLeft}">摘要：</td>
           </tr>
           <tr height="28" style="height:28pt;">
             <td align="center" valign="middle" style="${th}">编号</td>
@@ -342,12 +345,13 @@ export default {
             <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="9" align="left" valign="middle" style="${td};font-weight:bold;">
+            <td colspan="10" align="left" valign="middle" style="${td};font-weight:bold;">
               <span>本页数量小计：${totalCount}</span>
               <span style="margin-left:40px;">本页金额小计：${totalPrice}</span>
               <span style="margin-left:40px;">汇总数量：${totalCount}</span>
@@ -356,15 +360,15 @@ export default {
           </tr>
           <tr height="26" style="height:26pt;">
             <td align="center" valign="middle" style="${td};font-weight:bold;">合计金额（大写金额）</td>
-            <td colspan="9" align="left" valign="middle" style="${td};font-weight:bold;">
+            <td colspan="10" align="left" valign="middle" style="${td};font-weight:bold;">
               ${this.showPrice ? convertToChinese(totalPriceNum) : ''}
             </td>
           </tr>
           <tr height="28" style="height:28pt;">
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">收货单审核人：${record.reviewerName || ''}</td>
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">采购发起人：${record.purchaseInitiatorName || ''}</td>
-            <td colspan="2" align="left" valign="middle" style="${labelLeft}">质检人：${record.qualityName || ''}</td>
-            <td colspan="4" align="left" valign="middle" style="${labelLeft}">仓管员：${record.warehouseKeeperName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">收货单审核人：${record.reviewerName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">采购发起人：${record.purchaseInitiatorName || ''}</td>
+            <td colspan="3" align="left" valign="middle" style="${labelLeft}">质检人：${record.qualityName || ''}</td>
+            <td colspan="2" align="left" valign="middle" style="${labelLeft}">仓管员：${record.warehouseKeeperName || ''}</td>
           </tr>
         </table>`;
 

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -321,7 +321,7 @@
             ]"
           >
             <el-input
-              v-model="scope.row.notGenerateSendCount"
+              v-model="scope.row.saleCount"
               placeholder="请输入"
               type="number"
               :min="0"
@@ -1538,6 +1538,8 @@
           }
           item.receiveTotalWeight = item.receiveTotalWeight || 0;
 
+          item.saleCount = item.notGenerateSendCount;
+
           if (item.weightUnit == item.measuringUnit) {
             item.sendTotalWeight = item.sendTotalWeight || item.totalCount;
           } else {
@@ -1760,7 +1762,7 @@
         this.$refs.form.validate((valid, obj) => {
           // 找出所有发货数量超过订单剩余数量的产品
           const exceededItems = this.form.datasource.filter(
-            (item) => Number(item.totalCount) > item.notGenerateSendCount
+            (item) => Number(item.saleCount) > item.notGenerateSendCount
           );
           // 退货单退货不校验数量，实物赔偿无法计算
           if (