update

src/pages/realEstate/index.tsx

@@ -10,7 +10,7 @@ import ModalFooter from "./components/modalFooter";
 import { handleGetPassportInfoById } from "../DigitalElectronics/service";
 // 引入地址解析工具
 import { handleAddressChange, parseAddress } from "@/utils/addressParser";
-import { handleGetServerpartDDL, handleGetServerpartInfo } from "../serverpartAssets/service";
+import { handleGetServerpartDDL, handleGetServerpartInfo, handleGetServerpartTree } from "../serverpartAssets/service";
 import { handleGetSERVERPARTDetail } from "../operationReport/service";
 
 
@@ -39,7 +39,13 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
     const [selectRowDetail, setSelectRowDetail] = useState<any>()
     // 当前服务区下的方位
     const [SERVERPARTREGION, setSERVERPARTREGION] = useState<any>()
-
+    // 服务区列表
+    const [searchServerPartList, setSearchServerPartList] = useState<any>()
+    const [columnsState, setColumnsState] = useState<any>({
+        PROVINCE_NAME: { show: false },
+        CITY_NAME: { show: false },
+        SPECIALINDUSTRY_NUMBER: { show: false },
+    })
 
     // 列表配置
     const columns: any = [
@@ -60,8 +66,26 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
             fieldProps: {
                 picker: "day",
                 format: 'YYYY-MM-DD',
+            },
+            hideInSearch: isComponent
+        },
+        {
+            title: "服务区",
+            dataIndex: "serverPartId",
+            ellipsis: true,
+            width: 180,
+            align: 'center',
+            hideInTable: true,
+            valueType: 'select',
+            fieldProps: {
+                options: searchServerPartList,
+                showSearch: true,
+                filterOption: (input: string, option: any) => {
+                    return option?.label?.toLowerCase().includes(input.toLowerCase())
                 }
             },
+            hideInSearch: !isComponent
+        },
         {
             title: "服务区名称",
             dataIndex: "SERVERPART_NAME",
@@ -71,16 +95,80 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
             align: 'center'
         },
         {
-            title: "不动产类型",
+            title: "租赁期限",
-            dataIndex: "REALESTATE_TYPE",
+            dataIndex: "LEASEDATE",
-            width: 150,
+            hideInSearch: true,
-            valueType: "select",
+            ellipsis: true,
+            width: 250,
             align: 'center',
-            valueEnum: {
+            render: (_: any, record: any) => {
-                1000: "房屋租赁",
+                return `${record?.START_LEASEDATE || ""}${record?.END_LEASEDATE ? `-${record?.END_LEASEDATE}` : ''}`
-                2000: "车辆资产",
             }
         },
+
+        {
+            title: "查询内容",
+            dataIndex: "searchText",
+            hideInTable: true,
+            fieldProps: {
+                placeholder: "请输入省份名称/城市名称",
+            },
+            hideInSearch: isComponent
+        },
+        {
+            title: "省份名称",
+            dataIndex: "PROVINCE_NAME",
+            hideInSearch: true,
+            ellipsis: true,
+            width: 150,
+            align: 'center'
+        },
+        {
+            title: "城市名称",
+            dataIndex: "CITY_NAME",
+            hideInSearch: true,
+            ellipsis: true,
+            width: 150,
+            align: 'center'
+        },
+        {
+            title: "详细地址",
+            dataIndex: "REALESTATE_ADDRESS",
+            hideInSearch: true,
+            ellipsis: true,
+            width: 380,
+            align: 'center'
+        },
+        {
+            title: "是否跨地",
+            dataIndex: "CROSS_CITYSIGN",
+            hideInSearch: true,
+            ellipsis: true,
+            width: 120,
+            align: 'center',
+            render: (_: any, record: any) => {
+                return record?.CROSS_CITYSIGN ? "是" : "否"
+            }
+        },
+        {
+            title: "面积单位",
+            dataIndex: "AREA_UNIT",
+            hideInSearch: true,
+            ellipsis: true,
+            width: 120,
+            align: 'center',
+            valueType: "select",
+            valueEnum: {
+                1: "平方千米",
+                2: "平方米",
+                3: "公顷",
+                4: "亩",
+                5: "h㎡",
+                6: "k㎡",
+                7: "㎡"
+            }
+        },
+
         {
             title: "产权证号",
             dataIndex: "ESTATE_IDENTITY",
@@ -114,77 +202,17 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
             }
         },
         {
-            title: "查询内容",
+            title: "不动产类型",
-            dataIndex: "searchText",
+            dataIndex: "REALESTATE_TYPE",
-            hideInTable: true,
-            fieldProps: {
-                placeholder: "请输入省份名称/城市名称",
-            }
-        },
-        {
-            title: "省份名称",
-            dataIndex: "PROVINCE_NAME",
-            hideInSearch: true,
-            ellipsis: true,
             width: 150,
-            align: 'center'
-        },
-        {
-            title: "城市名称",
-            dataIndex: "CITY_NAME",
-            hideInSearch: true,
-            ellipsis: true,
-            width: 150,
-            align: 'center'
-        },
-        {
-            title: "详细地址",
-            dataIndex: "REALESTATE_ADDRESS",
-            hideInSearch: true,
-            ellipsis: true,
-            width: 180,
-            align: 'center'
-        },
-        {
-            title: "是否跨地",
-            dataIndex: "CROSS_CITYSIGN",
-            hideInSearch: true,
-            ellipsis: true,
-            width: 120,
-            align: 'center',
-            render: (_: any, record: any) => {
-                return record?.CROSS_CITYSIGN ? "是" : "否"
-            }
-        },
-        {
-            title: "面积单位",
-            dataIndex: "AREA_UNIT",
-            hideInSearch: true,
-            ellipsis: true,
-            width: 120,
-            align: 'center',
             valueType: "select",
-            valueEnum: {
-                1: "平方千米",
-                2: "平方米",
-                3: "公顷",
-                4: "亩",
-                5: "h㎡",
-                6: "k㎡",
-                7: "㎡"
-            }
-        },
-        {
-            title: "租赁期限",
-            dataIndex: "LEASEDATE",
-            hideInSearch: true,
-            ellipsis: true,
-            width: 250,
             align: 'center',
-            render: (_: any, record: any) => {
+            valueEnum: {
-                return `${record?.START_LEASEDATE || ""}${record?.END_LEASEDATE ? `-${record?.END_LEASEDATE}` : ''}`
+                1000: "房屋租赁",
-            }
+                2000: "车辆资产",
-        }
+            },
+            hideInSearch: isComponent
+        },
     ]
 
     // 获取当前用户信息的方法 
