售后金额

web/pages/purchase/order.tsx

@@ -187,17 +187,18 @@ const PurchaseOrderPage: React.FC = () => {
   const [billSaving, setBillSaving] = useState(false);
   const [billForm] = Form.useForm<{ stores: BillGenerateStoreParams[] }>();
 
-  // 弹窗内实时预览：附加金额 = 筐×筐单价 + 托盘×托盘单价；总额 = 商品 + 配送费 + 附加
+  // 弹窗内实时预览：附加金额 = 筐×筐单价 + 托盘×托盘单价；总额 = 商品 + 配送费 + 附加 + 售后金额（可正负）
   const watchBillStores = Form.useWatch('stores', billForm) ?? [];
   const billPreview = (billPrepare?.stores ?? []).map((row, index) => {
     const input = watchBillStores[index] ?? {};
     const deliveryFee = Number(input.delivery_fee ?? 0);
+    const afterSale = Number(input.after_sale ?? 0);
     const added =
       Number(input.box_num ?? 0) * Number(row.box_price) +
       Number(input.tray_num ?? 0) * Number(row.tray_price);
     return {
       added,
-      total: Number(row.product_amount) + deliveryFee + added,
+      total: Number(row.product_amount) + deliveryFee + added + afterSale,
     };
   });
   const billAllGenerated =
@@ -441,7 +442,7 @@ const PurchaseOrderPage: React.FC = () => {
           delivery_fee: row.bill ? Number(row.bill.delivery_fee) : 0,
           box_num: row.bill ? row.bill.box_num : 0,
           tray_num: row.bill ? row.bill.tray_num : 0,
-          after_sale: row.bill?.after_sale ?? '',
+          after_sale: row.bill ? Number(row.bill.after_sale) : 0,
           remark: row.bill?.remark ?? '',
         })),
       });
@@ -1428,7 +1429,7 @@ const PurchaseOrderPage: React.FC = () => {
         </Form>
       </Modal>
 
-      {/* 生成账单：按门店填写配送费/周转筐/托盘数量（商品金额只读，由订单汇总） */}
+      {/* 生成账单：按门店填写配送费/周转筐/托盘数量与售后金额（商品金额只读，由订单汇总） */}
       <Modal
         title={billPrepare ? `生成账单 · ${billPrepare.purchase.purchase_no}` : '生成账单'}
         open={billOpen}
@@ -1447,7 +1448,7 @@ const PurchaseOrderPage: React.FC = () => {
           {billPrepare && (
             <>
               <div className="py-2 text-gray-500">
-                每个门店单独生成一张账单；商品金额由订单汇总不可修改，请填写各门店的配送费、周转筐/托盘数量（正数=压筐附加金额，负数=回筐抵扣金额）与售后/备注（可选，随账单存档）。
+                每个门店单独生成一张账单；商品金额由订单汇总不可修改，请填写各门店的配送费、周转筐/托盘数量（正数=压筐附加金额，负数=回筐抵扣金额）、售后金额（可正负，计入总金额：正数=加收，负数=售后减免）与备注（可选，随账单存档）。
                 {billAllGenerated ? '该采购单已全部生成账单，仅可查看。' : '生成后采购单中的全部订单将关联到对应门店账单。'}
               </div>
               <Form form={billForm} layout="vertical" onFinish={handleBillSave}>
@@ -1460,7 +1461,7 @@ const PurchaseOrderPage: React.FC = () => {
                         <div className="w-32 shrink-0 text-center">配送费（元）</div>
                         <div className="w-32 shrink-0 text-center">周转筐（¥{billPrepare.stores[0]?.box_price ?? '0.00'}/个）</div>
                         <div className="w-32 shrink-0 text-center">周转托盘（¥{billPrepare.stores[0]?.tray_price ?? '0.00'}/个）</div>
-                        <div className="w-36 shrink-0 text-center">售后</div>
+                        <div className="w-36 shrink-0 text-center">售后金额（元）</div>
                         <div className="w-36 shrink-0 text-center">备注</div>
                         <div className="w-28 shrink-0 text-center">附加金额</div>
                         <div className="flex-1 text-center">账单总金额</div>
@@ -1524,10 +1525,11 @@ const PurchaseOrderPage: React.FC = () => {
                               className="m-0! w-36 shrink-0 px-1!"
                               name={[field.name, 'after_sale']}
                             >
-                              <Input
-                                maxLength={255}
+                              <InputNumber
+                                className="w-full"
+                                precision={2}
                                 disabled={billed}
-                                placeholder="售后说明（可选）"
+                                placeholder="可正负，计入总额"
                               />
                             </Form.Item>
                             <Form.Item