From 23adba3351288658b355067a21b23b21d4169d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com> Date: Thu, 23 Nov 2023 10:37:41 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E6=8A=A5=E9=94=99=E5=B1=95=E7=A4=BA?= =?UTF-8?q?NAN=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/no-data-sel.png | Bin 0 -> 8416 bytes src/config/character.config.js | 8 +- .../ExceptionDeal/StartExceptionDeal/index.jsx | 6 +- .../OperationSales/YardDiscount/DebounceSelect.jsx | 6 +- .../OperationSales/YardDiscount/index.scss | 9 +- .../OperationSales/YardDiscount/loadable.jsx | 102 +++++++++++++-------- 6 files changed, 80 insertions(+), 51 deletions(-) create mode 100644 src/assets/images/no-data-sel.png diff --git a/src/assets/images/no-data-sel.png b/src/assets/images/no-data-sel.png new file mode 100644 index 0000000000000000000000000000000000000000..96c7ad8e1d2229a634ef3506343420b616a61703 GIT binary patch literal 8416 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 L`iKfu`{@4zGTQ+z literal 0 HcmV?d00001 diff --git a/src/config/character.config.js b/src/config/character.config.js index 581506a..f4d9e3a 100644 --- a/src/config/character.config.js +++ b/src/config/character.config.js @@ -295,10 +295,10 @@ export default { // 车场折扣--状态 YardDiscountType: [ { value: "0", label: "全部" }, - { value: "1", label: "进行中" }, - { value: "2", label: "未开始" }, - { value: "3", label: "已下架" }, - { value: "4", label: "已结束" }, + { value: "1", label: "未开始" }, + { value: "2", label: "进行中" }, + { value: "3", label: "已结束" }, + { value: "4", label: "已下架" }, ], PayDevice:[ { diff --git a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx index 365642c..63e0913 100644 --- a/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx +++ b/src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx @@ -446,8 +446,9 @@ function StartExceptionDeal() { current > moment(formData.end_time)} onChange={(date, time) => { setFormData({ ...formData, start_time: time || null }) @@ -459,8 +460,9 @@ function StartExceptionDeal() { current < moment(formData.start_time)} onChange={(date, time) => { setFormData({ ...formData, end_time: time || null }) diff --git a/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx b/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx index 9b70707..7528701 100644 --- a/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx +++ b/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx @@ -1,6 +1,8 @@ +import React, { useEffect, useMemo, useRef, useState } from 'react'; import { Select, Spin } from 'antd'; import _ from 'lodash'; -import React, { useEffect, useMemo, useRef, useState } from 'react'; +import noDataImg from "@/assets/images/no-data-sel.png" + /** * @@ -51,7 +53,7 @@ const DebounceSelect = ({ filterOption={false} onSearch={debounceFetcher} showSearch={true} - notFoundContent={fetching ? : null} + notFoundContent={fetching ? : "暂无数据"} {...props} options={options} /> diff --git a/src/pages/OperationCenter/OperationSales/YardDiscount/index.scss b/src/pages/OperationCenter/OperationSales/YardDiscount/index.scss index cc40af5..72ee669 100644 --- a/src/pages/OperationCenter/OperationSales/YardDiscount/index.scss +++ b/src/pages/OperationCenter/OperationSales/YardDiscount/index.scss @@ -197,9 +197,12 @@ $color-primary: var(--color-primary); } } .yard-discount-sel-modal { - .ant-spin { - margin-left: 50%; - transform: translateX(-50%); + // .ant-spin { + // margin-left: 50%; + // transform: translateX(-50%); + // } + .ant-select-item-empty { + text-align: center; } } diff --git a/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx b/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx index 3b4c27d..abfd7f0 100644 --- a/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx @@ -76,21 +76,21 @@ const YardDiscount = () => { render: (text, record, index) => { let content = '--' switch (text) { - case "0": + case 0: content = "全部" break; - case "1": - content = "进行中" - break; - case "2": + case 1: content = "未开始" break; - case "3": - content = "已下架" + case 2: + content = "进行中" break; - case "4": + case 3: content = "已结束" break; + case 4: + content = "已下架" + break; default: break; } @@ -135,18 +135,18 @@ const YardDiscount = () => { > 查看 - {record?.status == 1 ? + {record?.status == 2 ? { $deleteConfirm(record?.id, "下架") }} okText="确认" cancelText="取消">
下架
 : - record?.status == 2 ? + record?.status == 1 ? <>
{ setModalData({ id: record?.id || "", - activity: record?.activity_id?.split() || [], + activity: record?.activity || "", road: record?.road_id?.split() || [], discount: record?.discount || "", start_time: record?.start_time || null, @@ -265,14 +265,14 @@ const YardDiscount = () => { // 新增及编辑 const $addEditSubmit = (data, type) => { - let activity = data?.activity?.length ? data?.activity?.join() : ""; let road = data?.road?.length ? data?.road?.join() : ""; - if(!activity) return message.error("请选择活动名称！"); + console.log(road); + if(!data?.activity) return message.error("请选择活动名称！"); if(!road) return message.error("请选择停车场名称！"); if(!data?.discount) return message.error("请输入折扣！"); if(!data?.start_time) return message.error("请选择开始时间！"); if(!data?.end_time) return message.error("请选择结束时间！"); - let _data = {...data, activity, road}; + let _data = {...data, road}; ajax.handleYardDiscount(_data, type).then((res) => { if (res.status === 20000 || res.status == 0) { message.success(res.message || `${type}成功`); @@ -316,7 +316,7 @@ const YardDiscount = () => { className="form-con" popupClassName="yard-discount-sel-modal" placeholder="请输入活动名称" - ajaxType="2" + ajaxType="4" mode="multiple" allowClear value={formData?.activity || []} @@ -337,7 +337,7 @@ const YardDiscount = () => { popupClassName="yard-discount-sel-modal" placeholder="请输入停车场名称" allowClear - ajaxType="4" + ajaxType="2" mode="multiple" value={formData?.road || []} fetchOptions={$fetchActivityList} @@ -438,24 +438,37 @@ const YardDiscount = () => {
- { - let value = newValue.slice(-1); - setModalData({ - ...modalData, - activity: value - }); - }} - /> + {modalVisible.title == "查看" ? + { + let value = newValue.slice(-1); + setModalData({ + ...modalData, + activity: value + }); + }} + /> : + { + setModalData({ + ...modalData, + activity: e.target?.value || "" + }) + }} + /> + }
@@ -463,18 +476,27 @@ const YardDiscount = () => { className="form-con" popupClassName="yard-discount-sel-modal" placeholder="请输入停车场名称" - ajaxType="4" + ajaxType="2" allowClear mode="multiple" + labelInValue disabled={modalVisible.title == "查看" ? true : false} value={modalData?.road || []} fetchOptions={$fetchActivityList} onChange={(newValue) => { let value = newValue.slice(-1); - setModalData({ - ...modalData, - road: value - }); + if(value?.length) { + setModalData({ + ...modalData, + road: value, + }); + } else { + setModalData({ + ...modalData, + road: [], + }); + } + }} />
@@ -487,7 +509,7 @@ const YardDiscount = () => { disabled={modalVisible.title == "查看" ? true : false} suffix="%" onChange={(e) =>{ - let onlyNumber = /^[1-9]*$/; + let onlyNumber = /^[0-9]*$/; if(!onlyNumber.test(e.target.value) || e.target.value.length > 2) { return message.error("折扣必须填1-99的整数"); }