Merge remote-tracking branch 'origin/master'

# Conflicts: # src/pages/Invoice/constant.tsx

Merge remote-tracking branch 'origin/master'
# Conflicts: # src/pages/Invoice/constant.tsx
曾国涛
2 parents 735854df e0b4e44b
Showing 4 changed files with 18 additions and 4 deletions
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/InvoiceVerification/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
@@ -257,7 +257,7 @@ const InvoiceRecord = () =&gt; {
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
           <>
-            {perms.includes('add') && (
+            {perms?.includes('add') && (
               <AddInvoiceDrawerForm
                 onClose={() => {
                   invoiceActionRef.current?.reload();
@@ -267,7 +267,7 @@ const InvoiceRecord = () =&gt; {
             )}
           </>,
           <>
-            {perms.includes('writeOff') && (
+            {perms?.includes('writeOff') && (
               <InvoiceWriteOffModal
                 readOnly={false}
                 getData={() => ({})}
@@ -267,7 +267,7 @@ const InvoiceRecord = () =&gt; {
         scroll={{ x: 1400, y: 360 }}
         toolBarRender={() => [
           <>
-            {perms.includes('writeOff') && (
+            {perms?.includes('writeOff') && (
               <Button
                 key="button"
                 icon={<PlusOutlined />}
@@ -91,6 +91,13 @@ export const INVOICE_COLUMNS = [
     width: 180,
   },
   {
+    title: '金额',
+    dataIndex: 'money',
+    hideInTable: true,
+    valueType: 'money',
+    width: 180,
+  },
+  {
     title: '是否预付款',
     dataIndex: 'orderIsPrePay',
     valueType: 'select',
@@ -294,6 +301,13 @@ export const BANK_STATEMENT_COLUMNS = [
     hideInSearch: true,
   },
   {
+    dataIndex: 'amount',
+    title: '金额',
+    valueType: 'money',
+    width: 100,
+    hideInTable: true,
+  },
+  {
     dataIndex: 'remark',
     title: '备注',
     valueType: 'text',
@@ -60,7 +60,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) =&gt; {
           unit: item.unit,
           quantity: item.quantity,
           price: item.productPrice,
-          totalPrice: item.subOrderPayment,
+          totalPrice: item.quantity * item.productPrice,
         };
       });
       form.setFieldValue('invoiceDetails', initialValue);