From 26d884921edcf6288053f4147d0fcac06385318d Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 30 Nov 2024 17:54:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractModal/ContractModal.tsx | 81 ++++++++++--------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/src/components/ContractModal/ContractModal.tsx b/src/components/ContractModal/ContractModal.tsx index 10c3f22..d094454 100644 --- a/src/components/ContractModal/ContractModal.tsx +++ b/src/components/ContractModal/ContractModal.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react' -import { post,Axios,get } from "../../util/AjaxUtils.ts"; +import {useState} from 'react' +import {post, Axios, get} from "../../util/AjaxUtils.ts"; import useMessage from "antd/es/message/useMessage"; import { Form, @@ -7,7 +7,8 @@ import { Input, Button } from 'antd'; import ContractText from '../ContractText/ContractText' -import { useDispatch } from 'react-redux' +import {useDispatch} from 'react-redux' + export default function ContractModal(props: any) { const [messageApi, messageApiHolder] = useMessage(); const [modalOpen, setModalOpen] = useState(false) @@ -15,6 +16,7 @@ export default function ContractModal(props: any) { const [name, setName] = useState(''); // 甲方姓名状态 const [phone, setPhone] = useState(''); // 电话状态 const [address, setAddress] = useState(''); // 地址状态 + const [isSaving, setIsSaving] = useState(false); const onFinish = (values: any) => { setName(values.name); setPhone(values.phone); @@ -24,30 +26,33 @@ export default function ContractModal(props: any) { const dispath = useDispatch() const getContractArray = (page: any) => { get({ - messageApi, - url: `/api/contract/management/listpage/self`, - config: { - params: { - page: page, - rows: 10 + messageApi, + url: `/api/contract/management/listpage/self`, + config: { + params: { + page: page, + rows: 10 + } + }, + onSuccess(data: any) { + console.log(data); + dispath({ + type: 'upContractArray', + val: data.data.rows + }) + dispath({ + type: 'upContractTotal', + val: data.data.total + }) + // setContractArray(data.data.rows) + } - }, - onSuccess(data: any) { - console.log(data); - dispath({ - type: 'upContractArray', - val: data.data.rows - }) - dispath({ - type: 'upContractTotal', - val: data.data.total - }) - // setContractArray(data.data.rows) - - } }) - } + } const downContract = () => { + if (isSaving) { + return; + } post({ messageApi, url: `/api/contract/management/save`, @@ -57,23 +62,22 @@ export default function ContractModal(props: any) { firstPartyPhone: phone }, onBefore() { - + setIsSaving(true); }, onSuccess(data) { // console.log(data.data.data); // console.log('成功'); const contractManagementId = data.data.data window.open(`${Axios.defaults?.baseURL}/api/contract/management/download/${contractManagementId}`) - getContractArray(1) + getContractArray(1) setModalOpen(false) props.closeModal() - }, onFinally() { - + setIsSaving(false); } }) - + } return (
@@ -82,8 +86,8 @@ export default function ContractModal(props: any) { name="Form" form={form} onFinish={onFinish} - initialValues={{ softWare: '' }} - style={{ maxWidth: 600, marginTop: 20 }} + initialValues={{softWare: ''}} + style={{maxWidth: 600, marginTop: 20}} >
@@ -93,7 +97,7 @@ export default function ContractModal(props: any) { @@ -119,7 +123,7 @@ export default function ContractModal(props: any) { @@ -170,7 +174,6 @@ export default function ContractModal(props: any) {
-
From 28024505f05a59c19b49576a29f02233285c86ac Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 30 Nov 2024 22:22:39 +0800 Subject: [PATCH 2/2] eslint --- src/components/ContractText/ContractText.tsx | 1 - src/route/Contract/Contract.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ContractText/ContractText.tsx b/src/components/ContractText/ContractText.tsx index 63227af..79214cc 100644 --- a/src/components/ContractText/ContractText.tsx +++ b/src/components/ContractText/ContractText.tsx @@ -1,4 +1,3 @@ -import React from 'react' import './ContractText.css' export default function ContractText(props: any) { const height = window.innerHeight - 200; diff --git a/src/route/Contract/Contract.tsx b/src/route/Contract/Contract.tsx index 4be2a6a..15bee7e 100644 --- a/src/route/Contract/Contract.tsx +++ b/src/route/Contract/Contract.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import { // Table, Pagination, Table,