update

2025-12-05 15:04:27 +08:00 · 2025-12-05 15:04:27 +08:00 · 90874f4ca9
commit 90874f4ca9
parent f2f2a01bfb
25 changed files with 377 additions and 124 deletions
--- a/cloudNew/pInvoicingindex.async.js
+++ b/cloudNew/pInvoicingindex.async.js
--- a/config/router.ts
+++ b/config/router.ts
@ -63,6 +63,11 @@ export default [
                name: '整改情况追踪表',
                component: "@/pages/operationReport/rectificationStatus",
            },
+            {
+                path: '/RentCalculation/index',
+                name: '租金测算',
+                component: "@/pages/RentCalculation/index",
+            },


        ]
--- a/src/models/user.ts
+++ b/src/models/user.ts
@ -287,6 +287,12 @@ const UserModel: UserModelType = {
              name: '整改情况追踪表',
              component: "@/pages/operationReport/rectificationStatus",
            },
+            {
+              path: '/RentCalculation/index',
+              redirect: '',
+              name: '租金测算',
+              component: "@/pages/RentCalculation/index",
+            },
          ]
        }

@ -367,6 +373,7 @@ const UserModel: UserModelType = {
            "/operationReport/onSiteInspection",
            "/operationReport/securityIssueList",
            "/operationReport/rectificationStatus",
+            "/RentCalculation/index",
            // '/examine/index',
            // '/examine/modal',
            // '/examine/question',
--- a/src/pages/DigitalElectronics/index.tsx
+++ b/src/pages/DigitalElectronics/index.tsx
@ -64,6 +64,22 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {
    });

    const columns: any = [
+        {
+            title: "查询内容",
+            dataIndex: "searchText",
+            hideInTable: true,
+            fieldProps: {
+                placeholder: "请输入经办人/单据号/金额",
+            }
+        },
+        {
+            title: "含税开票金额",
+            dataIndex: "INVOICE_TAXAMOUNT",
+            hideInTable: true,
+            fieldProps: {
+                placeholder: "请输入含税开票金额",
+            }
+        },
        {
            title: '服务区名称',
            dataIndex: 'SERVERPART_NAME',
@ -562,6 +578,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {
                        revenueCode: item.TABLE_NAME,// 税收分类编码
                        taxRate: (item.DUTY_PARAGRAPH / 100).toFixed(2),// 税率
                        units: item.ITEM_UNIT,// 计量单位
+                        specification: item.ITEM_RULE// 规格

                    })
                })
@ -588,7 +605,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {

                buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号
                buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱
-                // remark: record?.BILL_DESC,
+                remark: record?.BILL_DESC,

                buyerAddressAndTel: `${record?.MERCHANTS_ADDRESS}、${record?.MERCHANTS_TEL}`,// 购方地址、电话
                buyerBankAndAccount: `${record?.BANK_NAME}${record?.BANK_ACCOUNT}`,// 购方银行、账号
@ -679,7 +696,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {
                    revenueCode: item.TABLE_NAME,// 税收分类编码
                    taxRate: (item.DUTY_PARAGRAPH / 100).toFixed(2),// 税率
                    units: item.ITEM_UNIT,// 计量单位
-
+                    specification: item.ITEM_RULE // 规格
                })
            })
        }
@ -701,6 +718,7 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {
            sellerBankAndAccount: "", // 销方银行和账号 写死
            sellerAddressAndTel: "", // 销方地址和电话  写死 应该可以不传

+            remark: record?.BILL_DESC,
            buyerRecipientPhone: record?.RECEIVE_PHONENUMBER,// 购方收票手机号
            buyerRecipientMail: record?.RECEIVE_EMAIL,// 购方收件邮箱

@ -1009,16 +1027,23 @@ const DigitalElectronics: React.FC<{ currentUser: any }> = (props) => {
                        const value = sorter[n]
                        return value ? `${n} ${value.replace('end', '')}` : ''
                    })
