diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index fe74178..a22f93c 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -27,8 +27,9 @@ function ParkingAlyDuration() { end_time: moment().endOf("day").format("YYYY-MM-DD"), car_parking_type: '3', operator_id: '0', - area_id:'0', + area_id: '0', date_type: '1', + //region: '0' //date_type: 1, }; // 分页数据 @@ -676,9 +677,9 @@ function ParkingAlyDuration() { value: "id", children: "children", }} - value={formData.region} + value={formData.area_id} onChange={(v, option) => { - setFormData({ ...formData, region: v ? v : null }); + setFormData({ ...formData, area_id: v ? v : null }); }} /> diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx index 37ff5fd..a465568 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx @@ -230,7 +230,7 @@ function ProductOrderInquiry() { type: "Select", label: "支付方式", placeholder: "请选择支付方式", - options: dictionary.PaydMethod, + options: sysConfig.payment, }, { name: "timePeriod", @@ -393,7 +393,7 @@ function ProductOrderInquiry() { phone: '', goods_name: '', buy_channel: '', - pay_channel: '', + pay_channel: 0, order_status: '', pay_device: '', channel_serial_number: '', @@ -405,7 +405,7 @@ function ProductOrderInquiry() { plate_number: '', phone: '', parking_name: '', - pay_channel: '', + pay_channel: 0, channel_serial_number: '', export: '0', export_file_name: '', @@ -433,6 +433,7 @@ function ProductOrderInquiry() { export_file_name: '', }} exportUrl={url} + pageName={type == "停车卡" ? "productOrderInquiryCar" : "productOrderInquiry"} rowKey={'id'} search={searchOther} /> @@ -639,6 +640,8 @@ function ProductOrderInquiry() { setAddOrderData(modalParams) //getData(formData) message.success("添加成功") + } else { + message.error(res.message) } }).catch(err => { console.log(err); diff --git a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx index fe7e571..c99d4bb 100644 --- a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx @@ -65,35 +65,35 @@ function UserAuth() { align: "center", render: (text, record, index) => ( <> + { + record.state == "1" ? + { + setMyId(record.id); + setPassVisible(true); + }}> + 通过 + : null + } { setTag('2'); - setCarId(record.carId) - setMyId(record.id) - setIndexby(index) - }}> - 通过 - - { - setTag('2'); - setCarId(record.carId) - setMyId(record.id) - setIndexby(index) + setMyId(record.id); + setIndexby(index); }}> 查看 - { - setTag('2'); - setCarId(record.carId) - setMyId(record.id) - setIndexby(index) - }}> - 驳回 - + { + record.state == "1" ? + { + setMyId(record.id); + setRefuseVisible(true); + }}> + 驳回 + : null + } ), }, ]; - const [carId, setCarId] = useState(); const [myId, setMyId] = useState(); const [loading, setLoading] = useState(false); const [tag, setTag] = useState('1'); @@ -105,7 +105,9 @@ function UserAuth() { const [resultData, setResultData] = useState([]); const [total, setTotal] = useState(0); const [indexby, setIndexby] = useState(0); - const [formData, setFormData] = useState({}) + const [formData, setFormData] = useState({ + state: '0' + }) const [pageData, setPageData] = useState({ // 分页参数 pn: 1, @@ -119,10 +121,8 @@ function UserAuth() { } const handleChange = (value) => { - console.log(value); - setFormData({ ...formData, type: value }) + setFormData({ ...formData, state: value }) setPageData({ ...pageData, pn: 1 }) - //setSendData({ ...sendData, receiver_type: value }) }; function search() { @@ -140,28 +140,23 @@ function UserAuth() { } }) } + //通过和驳回操作 function toAudits(e) { ajax({ - url: "/api/ope/car/audit", - type: "post", - data: { id: myId, audit: e ? "pass" : "refuse", text: e ? null : toText }, + url: "/api/ope/user_manage/auth_operate", + type: "get", + data: { id: myId, type: e }, }).then((res) => { if (res.status == 20000) { message.success(res.message) setPassVisible(false) setRefuseVisible(false) - setToText('') - setTimeout(() => { - window.location.reload() - }, 1000) + search() } else { message.error(res.message) } }) } - const handleOpinion = (v) => { - setToText(v.target.value) - } useEffect(() => { search() }, [formData, pageData]); @@ -220,12 +215,6 @@ function UserAuth() { - {resultData[indexby].auditState == '待审核' || resultData[indexby].auditState == '残疾车待审核' ? -
-
{ setPassVisible(true) }}>通过
-
{ setRefuseVisible(true) }}>驳回
-
{ setTag('1') }}>取消
-
: null} :
@@ -235,23 +224,24 @@ function UserAuth() { style={{ width: 180, }} + value={formData.state} onChange={handleChange} placeholder={"请选择审核状态"} options={[ { - value: 0, + value: '0', label: '全部', }, { - value: 1, + value: '1', label: '待审核', }, { - value: 2, + value: '2', label: '已审核', }, { - value: 3, + value: '3', label: '已作废', }, ]} @@ -319,29 +309,21 @@ function UserAuth() { onOk={() => { toAudits(1) }} >
-
!
请您确认审核资料是否无误! +
!
是否通过该用户认证!
{ setRefuseVisible(false); }} - onOk={() => { toAudits(0) }} + onOk={() => { toAudits(2) }} >
-
-
请输入拒审理由:
-