From 3a4bc7b06283b3027da6bf27a6c6a130c7237935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com> Date: Mon, 4 Dec 2023 20:42:50 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ParkingRecordModal/RecordReviewModal.jsx | 2 +- src/components/ParkingRecordModal/dataSource.js | 13 +++++++++++++ .../FinancialMgm/ExceptionDeal/DealRecordList/index.jsx | 6 +++--- src/pages/MerchantMgm/MerchantAdmin/loadable.jsx | 5 +++-- .../OperationSales/InformationMgm/index.scss | 6 ++++++ .../OperationSales/InformationMgm/loadable.jsx | 5 +++-- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/components/ParkingRecordModal/RecordReviewModal.jsx b/src/components/ParkingRecordModal/RecordReviewModal.jsx index 61a26cc..a82d36f 100644 --- a/src/components/ParkingRecordModal/RecordReviewModal.jsx +++ b/src/components/ParkingRecordModal/RecordReviewModal.jsx @@ -36,7 +36,7 @@ const RecordReviewModal = (props) => { { value: 2, label: '变更车牌号' }, { value: 3, label: '变更订单金额' }, { value: 4, label: '免费该订单' }, - { value: 5, label: '作废该订单' } + // { value: 5, label: '作废该订单' } ]; // 调整基于 const adjustment = [ diff --git a/src/components/ParkingRecordModal/dataSource.js b/src/components/ParkingRecordModal/dataSource.js index c126dff..0df76e1 100644 --- a/src/components/ParkingRecordModal/dataSource.js +++ b/src/components/ParkingRecordModal/dataSource.js @@ -58,6 +58,19 @@ export const payRecordColumns = [ dataIndex: "payment_type", key: "payment_type", align: "center", + render: (text, record, index) => { + let tem = ""; + record?.payment_type == 1 ? tem = "场内支付" : + record?.payment_type == 2 ? tem = "欠费补缴" : + record?.payment_type == 3 ? tem = "欠费追缴" : + record?.payment_type == 4 ? tem = "etc欠费追缴" : + tem = "未知" + + return( + {tem} + ) + } + }, { title: "支付渠道", diff --git a/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx index 64dd2dc..109825b 100644 --- a/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx +++ b/src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx @@ -12,7 +12,7 @@ function DealRecordList() { // 默认数据 const defaultData = { deal_record_id: "", // 处理记录ID - business_type: 0, // 业务订单类型 + business_type: "0", // 业务订单类型 park_id: "", // 业务订单ID status: 0, // 状态 start_time: moment().subtract(7, "days").startOf("day").format("YYYY-MM-DD HH:mm:ss"), // 开始时间 @@ -249,7 +249,7 @@ function DealRecordList() { if(sessionData && Object.values(sessionData).length > 0) { _data = { deal_record_id: sessionData?.deal_record_id || "", // 处理记录ID - business_type: sessionData?.business_type || 0, // 业务订单类型 + business_type: sessionData?.business_type || "0", // 业务订单类型 park_id: sessionData?.park_id || [], // 业务订单ID status: sessionData?.status || 0, // 状态 start_time: sessionData?.start_time || defaultData?.start_time, @@ -331,7 +331,7 @@ function DealRecordList() { }, ]} value={formData.business_type} - onChange={(v) => setFormData({ ...formData, business_type: v || 0})} + onChange={(v) => setFormData({ ...formData, business_type: v || "0"})} />
diff --git a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx index bd1fbc2..ae9c5a6 100644 --- a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx +++ b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx @@ -277,6 +277,7 @@ function MerchantAdmin() { //编辑管理员-提交按钮 const submitUpdate = async () => { + console.log(records); try { var updateFormValue = {} await updateForm.validateFields().then(async (value) => { @@ -287,7 +288,7 @@ function MerchantAdmin() { operatorid, phone, full_name, account, email, sex_status } }) - const data = { ...updateFormValue } + const data = records?.id ? { ...updateFormValue, id: records?.id } : {...updateFormValue} ajax.updateMerchantAdmin(data).then( res => { if (res.status == 20000) { @@ -324,7 +325,7 @@ function MerchantAdmin() { }) const data = { ...updateFormValue } - ajax.addTenant(data).then( + ajax.addMerchantAdmin(data).then( res => { if (res.status == 20000) { setCreateVisible(false) diff --git a/src/pages/OperationCenter/OperationSales/InformationMgm/index.scss b/src/pages/OperationCenter/OperationSales/InformationMgm/index.scss index 0fa059a..7cee912 100644 --- a/src/pages/OperationCenter/OperationSales/InformationMgm/index.scss +++ b/src/pages/OperationCenter/OperationSales/InformationMgm/index.scss @@ -230,6 +230,12 @@ color: #409eff; } } + .ant-table-wrapper { + height: calc(100% - 45px); + .ant-table-body { + @include scrollBar(var(--color-user-list-bg), #3b97ff); + } + } } } diff --git a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx index 09257f3..25dd020 100644 --- a/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/InformationMgm/loadable.jsx @@ -1123,6 +1123,7 @@ function InformationMgm() { columns={columns} pagination={false} loading={tabLoading} + scroll={{ y: "calc(100vh - 315px)" }} /> @@ -1476,7 +1477,7 @@ function InformationMgm() { handleForm("upperTime", str)} />
@@ -1487,7 +1488,7 @@ function InformationMgm() { handleForm("lowerTime", str)} />