+
+
                    // 获取票据信息表列表
                    const req: any = {
                        SearchParameter: {
                            SERVERPART_IDS: userInfo?.ServerpartIds,
                            BILL_STATES: "2000,9000",
-                            BILL_TYPES: ""
+                            BILL_TYPES: "",
+                            INVOICE_TAXAMOUNT: params?.INVOICE_TAXAMOUNT || ""
                        },
                        PageIndex: 1,
                        PageSize: 999999,
                        sortstr: sortstr.length ? sortstr.toString() : "BILL_ID  desc",
+                        keyWord: {
+                            Key: "BILL_PERSON,BILL_NO",
+                            Value: params?.searchText || ""
+                        }
                    }

                    const data = await handleGetBILLList(req)
--- a/src/pages/RentCalculation/index.tsx
+++ b/src/pages/RentCalculation/index.tsx
@ -0,0 +1,189 @@
+import LeftSelectTree from "@/components/leftSelectTree/leftSelectTree";
+import { ActionType, FormInstance, ProTable } from "@ant-design/pro-components";
+import { Button } from "antd";
+import { useRef, useState } from "react";
+import { connect } from "umi";
+
+
+const RentCalculation: React.FC<{ currentUser: any }> = (props) => {
+    const actionRef = useRef<ActionType>();
+    const formRef = useRef<FormInstance>();
+    // 树相关的属性和方法
+    const [selectedId, setSelectedId] = useState<string>()
+    const [collapsible, setCollapsible] = useState<boolean>(false)
+
+    const columns: any = [
+        {
+            title: "片区",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "服务区",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "所属高速",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "产权所属",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "站点类型",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "分类定级",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>断面车流统计(辆/日)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 180,
+            ellipsis: true,
+        },
+        {
+            title: "业态",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "招商模式",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: "运营模式",
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'center',
+            width: 120,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>首次保底营业额(元)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 150,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>首次采购人收益提点比例(%)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 200,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>二次保底营业额(元)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 150,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>二次采购人收益提点比例(%)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 200,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>三次保底营业额(元)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 150,
+            ellipsis: true,
+        },
+        {
+            title: <div style={{ textAlign: 'center' }}>三次采购人收益提点比例(%)</div>,
+            dataIndex: "",
+            hideInSearch: true,
+            align: 'right',
+            width: 200,
+            ellipsis: true,
+        }
+
+    ]
+
+    return (
+        <div style={{ height: 'calc(100vh - 100px)', backgroundColor: '#fff', display: 'flex' }}>
+            <LeftSelectTree setSelectedId={setSelectedId} setCollapsible={setCollapsible} collapsible={collapsible} />
+            <div style={{
+                width: !collapsible ? 'calc(100% - 300px)' : 'calc(100% - 60px)',
+                paddingTop: 0,
+                paddingBottom: 0,
+                paddingRight: 0
+            }}>
+
+                <ProTable
+                    actionRef={actionRef}
+                    formRef={formRef}
+                    columns={columns}
+                    bordered
+                    scroll={{ x: '100%', y: 'calc(100vh - 450px)' }}
+                    headerTitle={'租金测算列表'}
+                    search={{ span: 6, }}
+                    request={async (params) => {
+                        if (!selectedId) {
+                            return { data: [], success: true }
+                        }
+
+                        // if (data && data.length > 0) {
+                        //     return { data, success: true }
+                        // }
+                        // return { data: [], success: true }
+                    }}
+                    toolbar={{
+                        actions: [
+                            <Button type={'primary'} onClick={() => {
+
+                            }}>添加租金测算</Button>
+                        ]
+                    }}
+                />
+            </div>
+        </div>)
+}
+
+export default connect(({ user }: ConnectState) => ({
+    currentUser: user.data
+}))(RentCalculation);
--- a/src/pages/authority.ts
+++ b/src/pages/authority.ts
@ -11,6 +11,7 @@ const authority: PageAuthority = {
  '/operationReport/onSiteInspection': ['/operationReport/onSiteInspection'],
  '/operationReport/securityIssueList': ['/operationReport/securityIssueList'],
  '/operationReport/rectificationStatus': ['/operationReport/rectificationStatus'],
+  '/RentCalculation/index': ['/RentCalculation/index'],
 };