@@ -289,11 +317,20 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
         return data
     }
 
+    // 获得服务区列表
+    const handleGetServerPartList = async () => {
+        const req: any = {
+            ProvinceCode: "530000",
+        }
+        const data = await handleGetServerpartDDL(req)
+        setSearchServerPartList(data)
+    }
 
     useEffect(() => {
         if (isFirst) {
             handleGetUserInfo()
             setIsFirst(false)
+            handleGetServerPartList()
         }
     }, [])
 
@@ -323,20 +360,47 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
                 rowKey={'REALESTATE_ID'}
                 scroll={{ x: '100%', y: 'calc(100vh - 450px)' }}
                 headerTitle={'不动产列表'}
-                search={isComponent ? false : { span: 6, }}
+                search={isComponent && Number(serverPartId) !== 1269 ? false : { span: 6 }}
                 request={async (params) => {
+                    console.log('selectRealEstateIdselectRealEstateId', selectRealEstateId);
+
 
                     if (!selectedId && !isComponent) {
                         return []
                     }
 
+                    if (isComponent && selectRealEstateId && selectRealEstateId.length > 0) {
+
+                    } else {
+                        if (Number(serverPartId) === 1269 && params?.serverPartId) {
+
+                        } else {
+                            return []
+                        }
+                    }
+
+
+                    // if (Number(serverPartId) === 1269 && params?.serverPartId && !(selectRealEstateId && selectRealEstateId.length > 0)) {
+
+                    // } else {
+                    //     return []
+                    // }
+
+                    // if (isComponent && !(selectRealEstateId && selectRealEstateId.length > 0)) {
+                    //     return []
+                    // }
+
+                    console.log('serverPartIdserverPartIdserverPartId', serverPartId);
+
+
                     const req: any = {
                         searchParameter: {
                             REALESTATE_TYPE: isComponent ? '' : params?.REALESTATE_TYPE || "",// 不动产类型
-                            SERVERPART_IDS: isComponent ? serverPartId : selectedId,
+                            SERVERPART_IDS: isComponent ? Number(serverPartId) === 1269 ? params?.serverPartId : selectedId : selectedId,
                             START_LEASEDATE_End: isComponent ? '' : params?.END_LEASEDATE_Start || "",
                             END_LEASEDATE_Start: isComponent ? '' : params?.START_LEASEDATE_End || "",
-                            REALESTATE_STATE: 1
+                            REALESTATE_STATE: 1,
+                            REALESTATE_IDS: isComponent ? Number(serverPartId) === 1269 && !params?.serverPartId ? selectRealEstateId ? selectRealEstateId.toString() : "" : '' : ''
                         },
                         PageIndex: 1,
                         PageSize: 999999,
@@ -349,6 +413,8 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
                         name: "",
                         value: encryptAES(JSON.stringify(req))
                     }
+                    console.log('req', req);
+
                     const data: any = await handleGetREALESTATEList(newReq)
                     console.log('datadatadata', data);
                     if (data && data.length > 0) {
@@ -373,6 +439,12 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
                         }}>添加不动产</Button>
                     ]
                 }}
