This commit is contained in:
lyp 2025-05-27 11:35:21 +08:00
parent dea162cb7d
commit ca5c6f4a4d
2 changed files with 107 additions and 71 deletions

View File

@ -302,6 +302,7 @@ export default function AppEdit() {
display: editProcess == 1 ? 'block' : 'none'
}}>
<AppCompany
appOrderId={appOrderId}
companyInfo={companyInfo}
setEditProcess={
(num: number) => {
@ -318,6 +319,7 @@ export default function AppEdit() {
display: editProcess == 2 ? 'block' : 'none'
}}>
<EditAppInfo
appOrderId={appOrderId}
bigClass={bigClass}
systemList={systemList}
smallClass={smallClass}
@ -337,6 +339,7 @@ export default function AppEdit() {
display: editProcess == 3 ? 'block' : 'none'
}}>
<EditAppFiles
appOrderId={appOrderId}
filesInfo={filesInfo}
setEditProcess={
(num: number) => {
@ -353,6 +356,7 @@ export default function AppEdit() {
}
}></EditAppFunction> */}
<AppInfo
appOrderId={appOrderId}
companyInfo={companyInfo}
appInfo={appInfo}
filesInfo={filesInfo}

View File

@ -1,13 +1,14 @@
import { useState, useEffect } from 'react'
import './app-company.css'
import { uploadFileUrl } from '../../../../request/request'
import { Button, Form, Input, message,
import { uploadFileUrl, showImage } from '../../../../request/request'
import {
Button, Form, Input, message,
// Select, DatePicker,
Upload, Image,
// Cascader
} from "antd"
import { LoadingOutlined, } from '@ant-design/icons';
import type { GetProp, UploadProps } from 'antd';
import type { UploadProps } from 'antd';
// import {
// getCityList
// } from '../../../../request/api'
@ -34,13 +35,13 @@ export default function AppCompany(props: any) {
}
return isJpgOrPng && isLt4M;
};
type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
// type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
const [loading, setLoading] = useState(false);
const getBase64 = (img: FileType, callback: (url: string) => void) => {
const reader = new FileReader();
reader.addEventListener('load', () => callback(reader.result as string));
reader.readAsDataURL(img);
};
// const getBase64 = (img: FileType, callback: (url: string) => void) => {
// const reader = new FileReader();
// reader.addEventListener('load', () => callback(reader.result as string));
// reader.readAsDataURL(img);
// };
const [imageUrl, setImageUrl] = useState('');
const handleChange: UploadProps['onChange'] = (info) => {
if (info.file.status === 'uploading') {
@ -49,12 +50,18 @@ export default function AppCompany(props: any) {
}
if (info.file.status === 'done') {
// Get this url from response in real world.
getBase64(info.file.originFileObj as FileType, (url) => {
// getBase64(info.file.originFileObj as FileType, (url) => {
// setLoading(false);
// setImageUrl(url);
// });
// console.log(info.file.response.data.fileId);
setLoading(false);
const fileId = info.file.response.data.fileId;
const url = showImage(fileId, false);
setImageUrl(url);
});
console.log(info);
form.setFieldsValue({
img: fileId,
})
}
if (info.file.status === 'error') {
setLoading(false);
@ -66,21 +73,52 @@ export default function AppCompany(props: any) {
})
}
};
const[textloading, setTextLoading] = useState(false);
const [textImageUrl, setTextImageUrl] = useState('');
const textHandleChange: UploadProps['onChange'] = (info) => {
if (info.file.status === 'uploading') {
setTextLoading(true);
return;
}
if (info.file.status === 'done') {
// Get this url from response in real world.
// getBase64(info.file.originFileObj as FileType, (url) => {
// setLoading(false);
// setImageUrl(url);
// });
// console.log(info.file.response.data.fileId);
setTextLoading(false);
const fileId = info.file.response.data.fileId;
const url = showImage(fileId, false);
setTextImageUrl(url);
form.setFieldsValue({
textImg: fileId,
})
}
if (info.file.status === 'error') {
setTextLoading(false);
// 显示错误提示
message.error(`上传失败`);
//伤处表单name为ing的值
form.setFieldsValue({
textImg: '', // 将值设置为 undefined 以清除错误状态
})
}
};
// 自定义验证规则
const validateUpload = () => {
// const validateUpload = () => {
if (loading) {
return Promise.reject(new Error('文件上传中,请等待上传完成'));
}
if (!imageUrl) {
return Promise.reject(new Error('请上传有效的文件'));
}
return Promise.resolve();
// if (loading) {
// return Promise.reject(new Error('文件上传中,请等待上传完成'));
// }
// if (!imageUrl) {
// return Promise.reject(new Error('请上传有效的文件'));
// }
// return Promise.resolve();
};
// };
const token = sessionStorage.getItem('token')
const submitInfo = (values: any) => {
message.success('提交成功');
@ -95,7 +133,7 @@ export default function AppCompany(props: any) {
const handleSubmit = () => {
// console.log(form);
props.setEditProcess(2);
// props.setEditProcess(2);
// 调用表单实例的 submit 方法
form.submit();
@ -177,9 +215,9 @@ export default function AppCompany(props: any) {
position: 'relative',
}}>
<Form.Item name="img" label="" rules={[
// { required: true, message: '请上传文件' },
{ required: true, message: '请上传文件' },
// 添加自定义验证规则
{ validator: validateUpload }
// { validator: validateUpload }
]}>
<Upload
@ -188,12 +226,9 @@ export default function AppCompany(props: any) {
// defaultFileList={upImgArray}
beforeUpload={beforeUpload}
onChange={handleChange}
onRemove={() => {
// setUpArray([])
// setDisabled(false)
}}
headers={{ 'Auth': `Bearer ${token}` }}
disabled={!!imageUrl}
// disabled={!!imageUrl}
// beforeUpload={beforeUpload}
>
{imageUrl ?
@ -239,6 +274,9 @@ export default function AppCompany(props: any) {
}}
onClick={() => {
setImageUrl('')
form.setFieldsValue({
img: '', // 将值设置为 undefined 以清除错误状态
})
}}
></div>
</div>
@ -247,12 +285,9 @@ export default function AppCompany(props: any) {
<div className='FormInputTitle' style={{
}}><span style={{ color: 'red', }}>*</span>
<a style={{
// background:'pink',
textAlign: 'center',
paddingLeft: 23,
// color: '#4ca8e6',
display: 'block',
// cursor: 'pointer',
}}
onClick={() => {
alert('下载授权书')
@ -260,37 +295,31 @@ export default function AppCompany(props: any) {
></a>
</div>
<div style={{
// background: 'pink',
position: 'relative',
}}>
<Form.Item name="img" label="" rules={[
// { required: true, message: '请上传文件' },
// 添加自定义验证规则
{ validator: validateUpload }
<Form.Item name="textImg" label="" rules={[
{ required: true, message: '请上传文件' },
]}>
<Upload
showUploadList={false}
action={uploadFileUrl()}
// defaultFileList={upImgArray}
beforeUpload={beforeUpload}
onChange={handleChange}
onChange={textHandleChange}
onRemove={() => {
// setUpArray([])
// setDisabled(false)
}}
headers={{ 'Auth': `Bearer ${token}` }}
disabled={!!imageUrl}
// beforeUpload={beforeUpload}
// disabled={!!imageUrl}
>
{imageUrl ?
{textImageUrl ?
<div style={{
height: '150px',
width: '300px',
}}>
<Image src={imageUrl} style={{ width: '300px', height: '150px' }}
<Image src={textImageUrl} style={{ width: '300px', height: '150px' }}
preview={{
mask: '查看', // 设置点击放大时显示的文字
mask: '查看',
}}
/>
@ -302,9 +331,9 @@ export default function AppCompany(props: any) {
borderRadius: '5px',
color: '#929292',
}}
disabled={loading}
disabled={textloading}
>
{loading ? <span><span style={{ marginRight: 5 }}></span><LoadingOutlined /></span> :
{textloading ? <span><span style={{ marginRight: 5 }}></span><LoadingOutlined /></span> :
'点击上传文件'
@ -321,10 +350,13 @@ export default function AppCompany(props: any) {
padding: '5px 10px',
cursor: 'pointer',
color: 'red',
display: imageUrl ? 'block' : 'none',
display: textImageUrl ? 'block' : 'none',
}}
onClick={() => {
setImageUrl('')
setTextImageUrl('')
form.setFieldsValue({
textImg: '', // 将值设置为 undefined 以清除错误状态
})
}}
></div>
</div>