--- a/src/pages/operationReport/components/AddInspectionContent.tsx
+++ b/src/pages/operationReport/components/AddInspectionContent.tsx
@ -85,14 +85,14 @@ const AddInspectionContent = ({ onRef, onShow, setOnShow, handleAddInspectionCon
                    <Row gutter={8}>
                        <Col span={24}>
                            <ProFormSelect
-                                label={'巡检类型'}
-                                name={''}
-                                rules={[{ required: true, message: '请选择巡检类型!' }]}
+                                label={'内容类型'}
+                                name={'PATROLCONTENT_TYPE'}
+                                rules={[{ required: true, message: '请选择内容类型!' }]}
                                options={[
-                                    { label: '服务质量监督', value: 1 },
-                                    { label: '运营维护', value: 2 },
-                                    { label: '安全管理', value: 3 },
-                                    { label: '通用', value: 4 },
+                                    { label: '服务质量监督', value: 1000 },
+                                    { label: '运营维护', value: 2000 },
+                                    { label: '安全管理', value: 3000 },
+                                    { label: '通用', value: 4000 },
                                ]}
                            />
                        </Col>
--- a/src/pages/operationReport/components/AddInspectionItems.tsx
+++ b/src/pages/operationReport/components/AddInspectionItems.tsx
@ -1,6 +1,7 @@
 // 同步检查项目的悬浮框 
 import { ProForm, ProFormDateTimePicker, ProFormDigit, ProFormSelect, ProFormText, ProFormTimePicker } from "@ant-design/pro-components";
 import { Col, FormInstance, Modal, Row } from "antd";
+import moment from "moment";
 import { useRef } from "react";
 import { connect } from "umi";

@ -28,8 +29,14 @@ const AddInspectionItems = ({ onRef, onShow, setOnShow, handleGetNewProjectData,
                }}
                onOk={async () => { // 提交框内的数据
                    AddInspectionItemsFormRef.current?.validateFields().then((res: any) => {
+                        console.log('resdasa', res);
+
                        if (handleGetNewProjectData) {
-                            handleGetNewProjectData(res)
+                            handleGetNewProjectData({
+                                ...res,
+                                INSPECTION_STARTTIME: res.INSPECTION_STARTTIME ? moment(res.INSPECTION_STARTTIME).format('YYYY-MM-DD HH:mm:ss') : "",
+                                INSPECTION_ENDTIME: res.INSPECTION_ENDTIME ? moment(res.INSPECTION_ENDTIME).format('YYYY-MM-DD HH:mm:ss') : ""
+                            })
                        }
                    })
                    setOnShow(false)
--- a/src/pages/operationReport/components/RectificationStatusInfoModal.tsx
+++ b/src/pages/operationReport/components/RectificationStatusInfoModal.tsx
@ -9,6 +9,7 @@ import { handleGetServerpartTree, handleGetSERVERPARTTYPEList } from "../service

 type DetailProps = {
    onRef: any,
+    currentRowInfo: any,// 当前整改行数据
    onShow: boolean,
    setOnShow: (value: boolean) => void
    handleGetRectificationStatusData: any
@ -28,7 +29,7 @@ const beforeUpload = (file: any) => {
    return isJpgOrPng && isLt2M;
 }

-const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRectificationStatusData, parentRow }: DetailProps) => {
+const RectificationStatusInfoModal = ({ onRef, currentRowInfo, onShow, setOnShow, handleGetRectificationStatusData, parentRow }: DetailProps) => {
    const { confirm } = Modal;
    const RectificationStatusInfoFormRef = useRef<FormInstance>();
    // 文件列表
@ -99,14 +100,17 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti
                    layout={'horizontal'}
                    labelCol={{ style: { width: 80 } }}
                    request={async () => {
-                        if (parentRow) {
+                        if (currentRowInfo) {
+                            console.log('currentRowInfocurrentRowInfocurrentRowInfo', currentRowInfo);
+
+                        } else if (parentRow) {
                            console.log('parentRowparentRowparentRow', parentRow);
-                            handleGetServerPartList(parentRow?.SPREGIONTYPE_ID)
+                            handleGetServerPartList(parentRow?.belongAreaCode)
                            return {
-                                SERVERPART_ID: parentRow?.SERVERPART_ID,
-                                SERVERPART_NAME: parentRow?.SERVERPART_NAME,
-                                SPREGIONTYPE_ID: parentRow?.SPREGIONTYPE_ID,
-                                SPREGIONTYPE_NAME: parentRow?.SPREGIONTYPE_NAME,
+                                SACode: parentRow?.SACode,
+                                SAName: parentRow?.SAName,
+                                belongAreaCode: parentRow?.belongAreaCode,
+                                belongArea: parentRow?.belongArea,
                            }
                        } else {
                            return {
@ -119,7 +123,7 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti
                        <Col span={12}>
                            <ProFormSelect
                                label={'片区'}
-                                name={'SPREGIONTYPE_ID'}
+                                name={'belongAreaCode'}
                                rules={[{ required: true, message: '请选择片区!' }]}
                                request={async () => {
                                    const req: any = {
@ -151,9 +155,9 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti
                                        console.log('valuevalue', value);
                                        handleGetServerPartList(value)
                                        if (value) {
-                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SPREGIONTYPE_NAME: option.label })
+                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ belongArea: option.label })
                                        } else {
-                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SPREGIONTYPE_NAME: "" })
+                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ belongArea: "" })
                                        }
                                    }
                                }}
@ -163,21 +167,21 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti
                        <Col span={12} style={{ display: 'none' }}>
                            <ProFormText
                                label={'片区名称'}
-                                name={'SPREGIONTYPE_NAME'}
+                                name={'belongArea'}
                            />
                        </Col>
                        <Col span={12}>
                            <ProFormSelect
                                label={'服务区'}
-                                name={'SERVERPART_ID'}
+                                name={'SACode'}
                                options={serverPartList}
                                fieldProps={{
                                    onChange: (e: any, option: any) => {
                                        console.log('e', e);
                                        if (e) {
-                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SERVERPART_NAME: option.label })
+                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SAName: option.label })
                                        } else {
-                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SERVERPART_NAME: "" })
+                                            RectificationStatusInfoFormRef.current?.setFieldsValue({ SAName: "" })
                                        }
                                    }
                                }}