+                columnsState={{
+                    value: columnsState,
+                    onChange: (value) => {
+                        setColumnsState(value)
+                    }
+                }}
             />
         </div>
 
@@ -521,10 +593,10 @@ const RealEstate = ({ serverPartId, isComponent, onRef, selectRealEstateId }: {
                         <ProFormSelect
                             label={'服务区方位'}
                             name={'SERVERPART_REGION'}
-                            rules={[{
+                            // rules={[{
-                                required: true,
+                            //     required: true,
-                                message: '请选择服务区方位!'
+                            //     message: '请选择服务区方位!'
-                            }]}
+                            // }]}
                             options={SERVERPARTREGION}
                             readonly={isComponent}
                         />

src/pages/redReversal/components/InvoiceDetial.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import ProForm, { ProFormSelect, ProFormText, ProFormTextArea } from "@ant-design/pro-form";
-import { Col, Drawer, FormInstance, Row, Table, Typography, Space, Button, Empty, Divider, Input, message, Select, Modal } from "antd";
+import { Col, Drawer, FormInstance, Row, Table, Typography, Space, Button, Empty, Divider, Input, message, Select, Modal, Tooltip } from "antd";
 import { connect } from "umi";
 import { ActionType, ProTable } from "@ant-design/pro-components";
 import { handleGetAPPLYAPPROVEList, handleGetBILLDETAILList, handleSynchroBILLDETAILList } from "@/pages/DigitalElectronics/service";
@@ -73,23 +73,29 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
             dataIndex: "index",
             valueType: "index",
             align: 'center',
-            width: 70
+            width: 70,
+            fixed: 'left'
         },
         {
             title: <div style={{ textAlign: 'center' }}>款项名称</div>,
             align: 'left',
-            width: 230,
+            width: 200,
             dataIndex: "ITEM_NAME",
-            ellipsis: true
+            ellipsis: true,
+            fixed: 'left'
         },
         {
             title: <div style={{ textAlign: 'center' }}>税务代码</div>,
             align: 'left',
             width: 180,
             dataIndex: "TABLE_NAME",
+            fixed: 'left',
             ellipsis: true,
             render: (_, record) => {
-                return isEdit ? <Input defaultValue={record.TABLE_NAME} onBlur={(e: any) => {
+                const currentItem = tableEditData?.find((item: any) => item.BILLDETAIL_ID === record.BILLDETAIL_ID) || record;
+                return isEdit ? <Input
+                    key={record.BILLDETAIL_ID}
+                    defaultValue={currentItem.TABLE_NAME} onBlur={(e: any) => {
                         let value: string = e.target.value || ""
                         let tableData: any = JSON.parse(JSON.stringify(tableEditData))
                         tableData.forEach((item: any) => {
@@ -98,19 +104,22 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                             }
                         })
                         setTableEditData(tableData)
-                }} /> : record.TABLE_NAME
+                    }} /> : currentItem.TABLE_NAME
             }
         },
         {
             title: <div style={{ textAlign: 'center' }}>税率</div>,
             align: 'center',
             width: 80,
+            fixed: 'left',
             dataIndex: "DUTY_PARAGRAPH",
             render: (_, record) => {
+                const currentItem = tableEditData?.find((item: any) => item.BILLDETAIL_ID === record.BILLDETAIL_ID) || record;
                 return isEdit ?
                     <Select
+                        key={record.BILLDETAIL_ID}
                         style={{ width: '100%' }}
-                        defaultValue={record?.DUTY_PARAGRAPH ? record?.DUTY_PARAGRAPH.toString() : ""}
+                        defaultValue={currentItem?.DUTY_PARAGRAPH ? currentItem?.DUTY_PARAGRAPH.toString() : ""}
                         options={taxRateList}
                         onChange={(e: any) => {
                             let value: string = e || ""
@@ -123,13 +132,14 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                             setTableEditData(tableData)
                         }}
                     /> :
-                    record?.DUTY_PARAGRAPH ? `${record?.DUTY_PARAGRAPH}%` : ""
+                    currentItem?.DUTY_PARAGRAPH ? `${currentItem?.DUTY_PARAGRAPH}%` : ""
             }
         },
         {
             title: <div style={{ textAlign: 'center' }}>商品条码</div>,
             align: 'left',
             width: 120,
+            fixed: 'left',
             dataIndex: "ITEM_ID",
             ellipsis: true
         },
