diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx index d9fd543..c2b8e91 100644 --- a/src/route/proj/ProjNew.tsx +++ b/src/route/proj/ProjNew.tsx @@ -2,7 +2,7 @@ import './proj-new.css'; import { useNavigate, useParams, useSearchParams } from "react-router-dom"; import { Table, AutoComplete, Button, Flex, Form, Input, message, Modal, Spin, Checkbox, DatePicker, Select } from "antd"; import { useContext, useEffect, useState, useRef } from "react"; -import { useLocation } from 'react-router-dom'; +// import { useLocation } from 'react-router-dom'; import { get, post } from "../../util/AjaxUtils.ts"; // import {GlobalContext} from "../../context/GlobalContext.ts"; import { @@ -130,9 +130,9 @@ export default function ProjNew() { } const [packList, setPackList] = useState([]) //服务包列表 - const location = useLocation(); + // const location = useLocation(); // const { price } = location.state || {}; - const [showPrice, setShowPrice] = useState(location.state.price) //显示的价格 + // const [showPrice, setShowPrice] = useState(location.state.price) //显示的价格 const [selectPack, setSelectPack] = useState(false) //是否选择了服务器套餐 // 是否显示优惠券 const [couponShow, setcouponShow] = useState(true) @@ -195,8 +195,8 @@ export default function ProjNew() { const [total, setTotal] = useState(0) const [nowPackageName, setNowPackageName] = useState('') //临时选择名字 - const [nowpackageInfoId, setNowpackageInfoId] = useState('') //临时选择包id - const [packageInfoId, setPackageInfoId] = useState('') //确定选择包id + // const [nowpackageInfoId, setNowpackageInfoId] = useState('') //临时选择包id + // const [packageInfoId, setPackageInfoId] = useState('') //确定选择包id const [nowpackageOrderId, setNowpackageOrderId] = useState('') //临时选择订单id const [packageOrderId, setPackageOrderId] = useState('') //确定选择订单id const [selectedRowKeys, setSelectedRowKeys] = useState([packageOrderId]); //被选择的而项目 @@ -205,7 +205,7 @@ export default function ProjNew() { onChange: (selectedRowKeys: React.Key[], selectedRows: DataType[]) => { setSelectedRowKeys(selectedRowKeys); setNowPackageName(selectedRows[0].packageName) - setNowpackageInfoId(selectedRows[0].packageInfoId) + // setNowpackageInfoId(selectedRows[0].packageInfoId) setNowpackageOrderId(selectedRows[0].packageOrderId) }, @@ -712,7 +712,7 @@ export default function ProjNew() { }}>选择
{ - setPackageInfoId('') + // setPackageInfoId('') setPackageOrderId('') form.setFieldsValue({ packageName: '' @@ -720,7 +720,7 @@ export default function ProjNew() { setSelectPack(false) // setcouponShow(true) setcouponShow(true) - setShowPrice(location.state.price) + // setShowPrice(location.state.price) }}>取消
@@ -898,8 +898,8 @@ export default function ProjNew() { color: 'red', }} > - {(showPrice / 100 - couponNum) < 0 ? 0 : showPrice / 100 - couponNum} - + {/* {(showPrice / 100 - couponNum) < 0 ? 0 : showPrice / 100 - couponNum} */} + {selectPack ? 0 : (chargePrice / 100 - couponNum) < 0 ? 0 : chargePrice / 100 - couponNum} 元
{ setPackModal(false) setNowPackageName('') - setNowpackageInfoId('') + // setNowpackageInfoId('') setNowpackageOrderId('') }}> @@ -1161,7 +1161,7 @@ export default function ProjNew() { // setPackSelectNo(record.packageInfoId) setSelectedRowKeys([record.packageOrderId]); setNowPackageName(record.packageName) - setNowpackageInfoId(record.packageInfoId) + // setNowpackageInfoId(record.packageInfoId) setNowpackageOrderId(record.packageOrderId) }, style: { cursor: 'pointer' } // 鼠标显示为小手 @@ -1176,7 +1176,7 @@ export default function ProjNew() {