@ -188,7 +192,7 @@ const RectificationStatusInfoModal = ({ onRef, onShow, setOnShow, handleGetRecti
                        <Col span={12} style={{ display: 'none' }}>
                            <ProFormText
                                label={'服务区名称'}
-                                name={'SERVERPART_NAME'}
+                                name={'SAName'}
                            />
                        </Col>
                        <Col span={12}>
--- a/src/pages/operationReport/index.tsx
+++ b/src/pages/operationReport/index.tsx
@ -54,6 +54,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
    const [rectificationStatusModal, setRectificationStatusModal] = useState<boolean>(false)
    // 当前的巡检记录
    const [currentRecord, setCurrentRecord] = useState<any>()
+    // 整改情况的行数据
+    const [currentRectification, setCurrentRectification] = useState<any>()


    // 表格字段
@ -306,6 +308,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
                list.push({ label: item.SERVERPART_REGIONNAME, value: item.SERVERPART_REGION })
            })
        }
+        console.log('listlistlist', list);
+
        setSERVERPARTREGION(list)
    }

@ -353,16 +357,23 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
                    if (addressParams.dataType) {
                        setPageDataType(Number(addressParams.dataType))
                    }
+                    console.log('PATROLIDPATROLIDPATROLIDPATROLID', PATROLID);

                    if (PATROLID) {
                        const req: any = {
+                            SearchParameter: {
                                PATROL_IDS: PATROLID
+                            },
+                            PageIndex: 1,
+                            PageSize: 100,
                        }
                        let newReq: any = {
                            name: "",
                            value: encryptAES(JSON.stringify(req))
                        }
                        const data = await handleGetPATROLList(newReq)
+                        console.log('datadatadata3213', data);
+
                        if (data && data.length > 0) {
                            let detail: any = data[0]
                            console.log('detaildetail', detail);
@ -388,7 +399,8 @@ const OperationReport = ({ PATROLID }: DetailProps) => {

                            handleGetSERVERPARTREGION(detail.SERVERPART_ID)
                            return {
-                                ...detail
+                                ...detail,
+                                SERVERPART_REGION: Number(detail.SERVERPART_REGION)
                            }
                        }

@ -606,11 +618,11 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
                    {
                        pageDataType === 3000 ?
                            <Col span={8}>
-                                {/* <ProFormDatePicker
+                                <ProFormDatePicker
                                    label={'要求整改时间'}
-                                    name={''}
+                                    name={'TILLTIME'}
                                    width={'100%'}
-                                 /> */}
+                                />
                            </Col> :
                            <>
                                <Col span={8}>
@ -723,9 +735,13 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
                                        </div>

                                        <div className="inspectionContentItemRight">
+                                            {
+                                                item.EXCEPTION_CONTENT ?
                                                    <div className="btnText" onClick={() => {
+                                                        setCurrentRectification(item)
                                                        setRectificationStatusModal(true)
-                                            }}>整改情况</div>
+                                                    }}>整改情况</div> : ""
+                                            }
                                        </div>
                                    </div>
                                }) : ""