@@ -140,7 +150,10 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
             dataIndex: "ITEM_RULE",
             ellipsis: true,
             render: (_, record) => {
-                return isEdit ? <Input defaultValue={record.ITEM_RULE} onBlur={(e: any) => {
+                const currentItem = tableEditData?.find((item: any) => item.BILLDETAIL_ID === record.BILLDETAIL_ID) || record;
+                return isEdit ? <Input
+                    key={record.BILLDETAIL_ID}
+                    defaultValue={currentItem.ITEM_RULE} onBlur={(e: any) => {
                         let value: string = e.target.value || ""
                         let tableData: any = JSON.parse(JSON.stringify(tableEditData))
                         tableData.forEach((item: any) => {
@@ -149,7 +162,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                             }
                         })
                         setTableEditData(tableData)
-                }} /> : record.ITEM_RULE
+                    }} /> : currentItem.ITEM_RULE
             }
         },
         {
@@ -159,7 +172,10 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
             dataIndex: "ITEM_UNIT",
             ellipsis: true,
             render: (_, record) => {
-                return isEdit ? <Input defaultValue={record.ITEM_UNIT} onBlur={(e: any) => {
+                const currentItem = tableEditData?.find((item: any) => item.BILLDETAIL_ID === record.BILLDETAIL_ID) || record;
+                return isEdit ? <Input
+                    key={record.BILLDETAIL_ID}
+                    defaultValue={currentItem.ITEM_UNIT} onBlur={(e: any) => {
                         let value: string = e.target.value || ""
                         let tableData: any = JSON.parse(JSON.stringify(tableEditData))
                         tableData.forEach((item: any) => {
@@ -168,7 +184,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                             }
                         })
                         setTableEditData(tableData)
-                }} /> : record.ITEM_UNIT
+                    }} /> : currentItem.ITEM_UNIT
             }
         },
         {
@@ -181,34 +197,34 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
         {
             title: <div style={{ textAlign: 'center' }}>单价</div>,
             align: 'right',
-            width: 120,
+            width: 80,
             valueType: 'digit',
             dataIndex: "INVOICE_PRICE"
         },
         {
             title: <div style={{ textAlign: 'center' }}>金额</div>,
             align: 'right',
-            width: 120,
+            width: 80,
             valueType: 'digit',
             dataIndex: "INVOICE_AMOUNT"
         },
         {
             title: <div style={{ textAlign: 'center' }}>税额</div>,
             align: 'right',
-            width: 120,
+            width: 80,
             valueType: 'digit',
             dataIndex: "INVOICE_TAX"
         },
         {
             title: <div style={{ textAlign: 'center' }}>折扣</div>,
             align: 'center',
-            width: 120,
+            width: 80,
             dataIndex: "INVOICE_DISCOUNT"
         },
         {
             title: "不动产",
             dataIndex: "option",
-            width: 120,
+            width: 80,
             align: 'center',
             render: (_: any, record: any) => {
                 return record?.REALESTATE_ID ?
@@ -219,10 +235,16 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                     }}>
                         {realEstateEnum && realEstateEnum[record?.REALESTATE_ID] ? realEstateEnum[record?.REALESTATE_ID] : record?.REALESTATE_ID}
                     </a> :
-                    < Button type={'primary'} onClick={async () => {
+                    <Tooltip title={"选择不动产"}>
+                        <Button type={'primary'} onClick={async () => {
+                            console.log('选择不动产', record);
+                            console.log('票据信息', parentRow);
+
                             setCurrentRow(record)
                             setSelectRealEstateModal(true)
-                    }}> 选择不动产</Button >
+                        }}>+</Button>
+                    </Tooltip>
+
             }
         }
         // {
