feat(invoice): 优化发票记录页面和订单组件

- 修改发票记录页面的确认按钮显示逻辑- 优化订单组件中的发票详情计算逻辑 - 调整开发环境的 API 代理配置

feat(invoice): 优化发票记录页面和订单组件
- 修改发票记录页面的确认按钮显示逻辑- 优化订单组件中的发票详情计算逻辑 - 调整开发环境的 API 代理配置
曾国涛
1 parent f3a79cc5
Showing 3 changed files with 25 additions and 23 deletions
.umirc.ts
src/pages/Invoice/InvoiceRecord/index.tsx
src/pages/Order/Order/components/InvoicingDrawerForm.tsx
@@ -14,9 +14,9 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      // target: 'http://localhost:8085/',
-      // target: 'http://192.168.1.6:8085/',
-      target: 'http://39.108.227.113:8085/',
+      target: 'http://localhost:8085/',
+      //target: 'http://192.168.1.6:8085/',
+      //target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
@@ -375,7 +375,7 @@ const InvoiceRecord = () =&gt; {
           )}
         </>,
         <>
-          {!record.invoice?.invoiceConfirmStatusDatetime && (
+          {record.paths?.includes('INVOICE_CONFIRM') && (
             <ButtonConfirm
               key="delete"
               className="p-0"
@@ -93,7 +93,22 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
       document.body.removeChild(textarea);
     }
   }
-
+  // 定义一个计算总金额的函数
+  const calculateTotalPrice = (index: number) => {
+    const invoiceDetails = form.getFieldValue('invoiceDetails');
+    if (invoiceDetails && invoiceDetails[index]) {
+      const quantity = invoiceDetails[index].quantity || 0;
+      const price = invoiceDetails[index].price || 0;
+      const totalPrice = quantity * price;
+      const newInvoiceDetails = [...invoiceDetails];
+      newInvoiceDetails[index] = { ...newInvoiceDetails[index], totalPrice };
+      form.setFieldsValue({ invoiceDetails: newInvoiceDetails });
+    }
+    const totalPrice = invoiceDetails.reduce((accumulator, currentValue) => {
+      return FloatAdd(accumulator, currentValue.quantity * currentValue.price);
+    }, 0);
+    form.setFieldValue('price', totalPrice);
+  };
   useEffect(() => {}, []);
   return (
     <DrawerForm
@@ -519,12 +534,6 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
                 ]}
                 placeholder="请输入名称"
               />
-              <ProFormText
-                key={'unit' + listMeta.index}
-                name="unit"
-                label="单位"
-                placeholder="请输入名称"
-              />
               <ProFormDigit
                 key={'quantity' + listMeta.index}
                 label="数量"
@@ -539,7 +548,9 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
                     },
                   },
                 ]}
+                onChange={() => calculateTotalPrice(listMeta.index)}
               />
+
               <ProFormDigit
                 key={'price' + listMeta.index}
                 label="单价"
@@ -554,23 +565,13 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
                     },
                   },
                 ]}
+                onChange={() => calculateTotalPrice(listMeta.index)}
               />
+
               <ProFormMoney
                 key={'totalPrice' + listMeta.index}
                 label="金额"
                 name="totalPrice"
-                onChange={() => {
-                  const invoiceDetails = form.getFieldValue('invoiceDetails');
-                  console.log('invoiceDetails', invoiceDetails);
-                  const totalPrice = invoiceDetails.reduce(
-                    (accumulator, currentValue) => {
-                      return FloatAdd(accumulator, currentValue.totalPrice);
-                    },
-                    0,
-                  );
-                  console.log('totalPrice', totalPrice);
-                  form.setFieldValue('price', totalPrice);
-                }}
                 rules={[
                   {
                     validator: (_, value) => {
@@ -581,6 +582,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
                     },
                   },
                 ]}
+                readonly={true}
                 locale="zh-CN"
               />
             </ProCard>