fix():修改bug

src/components/TableModule/index.jsx

@@ -681,7 +681,13 @@ const TableModule = forwardRef((props, ref) => {
             link.href = res.data.url || res.data.export_url;
             link.target = "_blank"; // 打开新页面
             link.click();
-            setTipModal({ ...tipModal, visible: false });
+            setTipModal({
+              ...tipModal, visible: false,
+              filename:
+                pagename +
+                (new Date().getMonth() + 1).toString().padStart(2, "0") +
+                new Date().getDate(),
+            });
           } else {
             message.error(res.message);
           }
@@ -814,7 +820,13 @@ const TableModule = forwardRef((props, ref) => {
       </div>
       <Modal
         open={tipModal.visible}
-        onCancel={() => setTipModal({ ...tipModal, visible: false })}
+        onCancel={() => setTipModal({
+          ...tipModal, visible: false,
+          filename:
+            pagename +
+            (new Date().getMonth() + 1).toString().padStart(2, "0") +
+            new Date().getDate(),
+        })}
         title="提示"
         onOk={handleOk}
       >

src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx

@@ -12,16 +12,17 @@ import {
     Descriptions,
     Timeline,
     Popover,
+    InputNumber
 } from "antd";
+const { TextArea } = Input;
 import { Link } from "react-router-dom";
 import moment from "moment";
-import ajax from '@/config/ajax.js'
+import ajax from "@/services"
 import { TableModule } from "@/components";
 import { dictionary } from "@/config/common.js";
+import utils from "../../../../config/utils";
 import "./index.scss";
 function ProductOrderInquiry() {
-    const [carId, setCarId] = useState()
-
     //构建表头
     const createCol = (label, name, type) => {
         label.length == name.length ? null : console.log('参数缺失', label.length, name.length)
@@ -71,22 +72,12 @@ function ProductOrderInquiry() {
                                     textAlign: "center",
                                 }}
                             >
-                                <Link
-                                    to={{
-                                        pathname: "/operationCenter/parkingCardOrder",
-                                        //search: `?id=${record.id}`,
-                                    }}
-                                >
+                                <a onClick={() => { searchDetail({id:record.id});setTkddVisible(true) }}>
                                     查看
-                                </Link>
-                                <Link
-                                    to={{
-                                        pathname: "/operationCenter/parkingCardOrder",
-                                        //search: `?id=${record.id}`,
-                                    }}
-                                >
+                                </a>
+                                <a onClick={() => { setTkddVisible(true) }}>
                                     修改
-                                </Link>
+                                </a>
                             </div>
                         }
                         trigger="click"
@@ -136,60 +127,6 @@ function ProductOrderInquiry() {
         }
         return arr
     }
-    //基本信息检索条件
-    const formSearch = [
-        {
-            name: "carId",
-            type: "Input",
-            label: "车牌号",
-            placeholder: "请输入车牌号",
-        },
-        {
-            name: "mobile",
-            type: "Input",
-            label: "会员手机号",
-            placeholder: "请输入会员手机号",
-        },
-        {
-            name: "authState",
-            type: "Select",
-            label: "认证状态",
-            options: [
-                {
-                    label: "已认证",
-                    value: 0,
-                },
-                {
-                    label: "未认证",
-                    value: 1,
-                },
-
-            ],
-        },
-        {
-            name: "bingState",
-            type: "Select",
-            label: "绑定状态",
-            options: [
-                {
-                    label: "已绑定",
-                    value: 0,
-                },
-                {
-                    label: "未绑定",
-                    value: 1,
-                },
-
-            ],
-        },
-        {
-            name: "timePeriod",
-            type: "RangePicker",
-            label: "时间段",
-            defaultValue: [moment().subtract(1, "month"), moment()],
-        },
-    ];
-
     //所有检索条件
     const ash = [
         {//1
@@ -475,24 +412,86 @@ function ProductOrderInquiry() {
     function changeKey(key) {
         setTabKey(key);
     }
+    // 添加弹框展示
+    const [addVisible, setAddVisible] = useState(false)
+    // 添加订单
+    const [addOrderData, setAddOrderData] = useState({
+        plate: '',
+        plate_type: '',
+        phone: '',
+        name: '',
+    })
+    // 弹框内容字段
+    let modalParams = {
+        plate: '',
+        plate_type: '',
+        phone: '',
+        name: '',
+    }
+    // 添加和修改的标志
+    const [actionType, setActionType] = useState(1)  // 1为添加 2为修改
 
-    //详情其他模块查询
+    // 停车卡名字下拉
+    const [cardNameSelect, setCardNameSelect] = useState([])
+    // 详情数据列表的列
+    const detailColumns = [
+        {
+            title: '序号',
+            dataIndex: 'id',
+            key: 'id',
+            render: (_, record, index) => {
+                return (
+                    <span>{index + 1}</span>
+                )
+            }
+        },
+        {
+            title: '车牌号',
+            dataIndex: 'plate',
+            key: 'plate',
+        },
+        {
+            title: '车牌颜色',
+            dataIndex: 'plate_type',
+            key: 'plate_type',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+        },
+        {
+            title: '绑定时间',
+            dataIndex: 'binding_time',
+            key: 'binding_time',
+        },
+        {
+            title: '操作人',
+            dataIndex: 'user',
+            key: 'user',
+        },
+    ]
+    //模块查询
     function searchOther(e) {
-        var url = ''
-        switch (tabKey) {
-            case "1":
-                url = "/api/fin/order_search/parking_card_order_list"//停车卡订单
-                break
-            case "2":
-                url = "/api/fin/order_search/staggered_parking_order_list"//错峰卡
-                break
-            default: break
+        if (tabKey == "1") {
+            ajax.getProductOrderInquiryParking({ ...e }).then((res) => {
+                let { status, data, total } = res
+                if (status == 20000) {
+                    if (data.list) {
+                        setResultData(data.list)
+                        setTotal(data.total)
+                    } else {
+                        setResultData(data)
+                        setTotal(total)
+                    }
+                } else {
+                    setResultData([])
+                    message.error(res.message)
+                }
+            })
         }
-        ajax({
-            url: url,
-            type: "post",
-            data: { ...e, carId: carId },
-        }).then((res) => {
+        if (tabKey == "2") {
+            ajax.getProductOrderInquiryStaggere({ ...e }).then((res) => {
                 let { status, data, total } = res
                 if (status == 20000) {
                     if (data.list) {
@@ -508,6 +507,25 @@ function ProductOrderInquiry() {
                 }
             })
         }
+    }
+    //详情
+    function searchDetail(e) {
+        ajax.getProductOrderInquiryParkingDetail({ ...e }).then((res) => {
+            let { status, data, total } = res
+            if (status == 20000) {
+                if (data.list) {
+                    setYcddData(data.list)
+                    setTotal(data.total)
+                } else {
+                    setYcddData(data)
+                    setTotal(total)
+                }
+            } else {
+                setYcddData([])
+                message.error(res.message)
+            }
+        })
+    }
     //停车记录信息渲染
     function renderParkRecord(params) {
         return (
@@ -601,7 +619,7 @@ function ProductOrderInquiry() {
         let initFormData = type == "停车卡" ? {
             pn: 1,
             page_size: 15,
-            plate_number: '1',
+            plate_number: '',
             phone: '',
             goods_name: '',
             buy_channel: '',
@@ -634,22 +652,22 @@ function ProductOrderInquiry() {
                 total={total}
                 diyButton={
                     type == "停车卡" ?
-                        // <Button
-                        //     type="primary"
-                        //     onClick={() => {  }}
-                        //     style={{ width: '100px' }}
-                        // >
-                        //     添加订单
-                        // </Button> 
-                        <Link
-                            class="add-btn"
-                            to={{
-                                pathname: "/operationCenter/parkingCardOrder",
-                                //search: `?id=${record.id}`,
-                            }}
+                        <Button
+                            type="primary"
+                            onClick={() => { setActionType(1); setAddVisible(true) }}
+                            style={{ width: '100px' }}
                         >
                             添加订单
-                        </Link>
+                        </Button>
+                        // <Link
+                        //     class="add-btn"
+                        //     to={{
+                        //         pathname: "/operationCenter/parkingCardOrder",
+                        //         //search: `?id=${record.id}`,
+                        //     }}
+                        // >
+                        //     添加订单
+                        // </Link>
                         : null
                 }
                 //initFormData={initFormData}
@@ -664,123 +682,137 @@ function ProductOrderInquiry() {
     }
     //退款订单详情
     const tkddModal = <div className="ltc-box">
-        <div className="ltc-box-title"><div className="text">退款订单:{ycddData?.refund_id}</div><div className="line"></div></div>
+        <div className="ltc-box-title"><div className="text">订单信息</div><div className="line"></div></div>
         <div className="ltc-content">
             <div className="ltc-item">
-                <div className="new-item">生成时间</div><div className="new-value">{ycddData?.refund_time || "--"}</div>
-            </div>
-            <div className="ltc-item">
-                <div className="new-item">退款状态</div><div className="new-value">{ycddData.refund_state || "--"}</div>
+                <div className="new-item">订单状态</div><div className="new-value">{ycddData?.order_status || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">支付渠道</div><div className="new-value">{ycddData.payment_channels || "--"}</div>
+                <div className="new-item">支付时间</div><div className="new-value">{ycddData.pay_time || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">退款方式</div><div className="new-value">{ycddData.refund_type || "--"}</div>
+                <div className="new-item">车牌号</div><div className="new-value">{ycddData.plate_number || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">应退实付金额</div><div className="new-value">{ycddData.refund_actual_amount || "--"}</div>
+                <div className="new-item">车牌颜色</div><div className="new-value">{ycddData.plate_type || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">已退实付金额</div><div className="new-value">{ycddData.has_refund_actual_amount || "--"}</div>
+                <div className="new-item">购买渠道</div><div className="new-value">{ycddData.buy_channel || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">应退优惠金额</div><div className="new-value">{ycddData.refund_discount_amount || "--"}</div>
+                <div className="new-item">实付金额</div><div className="new-value">{ycddData.pay_amount || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">已退优惠金额</div><div className="new-value">{ycddData.has_refund_discount_amount || "--"}</div>
-            </div>
-            <div className="ltc-item">
-                <div className="new-item">退款尝试次数</div><div className="new-value">{ycddData.try_count || "--"}
-                    {timesVisible ?
-                        <a onClick={() => { setTimesVisible(false) }}>收起</a> :
-                        <a onClick={() => { setTimesVisible(true) }}>查看</a>}
-                </div>
+                <div className="new-item">支付渠道</div><div className="new-value">{ycddData.pay_channel || "--"}</div>
             </div>
             <div className="ltc-item">
-                <div className="new-item">最近尝试时间</div><div className="new-value">{ycddData.latest_try_time || "--"}</div>
+                <div className="new-item">支付设备</div><div className="new-value">{ycddData.pay_device || "--"}</div>
             </div>
-        </div>
-
 
-        {timesVisible ? <>
-            <div className="ltc-box-title"><div className="text">退款尝试详情</div><div className="line"></div></div>
-        </> :
-            <>
-                <div className="ltc-box-title"><div className="text">支付订单:{ycddData.order_id}</div><div className="line"></div></div>
-                <div className="ltc-content">
-                    <div className="ltc-item">
-                        <div className="new-item">平台商户</div><div className="new-value">{ycddData.payment_operator_name}</div>
         </div>
-                    <div className="ltc-item">
-                        <div className="new-item">生成时间</div><div className="new-value">{ycddData.payment_create_time}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">支付时间</div><div className="new-value">{ycddData.pay_time}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">支付渠道</div><div className="new-value">{ycddData.payment_equipment}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">优惠金额</div><div className="new-value">{ycddData.discount_amount}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">支付应用</div><div className="new-value">{ycddData.payment_equipment}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">实付金额</div><div className="new-value">{ycddData.paid_in_money}</div>
-                    </div>
-                </div>
-                <div className="ltc-box-title"><div className="text">停车订单:{ycddData.park_record_id}</div><div className="line"></div></div>
-                <div className="ltc-box-title"><div className="text">车厂详情</div></div>
+        <div className="ltc-box-title"><div className="text">商品信息</div><div className="line"></div></div>
         <div className="ltc-content">
             <div className="ltc-item">
-                        <div className="new-item">平台商户</div><div className="new-value">{ycddData.payment_operator_name}</div>
+                <div className="new-item">商品名称</div><div className="new-value">{ycddData?.goods_name || "--"}</div>
             </div>
             <div className="ltc-item">
-                        <div className="new-item">停车场名称</div><div className="new-value">{ycddData?.road_name}</div>
+                <div className="new-item">商户名称</div><div className="new-value">{ycddData?.store_name || "--"}</div>
             </div>
             <div className="ltc-item">
-                        <div className="new-item">区域</div><div className="new-value">{ycddData.area_name}</div>
+                <div className="new-item">适用范围</div><div className="new-value">{ycddData?.scope || "--"}</div>
             </div>
             <div className="ltc-item">
-                        <div className="new-item">商户名称</div><div className="new-value">{ycddData.park_operator_name}</div>
+                <div className="new-item">生效开始日期</div><div className="new-value">{ycddData?.effective_start || "--"}</div>
             </div>
             <div className="ltc-item">
-                        <div className="new-item">泊位号</div><div className="new-value">{ycddData.berth_code}</div>
+                <div className="new-item">有效天数</div><div className="new-value">{ycddData?.effective_days|| "--"}</div>
             </div>
             <div className="ltc-item">
-                        <div className="new-item">车场类型</div><div className="new-value">{ycddData.road_type}</div>
+                <div className="new-item">生效结束日期</div><div className="new-value">{ycddData?.effective_end || "--"}</div>
             </div>
+
         </div>
-                <div className="ltc-box-title"><div className="text">车辆详情</div></div>
+        <div className="ltc-box-title"><div className="text">车辆绑定信息</div><div className="line"></div></div>
         <div className="ltc-content">
-                    <div className="ltc-item">
-                        <div className="new-item">车牌号</div><div className="new-value">{ycddData.plate_number}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">停车时长</div><div className="new-value">{ycddData.parking_duration}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">入场时间</div><div className="new-value">{ycddData.in_time}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">出场时间</div><div className="new-value">{ycddData.out_time}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">入场记录来源</div><div className="new-value">{ycddData.inSource}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">出场记录来源</div><div className="new-value">{ycddData.outSource}</div>
-                    </div>
-                    <div className="ltc-item">
-                        <div className="new-item">证据图像</div><div className="new-value"><a onClick={() => { setEaeVisible(true) }}>查看</a></div>
+            <Table
+                bordered
+                dataSource={[ycddData.car_binding] || []}
+                columns={detailColumns}
+                pagination={false}
+            />
         </div>
     </div>
-            </>}
 
-    </div>
+    // 停车卡名字下拉
+    const handleCardName = (e) => {
+        let data = cardNameSelect.find(item => item.value == e)
+        console.log(data);
+        setAddOrderData({
+            name: e,
+            effective_days: data.effective_days,
+            days: data.days,
+            scope: data.scope,
+            card_id: data.value
+        })
+    }
+    // 停车卡名称下拉
+    const getSelectCardData = () => {
+        ajax.selectCardOrder().then(res => {
+            if (res.status == 20000) {
+                setCardNameSelect(res.data)
+            }
+        }).catch(e => console.log(e))
+    }
+    // 保存订单
+    const placeSaveBtn = () => {
+        let data = {
+            ...addOrderData,
+            effective_days: undefined,
+            days: undefined,
+            scope: undefined,
+            name: undefined
+        }
+        let phoneReg = new RegExp(/^(?:(?:\+|00)86)?1[3-9]\d{9}$/)
 
+        // if (addOrderData.plate != '' && !utils?.validationPlate(addOrderData.plate)) {
+        //     message.error('请输入正确的车牌号')
+        //     return
+        // }
+        // else 
+        if (addOrderData.plate == '') {
+            message.error('请输入车牌号')
+            return
+        } else if (addOrderData.plate_type == '') {
+            message.error('请选择车牌颜色')
+            return
+        } else if (addOrderData.phone && !phoneReg.test(addOrderData.phone)) {
+            message.error('请输入正确的手机号')
+            return
+        } else if (addOrderData.name == '') {
+            message.error('请选择停车卡名称')
+            return
+        } else {
+            ajax.addCardOrder(data).then((res) => {
+                if (res.status === 20000) {
+                    setAddVisible(false)
+                    setAddOrderData(modalParams)
+                    getData(formData)
+                    message.success("添加成功")
+                }
+            }).catch(err => {
+                console.log(err);
+            })
+        }
+    }
+    // 取消按钮
+    const placeBtn = () => {
+        setAddVisible(false)
+        setAddOrderData(modalParams)
+    }
+    useEffect(() => {
+        //getData()
+        getSelectCardData()
+    }, [])
     return (
         <>
             <Tabs activeKey={tabKey} onChange={changeKey}>
@@ -835,9 +867,126 @@ function ProductOrderInquiry() {
                         关闭窗口
                     </Button>]}
             >
-                {/* {tkddModal} */}
-                {tabKey == '5' ? tkddModal : tabKey == '6' ? tckModal : tabKey == '7' ? cfkModal : null}
+                {tkddModal}
+            </Modal>
+            <Modal
+                open={addVisible}
+                onCancel={placeBtn}
+                footer={null}
+                title={''}
+                className="parkModal"
+                destroyOnClose={true}
+                style={{ top: "30px" }}
+            >
+                <div className="carTitle">
+                    <span className="font">{actionType == 1 ? '添加订单' : '修改订单'}</span>
+                </div>
+                <div className="add">
+                    <div className="yisa-search">
+                        <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                        <label>车牌号</label>
+                        <Input
+                            placeholder="请输入内容"
+                            value={addOrderData.plate}
+                            style={{ width: 250, marginLeft: 38 }}
+                            maxLength={30}
+                            onChange={(e) => { setAddOrderData({ plate: e.target.value }) }}
+                        />
+                    </div>
+                    <div className="yisa-search">
+                        <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                        <label>车牌颜色</label>
+                        <Select
+                            style={{ width: 250, marginLeft: 23 }}
+                            value={addOrderData.plate_type}
+                            options={[
+                                {
+                                    value: '0',
+                                    label: "蓝"
+                                },
+                                {
+                                    value: '1',
+                                    label: '黄'
+                                },
+                                {
+                                    value: '2',
+                                    label: '绿'
+                                },
+                                {
+                                    value: '3',
+                                    label: "黄绿"
+                                },
+                                {
+                                    value: '4',
+                                    label: '黑'
+                                },
+                                {
+                                    value: '5',
+                                    label: '黑'
+                                }
+                            ]}
+                            onChange={(e) => { setAddOrderData({ plate_type: e }) }}
+                        />
+                    </div>
+                    <div className="yisa-search">
+                        <label>手机号</label>
+                        <Input
+                            placeholder="请输入内容"
+                            value={addOrderData.phone}
+                            style={{ width: 250, marginLeft: 35 }}
+                            maxLength={30}
+                            onChange={(e) => { setAddOrderData({ phone: e.target.value }) }}
+                        />
+                    </div>
+                    <div className="yisa-search">
+                        <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                        <label>停车卡名称</label>
+                        <Select
+                            style={{ width: 250, marginLeft: 10 }}
+                            value={addOrderData.name}
+                            options={cardNameSelect}
+                            onChange={handleCardName}
+                        />
+                    </div>
+                    <div className="yisa-search">
+                        <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                        <label style={{ display: 'inline-block', marginBottom: 10 }}>适用范围</label>
+                        <TextArea
+                            disabled={true}
+                            value={addOrderData.scope}
+                            style={{ width: 250, marginLeft: 20 }}
+                        />
+                    </div>
+                    {
+                        addOrderData.name &&
+                        <>
 
+                            <div className="yisa-search">
+                                <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                                <label>自购买后&ensp;<span style={{ color: '#409eff', fontSize: 16 }}>{addOrderData.days}天</span>&ensp;开始生效</label>
+                            </div>
+                            <div className="yisa-search">
+                                <em style={{ marginRight: '5px', marginLeft: '-13px', color: 'red' }}>*</em>
+                                <label>有效天数</label>
+                                <InputNumber
+                                    controls={false}
+                                    // placeholder="请输入内容"
+                                    value={addOrderData.effective_days}
+                                    style={{ width: 250, marginLeft: 20 }}
+                                    disabled={true}
+                                />
+                            </div>
+                        </>
+                    }
+                </div>
+                <div className="submitBtn">
+                    <button type="primary" className="submit colorBtn" onClick={() => { placeSaveBtn() }}>
+                        保存
+                    </button>
+                    <button type="primary" className="cancel colorReset" onClick={() => { placeBtn() }}>
+                        取消
+                    </button>
+                </div>
             </Modal>
         </>
     );

src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.scss

@@ -3,26 +3,34 @@ $color-container-bg: var(--color-container-bg);
 $color-user-list-bg: var(--color-user-list-bg);
 $color-text: var(--color-text);
 $color-primary: var(--color-primary);
+
 .ant-tabs-tabpane-hidden {
   display: none;
 }
+
 .ant-tabs {
   margin-bottom: 16px;
+
   .ant-tabs-nav {
     margin-bottom: 0 !important;
+
     &::before {
       border-bottom: 1px solid var(--color-card-line) !important;
     }
   }
+
   .ant-tabs-nav-wrap {
     width: 100%;
     box-sizing: content-box;
+
     .ant-tabs-nav-list {
       width: 340px;
+
       .ant-tabs-ink-bar {
         height: 3px;
         background-color: #00ccff;
       }
+
       .ant-tabs-tab {
         flex: 1;
         width: 100%;
@@ -36,6 +44,7 @@ $color-primary: var(--color-primary);
         text-align: center;
         letter-spacing: 0.7px;
       }
+
       .ant-tabs-tab-active {
         div {
           color: #00ccff;
@@ -44,70 +53,86 @@ $color-primary: var(--color-primary);
     }
   }
 }
+
 .ant-input::-webkit-input-placeholder {
   color: var(--color-placeholder);
 }
+
 .ant-input::-moz-placeholder {
   color: var(--color-placeholder);
 }
+
 .ant-input:-ms-input-placeholder {
   color: var(--color-placeholder);
 }
+
 .ant-input::placeholder {
   color: var(--color-placeholder);
 }
+
 .ant-select-selection-placeholder {
   color: var(--color-placeholder);
 }
-.ant-select-disabled.ant-select-single:not(.ant-select-customize-input)
-  .ant-select-selector {
+
+.ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
   background: var(--color-input-disabled-bg);
   color: var(--color-placeholder);
 }
+
 .ant-select-disabled .ant-select-arrow {
   color: var(--color-placeholder);
 }
-.ant-select-disabled.ant-select:not(.ant-select-customize-input)
-  .ant-select-selector {
+
+.ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
   background-color: var(--color-input-disabled-bg);
   color: var(--color-input-disabled-color);
   cursor: not-allowed;
 }
+
 .ant-select-multiple {
   .ant-select-selector {
     .ant-select-selection-item {
       background-color: var(--color-bg-body);
       border-color: var(--color-border);
+
       .ant-select-selection-item-remove {
         color: var(--color-text);
       }
     }
   }
 }
+
 .ant-select-arrow {
   color: var(--color-text);
 }
+
 .ant-select-clear {
   border-radius: 50%;
 }
+
 .ant-select-dropdown-menu {
   background-color: var(--color-input-bg);
+
   .ant-select-dropdown-menu-item {
     color: var(--color-text);
+
     &.ant-select-dropdown-menu-item-active {
       color: #fff;
       // background-color: var(--radio-button-bg-checked);
     }
+
     &.ant-select-dropdown-menu-item-selected {
       color: #fff;
       // background-color: var(--radio-button-bg-checked);
     }
+
     &:hover {
       color: #fff;
       // background-color: var(--radio-button-bg-checked);
     }
   }
 }
+
 .ant-select-selector {
   background-color: var(--color-search-list-item-bg) !important;
   box-shadow: none !important;
@@ -115,6 +140,7 @@ $color-primary: var(--color-primary);
   color: var(--color-search-list-item-value);
   border-color: var(--color-search-list-item-bd) !important;
 }
+
 .ant-select-selection {
   background-color: var(--color-input-bg);
   box-shadow: none;
@@ -129,11 +155,13 @@ $color-primary: var(--color-primary);
     white-space: normal;
   }
 }
+
 .ant-picker {
   width: 100%;
   background-color: var(--color-search-list-item-bg);
   border-color: var(--color-border);
 }
+
 .yisa-table {
   width: 100%;
 
@@ -148,6 +176,7 @@ $color-primary: var(--color-primary);
       background: var(--color-table-body-bg) !important;
       border-bottom-color: var(--color-table-border-bottom-color);
     }
+
     tr:nth-child(even) {
       td {
         background: var(--color-table-body-bg-nth-child-even) !important;
@@ -155,30 +184,37 @@ $color-primary: var(--color-primary);
     }
   }
 }
+
 .base-ltc {
   display: flex;
 
 }
+
 .ltc-img {
   margin-right: 20px;
 }
+
 .ltc-box {
   width: 100%;
+
   .ltc-box-title {
     font-size: 18px;
     font-weight: bolder;
     width: 100%;
     white-space: nowrap;
     overflow: hidden;
+
     .text {
       display: inline-block;
     }
+
     .line {
       display: inline-block;
       border: 1px dotted #607092;
       width: inherit;
       margin-bottom: 6px;
     }
+
     .ltc-icon {
       width: 5px;
       background: #0080db;
@@ -186,6 +222,7 @@ $color-primary: var(--color-primary);
       display: inline-block;
       margin-right: 10px;
     }
+
     .ltc-btn {
       display: inline-block;
       border: 1px solid;
@@ -200,21 +237,26 @@ $color-primary: var(--color-primary);
       font-weight: 100;
       cursor: pointer;
     }
+
     .ltc-cancel {
       background: #fff;
       color: #000;
     }
   }
+
   .ltc-box-line {
     border: 1px solid #e7e7e7;
     margin: 8px 0;
   }
+
   .ltc-box-in {
     margin-left: 20px;
+
     .ant-descriptions {
       margin-left: 20px;
     }
   }
+
   .ltc-title {
     margin: auto;
     width: 50%;
@@ -222,13 +264,16 @@ $color-primary: var(--color-primary);
     font-size: 18px;
     font-weight: 600;
   }
+
   .ltc-content {
     margin: auto;
     padding: 20px;
+
     .ltc-item {
       font-size: 14px;
       margin: 6px 12px 6px 0;
       display: inline-flex;
+
       //width: 470px;
       .new-item {
         display: inline-block;
@@ -238,6 +283,7 @@ $color-primary: var(--color-primary);
         background: rgba(150, 161, 192, 0.24);
         text-align: center;
       }
+
       .new-value {
         display: inline-block;
         width: 320px;
@@ -247,27 +293,34 @@ $color-primary: var(--color-primary);
         background: #3E4557;
         box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.12);
       }
+
       .ltc-item-input {
         display: inline-block;
         width: 200px;
       }
+
       div {
         width: 150px;
       }
     }
   }
+
   .ltc-liuc {
     display: flex;
     margin-left: 200px;
+
     .ltc-item {
       display: flex;
+
       .ltc-item-name {
         margin: 6px 10px 0 10px;
         color: #3f94df;
       }
     }
+
     .ltc-work {
       text-align: center;
+
       .ltc-tips {
         border: 3px solid #000;
         text-align: center;
@@ -281,15 +334,18 @@ $color-primary: var(--color-primary);
 
   }
 }
+
 .distable {
   .ant-pagination {
     justify-self: center;
   }
 }
+
 .eae-modal {
   .eae-modal-title {
     font-size: 18px;
     font-weight: bolder;
+
     .ltc-icon {
       width: 5px;
       background: #0080db;
@@ -298,14 +354,17 @@ $color-primary: var(--color-primary);
       margin-right: 10px;
     }
   }
+
   .eae-modal-item {
     display: inline-block;
     font-size: 16px;
   }
 }
+
 .cc-container {
   overflow: auto;
 }
+
 .back-btn {
   position: absolute;
   right: 50px;
@@ -320,6 +379,7 @@ $color-primary: var(--color-primary);
   cursor: pointer;
   z-index: 9999;
 }
+
 .add-btn {
   margin: 0 5px;
   width: 78px;
@@ -330,3 +390,82 @@ $color-primary: var(--color-primary);
   text-align: center;
   line-height: 34px;
 }
+
+.parkModal {
+  width: 900px !important;
+
+  .carTitle {
+    .font {
+      font-weight: 700;
+      font-size: 16px;
+      border-left: 6px solid #409eff;
+      padding-left: 8px;
+      height: 20px;
+      line-height: 20px;
+      margin-bottom: 20px;
+    }
+  }
+
+  .parkShop {
+    display: flex;
+    margin-top: 13px;
+
+    label {
+      line-height: 31px;
+    }
+  }
+
+  .only {
+    color: #999;
+  }
+
+  .parkNum {
+    display: flex;
+
+    label {
+      line-height: 31px;
+    }
+
+    .parkFont {
+      margin-left: 20px;
+      color: #999;
+    }
+  }
+
+  .add {
+    margin-left: 25px;
+
+    .yisa-search {
+      margin-top: 20px;
+    }
+
+    .extra-style {
+      margin-left: 26px;
+    }
+
+  }
+
+  .submitBtn {
+    margin-left: 132px;
+    margin-top: 20px;
+
+    .submit {
+      width: 80px;
+      height: 35px;
+      background: #409eff;
+      border: none !important;
+      border-radius: 4px;
+      cursor: pointer;
+      color: #fff;
+    }
+
+    .cancel {
+      width: 80px;
+      height: 35px;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      margin-left: 20px;
+    }
+  }
+}

src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx

@@ -979,7 +979,7 @@ function UserInfo() {
                 total={total}
                 pagename={pagename}
                 search={searchOther}
-                initFormData={exportUrl == "/api/bpm/record/get_record_export" ? { start_time: moment().subtract(1, "month") } : {}} //初始化的表格搜索项
+                initFormData={exportUrl == "/api/bpm/record/get_record_export" ? { start_time: moment().subtract(1, "month"), type: 1 } : { type: 1 }} //初始化的表格搜索项
                 isExport={exportUrl ? true : false}
                 exportUrl={exportUrl}
                 export_other={{ memberId: memberId }}

src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx

@@ -193,7 +193,11 @@ function LiftUpPoleRecord(props) {
             ...formData
         }
         ajax.poleExport(data).then(res => {
-            window.open(res.data.url)
+            if (res.status == 20000) {
+                window.open(res.data.url || res.data.export_url)
+            } else {
+                message.error(res.message)
+            }
         })
     }
 

src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

@@ -54,9 +54,9 @@ function Detail(props) {
           <Descriptions.Item label="免费分钟数" span={1}>
             {record.freeTime}
             <div style={{ margin: "0 10px" }}>
-              {/* <Checkbox disabled defaultChecked={record.freeTimeAbleF}>
+              <Checkbox disabled defaultChecked={record.freeTimeAbleF}>
                 免费分钟数纳入计费时间
-              </Checkbox> */}
+              </Checkbox>
             </div>
           </Descriptions.Item>
           <Descriptions.Item label="特殊车辆优惠" span={2}>

src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx

@@ -27,7 +27,7 @@ function TimePart(props) {
     onChange(all);
   };
 
-  
+  console.log(30,record)
   return (
     <div>
       <Form

src/services/FinancialMgm/orderInquiry.js

@@ -16,7 +16,52 @@ const getOrderChangeDetail = (params) => {
     data: params,
   });
 };
+// 财务管理-商品订单查询-停车卡
+const getProductOrderInquiryParking = (params) => {
+  return ajax({
+    url: "/api/fin/order_search/parking_card_order_list",
+    type: "post",
+    data: params,
+  });
+};
+// 财务管理-商品订单查询-停车卡添加
+const getProductOrderInquiryParkingAdd = (params) => {
+  return ajax({
+    url: "/api/fin/order_search/add_parking_card_order",
+    type: "post",
+    data: params,
+  });
+};
+// 财务管理-商品订单查询-停车卡编辑
+const getProductOrderInquiryParkingEidt = (params) => {
+  return ajax({
+    url: "/api/fin/order_search/edit_parking_card_order",
+    type: "post",
+    data: params,
+  });
+};
+// 财务管理-商品订单查询-停车卡详情
+const getProductOrderInquiryParkingDetail = (params) => {
+  return ajax({
+    url: "/api/fin/order_search/parking_card_order_detail",
+    type: "post",
+    data: params,
+  });
+};
+// 财务管理-商品订单查询-错峰卡
+const getProductOrderInquiryStaggere = (params) => {
+  return ajax({
+    url: "/api/fin/order_search/staggered_parking_order_list",
+    type: "post",
+    data: params,
+  });
+};
 export default {
   getOrderChangeList,
   getOrderChangeDetail,
+  getProductOrderInquiryParking,
+  getProductOrderInquiryParkingAdd,
+  getProductOrderInquiryParkingEidt,
+  getProductOrderInquiryParkingDetail,
+  getProductOrderInquiryStaggere,
 }