+
+
{/* 发票明细 */}
@@ -374,7 +484,6 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
scroll={{ x: "100%", y: '500px' }}
pagination={false}
request={async () => {
- console.log('parentRowparentRowparentRow', parentRow);
const billDetail = await handleGetBILLDETAILList({
SearchParameter: {
BILL_ID: parentRow?.BILL_ID
@@ -383,9 +492,15 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
PageSize: 999999,
SortStr: "BILLDETAIL_ID"
})
- console.log('billDetailbillDetailbillDetail', billDetail);
if (billDetail && billDetail.length > 0) {
+ let idList: any = billDetail[0].REALESTATE_ID ? billDetail[0].REALESTATE_ID.split(',') : ""
+ console.log('idListidListidList', idList);
+ if (idList && idList.length > 0) {
+ detailActionRef.current?.reload()
+ setSelectRealEstateId(idList)
+ }
+
setTableEditData(billDetail)
setReqDetailList(billDetail)
return { data: billDetail, success: true }
@@ -400,20 +515,24 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
actions: [
<>
{
- isEdit && parentRow?.BILL_STATE < 9000 ?
+ parentRow?.BILL_STATE <= 2000 ?
<>
-
-
- :
-
+ {
+ isEdit && parentRow?.BILL_STATE < 9000 ?
+ <>
+
+
+ :
+
+ }
+ : ""
}
-
,
+ {/* 不动产信息 */}
+
+
+ 不动产信息
+
+
+
{
+ if (selectRealEstateId && selectRealEstateId.length > 0) {
+ const req: any = {
+ searchParameter: {
+ REALESTATE_IDS: selectRealEstateId.toString()
+ },
+ PageIndex: 1,
+ PageSize: 999999,
+ }
+ let newReq: any = {
+ name: "",
+ value: encryptAES(JSON.stringify(req))
+ }
+ const data: any = await handleGetREALESTATEList(newReq)
+ if (data && data.length > 0) {
+ return { data, success: true }
+ }
+ return { data: [], success: true }
+ } else {
+ return { data: [], success: true }
+ }
+ }}
+ columnsState={{
+ value: columnsStateMap,
+ onChange: setColumnsStateMap,
+ }}
+ toolbar={{
+ actions: [
+ <>
+ {
+ parentRow?.BILL_STATE <= 2000 ?
+ : ''
+ }
+
+ ]
+ }}
+ />
+
+
@@ -444,7 +625,6 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
options={false}
bordered
request={async () => {
- console.log('parentRowparentRowparentRow', parentRow);
// 拿个税率的枚举
const taxRateLabel: any = await getFieldEnum({ FieldExplainField: 'DUTY_PARAGRAPH', notformate: true })
setTaxRateList(taxRateLabel)
@@ -464,7 +644,6 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
}
const data = await handleGetAPPLYAPPROVEList(reqData)
- console.log('data', data);
if (data && data.length > 0) {
return { data, success: true }
}
@@ -474,7 +653,57 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
+
+
+
+
+ {/* 不动产的悬浮框 */}
+ {
+ setSelectRealEstateModal(false)
+ }}
+ confirmLoading={realEstateLoading}
+ onOk={async () => {
+ let data = realEstateRef?.current?.selectRowDetail
+ console.log('32131', data);
+ // 开始保存内容
+ handleGetSelectRealEstate(data)
+ if (tableEditData && tableEditData.length > 0) {
+ setRealEstateLoading(true)
+ let list: any = JSON.parse(JSON.stringify(tableEditData))
+ let idList: any = []
+ if (data && data.length > 0) {
+ idList = data.map((item: any) => item.REALESTATE_ID)
+ }
+
+ list.forEach((item: any) => {
+ item.REALESTATE_ID = idList ? idList.toString() : ""
+ })
+ setSelectRealEstateId(idList)
+ let newreqResult: any = {
+ name: "",
+ value: encryptAES(JSON.stringify({ list: list }))
+ }
+ const res: any = await handleSynchroBILLDETAILList(newreqResult)
+ if (res.Result_Code === 100) {
+ message.success('同步成功！')
+ detailActionRef.current?.reload()
+ } else {
+ message.error(data.Result_Desc)
+ }
+ }
+
+ setSelectRealEstateModal(false)
+ setRealEstateLoading(false)
+ }}
+ >
+
+
);
};
diff --git a/src/pages/serverpartAssets/service.ts b/src/pages/serverpartAssets/service.ts
index cc84a68..3fb2b53 100644
--- a/src/pages/serverpartAssets/service.ts
+++ b/src/pages/serverpartAssets/service.ts
@@ -229,6 +229,24 @@ export async function handleGetServerpartTree(params?: any) {
return data.Result_Data.List;
}
+// 拿到服务区的非树形列表
+export async function handleGetServerpartDDL(params?: any) {
+ const data = await requestSamember(`/BaseInfo/GetServerpartDDL`, {
+ method: 'GET',
+ params
+ });
+
+ if (data.Result_Code !== 100) {
+ return {
+ data: [],
+ }
+ }
+
+ return data.Result_Data.List;
+}
+
+
+
export async function getFieldEnumTreeNoSession(params: any) {
const data = await requestSamember(`/FrameWork/GetFieldEnumTree`, {
method: 'GET',
diff --git a/src/utils/addressParser.ts b/src/utils/addressParser.ts
new file mode 100644
index 0000000..bb944df
--- /dev/null
+++ b/src/utils/addressParser.ts
@@ -0,0 +1,77 @@
+/**
+ * 地址解析工具函数
+ */
+
+/**
+ * 根据完整地址识别市区信息（去除省份）
+ * @param fullAddress 完整地址字符串 (格式: 省市区街道****)
+ * @returns {city: string, district: string, cityDistrict: string}
+ * - city: 市级信息（第一个市或自治州，不包含省份）
+ * - district: 区级信息（区、县、自治县或第二个市）
+ * - cityDistrict: 市区组合（市级+区级，不包含省份）
+ */
+export const parseAddress = (fullAddress: string) => {
+ let city = '';
+ let district = '';
+ let cityDistrict = '';
+
+ // 先尝试匹配常见的省份模式，然后从剩余字符串中提取市区信息
+ // 省份通常在地址开头，格式如"江苏省南京市鼓楼区..."
+ const provincePattern = /^(\S+省|\S+自治区|\S+特别行政区)/;
+ const addressWithoutProvince = fullAddress.replace(provincePattern, '');
+
+ // 市级匹配模式：市、自治州（在去除省份后的地址中查找）
+ const cityPatterns = [
+ /(\S+自治州)/, // 匹配自治州
+ /(\S+市)/ // 匹配市
+ ];
+
+ // 区级匹配模式：区、县、自治县、第二个市
+ const districtPatterns = [
+ /(?:自治州|市)(\S+区)/, // 自治州或市后面的区
+ /(?:自治州|市)(\S+自治县)/, // 自治州或市后面的自治县
+ /(?:自治州|市)(\S+县)/, // 自治州或市后面的县
+ /(?:自治州|市)(\S+市)/ // 自治州或市后面的第二个市
+ ];
+
+ // 查找市级信息（在去除省份后的地址中查找）
+ for (const pattern of cityPatterns) {
+ const match = addressWithoutProvince.match(pattern);
+ if (match) {
+ city = match[1];
+ break;
+ }
+ }
+
+ // 查找区级信息（在去除省份后的地址中查找）
+ for (const pattern of districtPatterns) {
+ const match = addressWithoutProvince.match(pattern);
+ if (match) {
+ district = match[1];
+ break;
+ }
+ }
+
+ // 组合市区信息（不包含省份）
+ if (city && district) {
+ cityDistrict = city + district;
+ } else if (city) {
+ cityDistrict = city;
+ } else if (district) {
+ cityDistrict = district;
+ }
+
+ return { city, district, cityDistrict };
+};
+
+/**
+ * 当详细地址发生变化时，解析并返回市区信息
+ * @param value 详细地址值
+ * @returns 解析后的市区信息
+ */
+export const handleAddressChange = (value: string) => {
+ if (value) {
+ return parseAddress(value);
+ }
+ return { city: '', district: '', cityDistrict: '' };
+};
\ No newline at end of file