账单生成

web/pages/order/store.tsx

@@ -261,12 +261,8 @@ const StoreOrderPage: React.FC = () => {
             {record.total_quantity}
           </div>
           <div>
-            <Text type={'secondary'}>周转框数量：</Text>
-            {record.box_num}
-          </div>
-          <div>
-            <Text type={'secondary'}>周转托盘数量：</Text>
-            {record.tray_num}
+            <Text type={'secondary'}>总重量：</Text>
+            {record.total_weight}斤
           </div>
         </Space>
       )
@@ -274,24 +270,11 @@ const StoreOrderPage: React.FC = () => {
     {
       title: '订单金额',
       hideInForm: true,
-      dataIndex: 'box_num',
+      dataIndex: 'total_amount',
       hideInSearch: true,
       width: 200,
-      render: (_, record) => (
-        <Space orientation={'vertical'}>
-          <div>
-            <Text type={'secondary'}>商品总金额：</Text>
-            <span className={'text-[red]'}>{record.product_amount} ￥</span>
-          </div>
-          <div>
-            <Text type={'secondary'}>附加总金额：</Text>
-            <span className={'text-[red]'}>{record.added_amount} ￥</span>
-          </div>
-          <div>
-            <Text type={'secondary'}>订单总金额：</Text>
-            <span className={'text-[red] text-[16px]'}>{record.total_amount} ￥</span>
-          </div>
-        </Space>
+      render: (text) => (
+        <span className={'text-[red] text-[16px]'}>{text} ￥</span>
       )
     },
     {
@@ -334,7 +317,7 @@ const StoreOrderPage: React.FC = () => {
     },
     {
       title: '账单ID',
-      dataIndex: 'statement_id',
+      dataIndex: 'bill_id',
       valueType: 'digit',
       hideInForm: true,
     },
@@ -507,8 +490,8 @@ const StoreOrderPage: React.FC = () => {
                 </Tag>
               </Descriptions.Item>
               <Descriptions.Item label="订货总量">{detail.total_quantity}</Descriptions.Item>
-              <Descriptions.Item label="周转框数量">{detail.box_num}</Descriptions.Item>
-              <Descriptions.Item label="周转托盘数量">{detail.tray_num}</Descriptions.Item>
+              <Descriptions.Item label="总重量">{detail.total_weight}斤</Descriptions.Item>
+              <Descriptions.Item label="账单ID">{detail.bill_id ?? '-'}</Descriptions.Item>
               {detail.remark ? (
                 <Descriptions.Item label="备注" span={3}>
                   {detail.remark}
@@ -568,6 +551,14 @@ const StoreOrderPage: React.FC = () => {
                   </div>
                 </div>
               ))}
+              <div className="flex bg-gray-50 px-4 py-3 text-sm">
+                <div className="flex-1">总计</div>
+                <div className="w-30 shrink-0 text-center"></div>
+                <div className="w-30 shrink-0 text-center"></div>
+                <div className="w-26 shrink-0 text-center">{detail.total_quantity}</div>
+                <div className="w-33 shrink-0 text-center text-[red] text-[16px]">￥{detail.total_amount}</div>
+                <div className="w-33 shrink-0 text-center">{detail.total_weight}斤</div>
+              </div>
               {(detail.items ?? []).length === 0 && (
                 <Empty
                   image={Empty.PRESENTED_IMAGE_SIMPLE}
@@ -576,34 +567,6 @@ const StoreOrderPage: React.FC = () => {
                 />
               )}
             </div>
-
-            {/* 附加信息 */}
-            <div className="mt-3! flex justify-end">
-              <div className="w-full rounded bg-gray-50 p-4 text-sm">
-                <div className="flex justify-between py-1">
-                  <Text type="secondary">
-                    周转框金额（{detail.box_num} × ¥{detail.box_price ?? '0.00'}）
-                  </Text>
-                  <span>¥{detail.box_amount ?? '0.00'}</span>
-                </div>
-                <div className="flex justify-between py-1">
-                  <Text type="secondary">
-                    周转托盘金额（{detail.tray_num} × ¥{detail.tray_price ?? '0.00'}）
-                  </Text>
-                  <span>¥{detail.tray_amount ?? '0.00'}</span>
-                </div>
-                <div className="flex justify-between py-1">
-                  <Text type="secondary">商品总金额</Text>
-                  <span>¥{detail.product_amount}</span>
-                </div>
-                <div className="mt-1! flex justify-between border-t border-gray-200 pt-2">
-                  <Text strong>订单总金额</Text>
-                  <Text strong type="danger">
-                    ¥{detail.total_amount}
-                  </Text>
-                </div>
-              </div>
-            </div>
           </>
         ) : null}
       </Drawer>