@@ -388,6 +410,9 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
 
     // 保存税务代码触发的事件
     const handleSaveTaxCode = async () => {
+        console.log('dsamkdas', tableEditData);
+
+        return
         // 当前的表格数据
         let newreqResult: any = {
             name: "",
@@ -414,7 +439,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
     const handleGetThisServerpartRealEstateData = async () => {
         const req: any = {
             searchParameter: {
-                SERVERPART_IDS: parentRow?.SERVERPART_ID || "",
+                SERVERPART_IDS: Number(parentRow?.SERVERPART_ID) === 1269 ? '' : (parentRow?.SERVERPART_ID || ""),
                 REALESTATE_STATE: 1
             },
             PageIndex: 1,
@@ -566,7 +591,11 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                             columns={detailColumns}
                             bordered
                             scroll={{ x: "100%", y: '500px' }}
-                            pagination={false}
+                            // pagination={false}
+                            pagination={{
+                                defaultPageSize: 100,
+                                pageSizeOptions: ['100', '200', '500', '1000'],
+                            }}
                             request={async () => {
                                 // 调用一次  获取这个服务区里面的全部 不动产信息
                                 handleGetThisServerpartRealEstateData()
@@ -583,6 +612,8 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
                                 if (billDetail && billDetail.length > 0) {
                                     setTableEditData(billDetail)
                                     setReqDetailList(billDetail)
+                                    console.log('billDetailbillDetailbillDetail', billDetail);
+
                                     return { data: billDetail, success: true }
                                 }
                                 return { data: [], success: true }
@@ -740,7 +771,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow, par
 
             {/* 不动产的悬浮框  */}
             <Modal
-                width={1200}
+                width={'90%'}
                 title={"选择不动产"}
                 open={selectRealEstateModal}
                 destroyOnClose