diff --git a/package.json b/package.json index b3cd83f..5b4be3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.18", + "version": "4.5.21", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/pages/travelMember/HomepageAds/index.tsx b/src/pages/travelMember/HomepageAds/index.tsx index 9e991d6..d1eb9ae 100644 --- a/src/pages/travelMember/HomepageAds/index.tsx +++ b/src/pages/travelMember/HomepageAds/index.tsx @@ -1,5 +1,4 @@ // 首页广告 -// 地址管理 import React, { useRef, useState, Suspense, useEffect } from 'react'; import moment from 'moment'; // 时间相关引用,没有使用可以删除 import numeral from "numeral"; // 数字相关引用,没有使用可以删除 @@ -41,6 +40,7 @@ const beforeUpload = (file: any) => { const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => { const { currentUser } = props + const { confirm } = Modal; const actionRef = useRef(); const formRef = useRef(); const [currentRow, setCurrentRow] = useState(); @@ -350,6 +350,7 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props) = (props) disabled={disabled} bounds={bounds} onStart={(event, uiData) => onDraggaleStart(event, uiData)} + handle={'.HomepageAds'} >
{modal}
@@ -503,6 +505,17 @@ const HomepageAds: React.FC<{ currentUser: CurrentUser | undefined }> = (props) } else { message.error("您上传的图片不存在.") } + }, + onChange: async (info: any) => { + if (info.file.status === 'removed') { + confirm({ + title: '确认删除该图片吗?', + icon: , + async onOk() { + setFileList([]) + } + }); + } } }} /> diff --git a/src/pages/travelMember/LostandFoundAPPliance/index.tsx b/src/pages/travelMember/LostandFoundAPPliance/index.tsx index f72a888..6204250 100644 --- a/src/pages/travelMember/LostandFoundAPPliance/index.tsx +++ b/src/pages/travelMember/LostandFoundAPPliance/index.tsx @@ -1,3 +1,4 @@ +// 失物招领申请 import { connect } from "umi"; import type { CurrentUser } from "umi"; import type { ConnectState } from "@/models/connect"; @@ -49,8 +50,6 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => // 显示新增窗口 const [showAddModal, setShowAddModal] = useState(false) - - // 树相关的属性和方法 const [selectedId, setSelectedId] = useState() // 导出的加载效果 @@ -162,6 +161,7 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => align: 'center', valueType: 'select', valueEnum: { + "1": "审核通过", "2": "审核中", "9": "已驳回" }, @@ -216,7 +216,6 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => // } ] - // 悬浮框的关闭事件 const handleModalClose = () => { setConfirmLoading(false) @@ -302,6 +301,8 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => const handleChangePreview = (val: any) => { setImagePreviewVisible(val) } + + return (
{ // 打印报表 @@ -350,7 +351,7 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => SearchParameter: { SUGGESTION_TYPES: 4000, SERVERPART_IDS: selectedId, - SUGGESTION_STATES: "2,9", + SUGGESTION_STATES: "1,2,9", ENUM_LABEL: params?.ENUM_LABEL || '' }, PageIndex: 1, @@ -403,6 +404,23 @@ const LostandFoundAPPliance: React.FC<{ currentUser: CurrentUser }> = (props) => onCancel={() => { handleModalClose() }} + footer={currentRow?.SUGGESTION_ID ? false : +
+
+
+ + +
+
+ } okText={"发起申请"} onOk={async () => { // 提交框内的数据 modalRef.current?.validateFields().then(async (res: any) => { diff --git a/src/pages/travelMember/memberInfor/component/memberDetail.tsx b/src/pages/travelMember/memberInfor/component/memberDetail.tsx index 0cc0a70..00b0a4a 100644 --- a/src/pages/travelMember/memberInfor/component/memberDetail.tsx +++ b/src/pages/travelMember/memberInfor/component/memberDetail.tsx @@ -465,7 +465,7 @@ const MemberDetail = ({ showDetailDrawer, currentRow, handleCloseModal, currentU style={{ width: '150px' }} value={selectUserLabel} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} - placeholder="Please select" + placeholder="请选择会员标签" allowClear treeDefaultExpandAll onChange={(e: any) => { diff --git a/src/versionEnv.ts b/src/versionEnv.ts index 94274cf..3aeb0f9 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.18"; -export const GIT_HASH = "a07144f"; -export const BUILD_TIME = "2025-08-06T11:01:18.410Z"; +export const VERSION = "4.5.21"; +export const GIT_HASH = "c1f19fd"; +export const BUILD_TIME = "2025-08-08T10:13:54.850Z";