@ -745,7 +761,7 @@ const OperationReport = ({ PATROLID }: DetailProps) => {
            <AddInspectionContent onRef={AddInspectionContentRef} onShow={addContentModal} setOnShow={setAddContentModal} handleAddInspectionContentData={handleAddInspectionContentData} />

            {/* 整改情况 的录入悬浮框 */}
-            <RectificationStatusInfoModal parentRow={currentRecord} onShow={rectificationStatusModal} setOnShow={setRectificationStatusModal} handleGetRectificationStatusData={handleGetRectificationStatusData} />
+            <RectificationStatusInfoModal currentRowInfo={currentRectification} parentRow={currentRecord} onShow={rectificationStatusModal} setOnShow={setRectificationStatusModal} handleGetRectificationStatusData={handleGetRectificationStatusData} />
        </div>

    )
--- a/src/pages/operationReport/onSiteInspection.tsx
+++ b/src/pages/operationReport/onSiteInspection.tsx
@ -138,7 +138,7 @@ const onSiteInspection = () => {
        },
        {
            title: "要求整改时间",
-            dataIndex: '要求整改时间',
+            dataIndex: 'TILLTIME',
            hideInSearch: true,
            align: 'center',
            width: 150,
@ -146,7 +146,7 @@ const onSiteInspection = () => {
        },
        {
            title: "跟进处理时间",
-            dataIndex: '跟进处理时间',
+            dataIndex: 'FINISHTIME',
            hideInSearch: true,
            align: 'center',
            width: 150,
@ -154,7 +154,7 @@ const onSiteInspection = () => {
        },
        {
            title: "处理完成时间",
-            dataIndex: '处理完成时间',
+            dataIndex: 'FINISH_CFMTIME',
            hideInSearch: true,
            align: 'center',
            width: 150,
--- a/src/pages/operationReport/rectificationStatus.tsx
+++ b/src/pages/operationReport/rectificationStatus.tsx
@ -47,6 +47,19 @@ const rectificationStatus = () => {
            },
            initialValue: [moment().startOf('M'), moment()],
        },
+        {
+            title: "内容类型",
+            dataIndex: "PATROLCONTENT_TYPE",
+            valueType: 'select',
+            fieldProps: {
+                options: [
+                    { label: '服务质量监督', value: 1000 },
+                    { label: '运营维护', value: 2000 },
+                    { label: '安全管理', value: 3000 },
+                    { label: '通用', value: 4000 },
+                ]
+            }
+        },
        {
            title: "序号",
            dataIndex: 'index',
@ -58,7 +71,7 @@ const rectificationStatus = () => {
        },
        {
            title: "片区名称",
-            dataIndex: 'SPREGIONTYPE_NAME',
+            dataIndex: 'BELONGAREA',
            hideInSearch: true,
            align: 'center',
            width: 150,
@ -66,7 +79,7 @@ const rectificationStatus = () => {
        },
        {
            title: "服务区名称",
-            dataIndex: 'SERVERPART_NAME',
+            dataIndex: 'SANAME',
            hideInSearch: true,
            align: 'center',
            width: 150,
@ -218,6 +231,7 @@ const rectificationStatus = () => {
                            SearchParameter: {
                                INSPECTIONDATE_Start: params?.INSPECTION_STARTTIME_Start || "",
                                INSPECTIONDATE_End: params?.INSPECTION_STARTTIME_End || "",
+                                PATROLCONTENT_TYPE: params?.PATROLCONTENT_TYPE || ""
                            },
                            PageIndex: 1,
                            PageSize: 999999,
--- a/src/pages/operationReport/securityIssueList.tsx
+++ b/src/pages/operationReport/securityIssueList.tsx
@ -4,7 +4,7 @@ import { connect } from "umi";
 import LeftSelectTree from "@/components/leftSelectTree/leftSelectTree";
 import { ActionType, FormInstance, ProTable } from "@ant-design/pro-components";
 import { useEffect, useRef, useState } from "react";
-import { handleGetPATROLList } from "./service";
+import { handleGetPATROLList, handlGetPatrolSecurityList } from "./service";
 import moment from 'moment'
 import { encryptAES } from "@/utils/handleAes";
 import { Drawer } from "antd";
@ -32,8 +32,8 @@ const securityIssueList = () => {
            search: {
                transform: (value: any) => {
                    return {
-                        INSPECTION_STARTTIME_Start: value[0],
-                        INSPECTION_STARTTIME_End: value[1],
+                        PATROL_DATE_Start: value[0],
+                        PATROL_DATE_End: value[1],
                    };
                },
            },
@ -73,114 +73,64 @@ const securityIssueList = () => {
            ellipsis: true
        },
        {
-            title: "发现日期",
-            dataIndex: '',
+            title: "责任单位名称",
+            dataIndex: 'DUTYUNIT_NAME',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "问题类型",
-            dataIndex: '',
+            title: "巡检位置",
+            dataIndex: 'PATROL_POSITION',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "问题描述",
-            dataIndex: '',
+            title: "巡查情况",
+            dataIndex: 'PATROL_SITUATION',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "风险等级",
-            dataIndex: '',
+            title: "巡检内容",
+            dataIndex: 'PATROLDETAIL_CONTENT',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "发现人",
-            dataIndex: '',
-            hideInSearch: true,
-            align: 'center',
-            width: 150,
-            ellipsis: true,
-        },
-        {
-            title: "责任单位",
-            dataIndex: '',
+            title: "巡检结果",
+            dataIndex: 'PATROLDETAIL_RESULT',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "临时处置措施",
-            dataIndex: '',
+            title: "异常描述",
+            dataIndex: 'EXCEPTION_CONTENT',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "是否停业整改",
-            dataIndex: '',
+            title: "整改期限",
+            dataIndex: 'RECTIFICATION_PERIOD',
            hideInSearch: true,
            align: 'center',
            width: 150,
            ellipsis: true
        },
        {
-            title: "上报时间",
-            dataIndex: '',
-            hideInSearch: true,
-            align: 'center',
-            width: 150,
-            ellipsis: true
-        },
-        {
-            title: "审核人",
-            dataIndex: '',
-            hideInSearch: true,
-            align: 'center',
-            width: 150,
-            ellipsis: true
-        },
-        {
-            title: "状态",
-            dataIndex: 'COMPLETE_STATE',
-            valueType: 'select',
-            hideInSearch: true,
-            align: 'center',
-            width: 120,
-            ellipsis: true,
-            fieldProps: {
-                options: [
-                    { label: "编辑中", value: 1 },
-                    { label: "巡查中", value: 2 },
-                    { label: "待跟进", value: 3 },
-                    { label: "整改中", value: 4 },
-                    { label: "已完成", value: 5 },
-                ]
-            }
-        },
-        {
-            title: "备注",
-            dataIndex: '',
-            hideInSearch: true,
-            align: 'center',
-            width: 150,
-            ellipsis: true
-        },
-        {
-            title: "附件",
-            dataIndex: '',
+            title: "整改结果",
+            dataIndex: 'RECTIFICATION_RESULT',
            hideInSearch: true,
            align: 'center',
            width: 150,
@ -208,7 +158,28 @@ const securityIssueList = () => {
                    headerTitle={'安全问题记录表'}
                    search={{ span: 6, }}
                    request={async (params) => {
+                        if (!selectedId) {
+                            return { data: [], success: true }
+                        }

+                        const req: any = {
+                            SearchParameter: {
+                                SERVERPART_IDS: selectedId,
+                                PATROL_DATE_Start: params?.PATROL_DATE_Start || "",
+                                PATROL_DATE_End: params?.PATROL_DATE_End || "",
+                            },
+                            PageIndex: 1,
+                            PageSize: 999999,
+                        }
+                        let newReq: any = {
+                            name: "",
+                            value: encryptAES(JSON.stringify(req))
+                        }
+                        const data = await handlGetPatrolSecurityList(newReq)
+                        if (data && data.length > 0) {
+                            return { data, success: true }
+                        }
+                        return { data: [], success: true }
                    }}
                    toolbar={{
                        actions: [
--- a/src/pages/operationReport/service.ts
+++ b/src/pages/operationReport/service.ts
@ -99,3 +99,16 @@ export async function handleGetSERVERPARTDetail(params: any) {
    return data.Result_Data
 }

+//  获取巡查安全问题列表
+export async function handlGetPatrolSecurityList(params: any) {
+    const data = await requestOld(`/Examine/GetPatrolSecurityList`, {
+        method: 'POST',
+        data: params
+    })
+
+    if (data.Result_Code !== 100) {
+        return data
+    }
+
+    return data.Result_Data.List
+}
--- a/src/pages/redReversal/components/InvoiceDetial.tsx
+++ b/src/pages/redReversal/components/InvoiceDetial.tsx
@ -141,6 +141,7 @@ const InvoiceDetail = ({ showDetail, setShowDetail, parentRow, setParentRow }: P
                    { label: "填写中", value: 1000 },
                    { label: "待审核", value: 2000 },
                    { label: "开票中", value: 9000 },
+                    { label: "手动开票", value: 9100 },
                    { label: "已开票", value: 9200 },
                    { label: "红冲申请中", value: 9990 },
                    { label: "已红冲", value: 9999 }
--- a/src/pages/redReversal/index.tsx
+++ b/src/pages/redReversal/index.tsx
@ -573,7 +573,7 @@ const RedReversal: React.FC<{ currentUser: any }> = (props) => {
            // blueInvoiceType: record?.blueInvoiceType,
            blueinvoiceCode: "",
            billDetail: billDetailReq,
-            remark: record?.BILL_DESC,
+            remark: `被红冲蓝字数电发票号码:${record?.SERIAL_NO}\t\t红字发票信息确认单编号：${record?.BILL_NO ? `HC-${record?.BILL_NO}` : ""};\n` + record?.BILL_DESC,
        }

        // 构造原始数据
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
--- a/src/utils/requestAHYD.ts
+++ b/src/utils/requestAHYD.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
--- a/src/utils/requestCode.ts
+++ b/src/utils/requestCode.ts
@ -7,12 +7,12 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
 // 修改baseURL为完整的API地址，确保在生产环境中正确访问
-const instance = axios.create({ baseURL: 'https://api.eshangtech.com/CommercialApi' });
+const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//CommercialApi' });



--- a/src/utils/requestKaiPiao.ts
+++ b/src/utils/requestKaiPiao.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
--- a/src/utils/requestMain.ts
+++ b/src/utils/requestMain.ts
@ -7,12 +7,12 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
 // 修改baseURL为完整的API地址，确保在生产环境中正确访问
-const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });



--- a/src/utils/requestMap.ts
+++ b/src/utils/requestMap.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });


 // const instance = axios.create({ baseURL: 'http://home.robot-z.cn:7001/' });
--- a/src/utils/requestMemberApi.ts
+++ b/src/utils/requestMemberApi.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-const instance = axios.create({ baseURL: 'https://api.eshangtech.com/MemberApi' });
+const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//MemberApi' });
 // const instance = axios.create({ baseURL: '/auth' });


--- a/src/utils/requestOld.ts
+++ b/src/utils/requestOld.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });
 const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/EShangApiMain' });
 // const instance = axios.create({ baseURL: '/auth' });

--- a/src/utils/requestOldCode.ts
+++ b/src/utils/requestOldCode.ts
@ -7,7 +7,7 @@ import CryptoJS from "crypto-js";
 const { UMI_APP_BASEURL } = process.env;

 // const instance = axios.create({ baseURL: UMI_APP_BASEURL });
-// const instance = axios.create({ baseURL: 'https://api.eshangtech.com/EShangApiMain' });
+// const instance = axios.create({ baseURL: 'https://eshangtech.com:18900//EShangApiMain' });
 const instance = axios.create({ baseURL: 'https://samember.yciccloud.com:8999/CommercialApi' });
 // const instance = axios.create({ baseURL: '/auth' });