From 5f466d517cfeff2901be6fef1cf1daeec9eec101 Mon Sep 17 00:00:00 2001 From: xingjx Date: Tue, 12 Dec 2023 18:21:22 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingBusinessAly/ParkBerthAly/loadable.jsx | 2 +- .../ParkTurnoverAly/loadable.jsx | 2 +- .../OrderInquiry/ParkingOrderInquiry/index.jsx | 1 + .../OrderInquiry/ProductOrderInquiry/index.jsx | 117 ++++++- .../OrderInquiry/ProductOrderInquiry/index.scss | 10 + .../OperationCenter/UserMgm/UserAuth/index.scss | 244 ++++++++++++++ .../OperationCenter/UserMgm/UserAuth/loadable.jsx | 365 ++++++++++++++++++++- 7 files changed, 714 insertions(+), 27 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx index 0bd0df5..08205af 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx @@ -452,7 +452,7 @@ function ParkBerthAly() {
日均泊位周转次数
-
{baseData.turnover || "--"}
+
{baseData.turnover || "--"}次
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index 6d95c89..0559309 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -584,7 +584,7 @@ function ParkTurnoverAly() { ? { - lineData ? + lineData=={} ? diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx index cad1a68..1e87f23 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx @@ -10,8 +10,10 @@ import { Select, Tabs, Descriptions, - Timeline + Timeline, + Popover, } from "antd"; +import { Link } from "react-router-dom"; import moment from "moment"; import ajax from '@/config/ajax.js' import { TableModule } from "@/components"; @@ -58,15 +60,76 @@ function ProductOrderInquiry() { align: "center", } switch (type) { + case 1: + obj.render = (_, record) => ( + + + 查看 + + + 修改 + +
+ } + trigger="click" + > + + + ) + arr.push(obj) + break case 2: - obj.render = (text, record) => (<> - { - setYcddData(record) - setDetailVisible(true) - }}> - 详情 - - ) + obj.render = (_, record) => ( + + + 查看 + + {/* { + const type = record.no_pwd_pay === 1 ? 2 : 1; + handleAlipayNoPassword(type, record.poi, record.road_code); + }} + > + {record.no_pwd_pay === 1 ? "关闭" : "开通"}支付宝免密支付 + */} + + } + trigger="click" + > + + + ) arr.push(obj) break default: break @@ -291,8 +354,8 @@ function ProductOrderInquiry() { name: "timePeriod", type: "RangePicker", label: "时间段", - defaultTitle: ['支付时间', '至'] - // defaultValue: [moment().startOf("day"), moment()], + defaultTitle: ['支付时间', '至'], + defaultValue: [moment().startOf("day"), moment()], }, {//17 name: "timePeriod", @@ -367,8 +430,8 @@ function ProductOrderInquiry() { name: "timePeriod", type: "RangePicker", label: "时间段", - defaultTitle: ['订单修改时间', '至'] - // defaultValue: [moment().startOf("day"), moment()], + defaultTitle: ['订单修改时间', '至'], + defaultValue: [moment().startOf("day"), moment()], }, {//29 name: "b", @@ -534,7 +597,7 @@ function ProductOrderInquiry() { ); } //其他页面渲染 - function renderTable(columns, arr, dataSource, type,url) { + function renderTable(columns, arr, dataSource, type, url) { let initFormData = type == "停车卡" ? { pn: 1, page_size: 15, @@ -569,7 +632,31 @@ function ProductOrderInquiry() { tableData={dataSource} formSearch={arr} total={total} - initFormData={initFormData} + diyButton={ + type == "停车卡" ? + // + + 添加订单 + + : null + } + //initFormData={initFormData} + otherData={{ + export: '0', + export_file_name: '', + }} exportUrl={url} search={searchOther} /> diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.scss b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.scss index 101a262..d1e2c5c 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.scss +++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.scss @@ -319,4 +319,14 @@ $color-primary: var(--color-primary); color: #000; cursor: pointer; z-index: 9999; +} +.add-btn { + margin: 0 5px; + width: 78px; + height: 34px; + background: linear-gradient(180deg, #3aa9ff, #59b7ff); + border-radius: 4px; + color: #fff; + text-align: center; + line-height: 34px; } \ No newline at end of file diff --git a/src/pages/OperationCenter/UserMgm/UserAuth/index.scss b/src/pages/OperationCenter/UserMgm/UserAuth/index.scss index 1838f71..c878ac3 100644 --- a/src/pages/OperationCenter/UserMgm/UserAuth/index.scss +++ b/src/pages/OperationCenter/UserMgm/UserAuth/index.scss @@ -3,3 +3,247 @@ $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); +.cc-container { + overflow: auto; +} +.push-box { + padding: 20px; + background: var(--color-user-list-bg); + border-top-left-radius: 20px; + box-shadow: 0px 3px 8px 0px rgb(0 0 0 / 8%); + margin-top: 10px; + .push-back { + float: right; + border: 1px solid; + border-radius: 5px; + margin: 0 10px; + width: 60px; + height: 35px; + line-height: 35px; + text-align: center; + background: #ffffff; + color: #000000; + font-weight: 100; + cursor: pointer; + } + .push-item { + display: flex; + margin: 14px 0; + .title { + width: 100px; + } + .ant-input-textarea { + width: 400px; + } + } + .push-btn-box { + text-align: center; + .push-btn { + display: inline-block; + border: 1px solid; + border-radius: 5px; + margin: 0 10px; + width: 60px; + height: 35px; + line-height: 35px; + text-align: center; + background: #409eff; + color: #fff; + font-weight: 100; + cursor: pointer; + } + .push-cancel { + background: #fff; + color: #000; + } + } + .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; + height: 19px; + display: inline-block; + margin-right: 10px; + } + .ltc-btn { + display: inline-block; + border: 1px solid; + border-radius: 5px; + margin: 0 10px; + width: 60px; + height: 35px; + line-height: 35px; + text-align: center; + background: #409eff; + color: #fff; + 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%; + text-align: center; + font-size: 18px; + font-weight: 600; + } + .ltc-content { + margin: auto; + padding: 20px; + .ltc-item { + font-size: 14px; + margin: 6px 0; + display: inline-flex; + width: 470px; + .new-item { + display: inline-block; + width: 120px; + height: 32px; + line-height: 32px; + background: rgba(150,161,192,0.24); + text-align: center; + } + .new-value { + display: inline-block; + width: 320px; + height: 32px; + line-height: 32px; + text-align: center; + 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-item-img { + width: 540px; + height: 300px; + border: 1px solid; + background: rgb(62 69 87); + margin-right: 20px !important; + img { + width: 100%; + height: 100%; + object-fit: contain; + } + } + } + } +} +.search-box { + width: 100%; + padding: 20px; + height: calc(100% - 10px); + background: var(--color-user-list-bg); + border-top-left-radius: 20px; + box-shadow: 0px 3px 8px 0px rgb(0 0 0 / 8%); + margin-top: 10px; + .time { + display: inline-block; + } + .btn-box { + display: inline-block; + .search-btn { + margin: 0 10px ; + } + } +} +.result-box { + width: 100%; + height: 600px; + .table-wrap { + height: calc(100% - 32px - 65px); + } + .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%; + display: flex; + justify-content: center; + padding-bottom: 10px; + text-align: center; + cursor: pointer; + font-size: 14px !important; + font-family: MicrosoftYaHei; + text-align: center; + letter-spacing: 0.7px; + } + .ant-tabs-tab-active { + div { + color: #00ccff; + } + } + } + } + } + .pop-card { + display: flex; + flex-direction: row; + } +} +.pass-icon { + height: 22px; + width: 20px; + border-radius: 10px; + background: #ffbb26; + display: inline-block; + text-align: center; + font-weight: 800; +} +.eae-modal { + .eae-modal-item { + display: flex; + margin-left: 10px; + } +} \ No newline at end of file diff --git a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx index 60194bf..e270fb9 100644 --- a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx @@ -1,15 +1,360 @@ import React, { useState, useRef, useEffect } from "react"; -// import { message, Pagination, Table, Space, Modal, } from "antd"; -// import { dictionary, utils } from "@/config/common"; -// import moment from 'moment' -// import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; -// import ajax from "@/services" -// import { FormInput, FormSelect, OptionPanel, ResultPanel, FormSliderPicker, AreaCascader, ImgResize, ImgZoom, } from "@/components" -// import "./index.scss"; -// import errorImg from "@/assets/images/layout/error.png" -// import { useLocation } from "react-router-dom"; +import { + message, + Pagination, + Table, + Form, + Space, + Modal, + DatePicker, + Input, + Button, + Select, +} from "antd"; +const { TextArea } = Input; +import ajax from '@/config/ajax.js' +import { TableModule, ResultFlow, QuickMenu } from "@/components"; +import { dictionary, utils } from "@/config/common"; +import "./index.scss"; function UserAuth() { - return
UserAuth
+ const columns = [ + { + title: "序号", + dataIndex: "index", + key: "index", + align: "center", + fixed: "left", + render: (text, record, index) => index + 1, + width: 100, + }, + { + title: "提交人", + dataIndex: "operator", + key: "operator", + align: "center", + }, + { + title: "审核状态", + dataIndex: "auditState", + key: "auditState", + align: "center", + render: (text, record, index) => { + var color = '' + switch (text) { + case "待审核": + case "残疾车待审核": + color = 'rgb(16, 141, 233)'; + break; + case "已审核": + case "残疾车已审核": + color = 'red'; + break; + case "已作废": + case "残疾车已作废": + color = 'rgb(152, 152, 152)'; + default: + break; + } + return (<> + + + {text} + ) + }, + }, + { + title: "操作人", + dataIndex: "operator", + key: "operator", + align: "center", + }, + { + title: "提交日期", + dataIndex: "create_time", + key: "create_time", + align: "center", + }, + { + title: "更新时间", + dataIndex: "operate_time", + key: "operate_time", + align: "center", + }, + { + title: "操作", + dataIndex: "operation", + key: "operation", + fixed: "right", + align: "center", + render: (text, record, index) => ( + <> + { + setTag('2'); + setCarId(record.carId) + setMyId(record.id) + setIndexby(index) + }}> + 通过 + 查看 + 驳回 + + + ), + }, + ]; + const [carId, setCarId] = useState(); + const [myId, setMyId] = useState(); + const [loading, setLoading] = useState(false); + const [tag, setTag] = useState('1'); + const [bigpicVisible, setBigpicVisible] = useState(false);//大图展示 + const [passVisible, setPassVisible] = useState(false); + const [refuseVisible, setRefuseVisible] = useState(false); + const [toText, setToText] = useState(); + const [bigPic, setBigPic] = useState(); + const [resultData, setResultData] = useState([]); + const [total, setTotal] = useState(0); + const [indexby, setIndexby] = useState(0); + const [formData, setFormData] = useState({}) + const [pageData, setPageData] = useState({ + // 分页参数 + pn: 1, + page_size: 15, + }); + function onShowSizeChange(pn, page_size) { + setPageData({ + pn, + page_size, + }); + } + + const handleChange = (value) => { + console.log(value); + setFormData({ ...formData, type: value }) + setPageData({ ...pageData, pn: 1 }) + //setSendData({ ...sendData, receiver_type: value }) + }; + + function search() { + ajax({ + url: "/api/ope/car/certification_list", + type: "post", + data: { ...formData, ...pageData }, + }).then((res) => { + let { status, data, total } = res + if (status == 20000) { + setResultData(data) + setTotal(total) + } else { + message.error(res.message) + } + }) + } + function toAudits(e) { + ajax({ + url: "/api/ope/car/audit", + type: "post", + data: { id: myId, audit: e ? "pass" : "refuse", text: e ? null : toText }, + }).then((res) => { + if (res.status == 20000) { + message.success(res.message) + setPassVisible(false) + setRefuseVisible(false) + setToText('') + setTimeout(() => { + window.location.reload() + }, 1000) + } else { + message.error(res.message) + } + }) + } + const handleOpinion = (v) => { + setToText(v.target.value) + } + useEffect(() => { + search() + }, [formData, pageData]); + return ( + <> + { + tag == 2 ? +
+
{ setTag('1') }}>返回
+
+
身份认证
+
+
+
姓名
+
{resultData[indexby]?.mo || "--"}
+
+
+
性别
+
{resultData[indexby].p || "--"}
+
+
+
年龄
+
{resultData[indexby].c || "--"}
+
+
+
会员手机号
+
{resultData[indexby].a || "--"}
+
+
+
身份证号
+
{resultData[indexby].a || "--"}
+
+
+
出生日期
+
{resultData[indexby].a || "--"}
+
+
+
认证状态
+
{resultData[indexby].a || "--"}
+
+
+
提交日期
+
{resultData[indexby].a || "--"}
+
+
+
更新日期
+
{resultData[indexby].a || "--"}
+
+
+
+
+ { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> +
+
+ { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> +
+
+
+ {resultData[indexby].auditState == '待审核' || resultData[indexby].auditState == '残疾车待审核' ? +
+
{ setPassVisible(true) }}>通过
+
{ setRefuseVisible(true) }}>驳回
+
{ setTag('1') }}>取消
+
: null} +
: +
+
+
审核状态: +
+