Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/balance/businessReconciliation/components/detailDrawer/index.tsx

@@ -184,9 +184,11 @@ const DetailDrawer: React.FC<DetailDrawerProps> = (props: DetailDrawerProps) =>
       if (item.products.find((d) => d.productId === record.productId)) {
         let parentArr = [...selectedRowKeys];
         let parentRowArr = [...selectedRows];
-        if (item.products.length === selectedRow.length) {
-          parentArr.push(item.billId);
-          parentRowArr.push(item)
+        if (selectedRow.length > 0) {
+          if (!parentArr.includes(item.billId)) {
+            parentArr.push(item.billId);
+            parentRowArr.push(item)
+          }
         } else {
           if (parentArr.length && parentArr.find((d) => d === item.billId)) {
             parentArr.splice(

src/pages/balance/businessReconciliation/readyReconciliation/index.tsx

@@ -188,9 +188,11 @@ const ReadyReconciliation: React.FC = () => {
       if (item.products.find((d) => d.productId === record.productId)) {
         let parentArr = [...selectedRowKeys];
         let parentRowArr = [...selectedRows];
-        if (item.products.length === selectedRow.length) {
-          parentArr.push(item.billId);
-          parentRowArr.push(item)
+        if (selectedRow.length > 0) {
+          if (!parentArr.includes(item.billId)) {
+            parentArr.push(item.billId);
+            parentRowArr.push(item)
+          }
         } else {
           if (parentArr.length && parentArr.find((d) => d === item.billId)) {
             parentArr.splice(

src/pages/balance/businessRequestFunds/admin/add.tsx

@@ -831,6 +831,13 @@ const Add = () => {
                         <Link>{dataSource['reconciliationNo']}</Link>
                       </Form.Item>
                     </Row>
+                    <Row>
+                      <Form.Item
+                        label='发票号码'
+                      >
+                        {dataSource?.invoiceMessages ? <>{dataSource?.invoiceMessages?.numbers.map((item) => <div>{item.invoiceNumber}({item.invoiceDate})</div>)}</> : '-'}
+                      </Form.Item>
+                    </Row>
                   </>}
                 </Col>
               </Row>