Tenlion/system-copyright-react
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
lyp 2025-05-23 16:59:29 +08:00
parent 7f5f5ad273
commit d2c09876b0
6 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dev
View File

@ -6,7 +6,7 @@ VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}:8099
VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081 VITE_AI_SHOP_BASE_URL=http://192.168.0.115:8081
VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright VITE_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright
# 18634604067 # 18634604067
VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 # VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671
# VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74 VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74
# VITE_CURRENT_THEME=fzkj # VITE_CURRENT_THEME=fzkj
VITE_CURRENT_THEME=mzw VITE_CURRENT_THEME=mzw

2
.env.fzkj
View File

@ -4,5 +4,5 @@ VITE_OPERATOR_BASE_URL=${VITE_BASE_URL}
VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}
VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL}
VITE_WEBSOCKET_BASE_URL=/copyright VITE_WEBSOCKET_BASE_URL=/copyright
VITE_USERID='' VITE_USERID=
VITE_CURRENT_THEME=fzkj VITE_CURRENT_THEME=fzkj

2
.env.mzw
View File

@ -4,5 +4,5 @@ VITE_OPERATOR_BASE_URL=${VITE_BASE_URL}
VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL}
VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL}
VITE_WEBSOCKET_BASE_URL=/copyright VITE_WEBSOCKET_BASE_URL=/copyright
VITE_USERID='' VITE_USERID=
VITE_CURRENT_THEME=mzw VITE_CURRENT_THEME=mzw

24
src/components/OrderDetailModal/components/File/File.tsx
View File

@ -8,6 +8,7 @@ import useMessage from "antd/es/message/useMessage";
import './File.css' import './File.css'
const { TextArea } = Input; const { TextArea } = Input;
export default function File(props: any) { export default function File(props: any) {
const [upFileArray, setUpFileArray] = useState<any>([]) // 上传的文件数组
// 自定义验证函数 // 自定义验证函数
const validateContentOrFile = (_rule: any, _value: any, callback: (error?: string) => void, form: any) => { const validateContentOrFile = (_rule: any, _value: any, callback: (error?: string) => void, form: any) => {
const { upCorrectionRemark, upFile } = form.getFieldsValue(); const { upCorrectionRemark, upFile } = form.getFieldsValue();
@ -249,7 +250,7 @@ export default function File(props: any) {
render={(_text, record: any) => ( render={(_text, record: any) => (
<Space size="middle"> <Space size="middle">
<span className='transaction-order-table-btn' onClick={() => { <span className='transaction-order-table-btn' onClick={() => {
console.log(record.correctionId); // console.log(record.correctionId);
setCorrectionId(record.correctionId) setCorrectionId(record.correctionId)
getSupplementDetail(record.correctionId) getSupplementDetail(record.correctionId)
setIsModalVisible(true) setIsModalVisible(true)
@ -353,7 +354,7 @@ export default function File(props: any) {
onFinish={(value) => { onFinish={(value) => {
console.log(value); // console.log(value);
// if (value.upFile && Array.isArray(value.upFile.fileList)) { // if (value.upFile && Array.isArray(value.upFile.fileList)) {
// const uids = value.upFile.fileList.map((file: any) => file.uid); // const uids = value.upFile.fileList.map((file: any) => file.uid);
// const uidString = uids.join(','); // const uidString = uids.join(',');
@ -361,14 +362,23 @@ export default function File(props: any) {
// // 你可以在这里继续处理 uid 字符串，比如发送请求等 // // 你可以在这里继续处理 uid 字符串，比如发送请求等
// } // }
const uids = value.upFile ? (value.upFile.fileList.map((file: any) => file.uid)).join(',') : ''; // const uids = value.upFile ? (value.upFile.fileList.map((file: any) => file.uid)).join(',') : '';
// console.log('提取的 uid 字符串:', uids); // console.log('提取的 uid 字符串:', uids);
// submitData({
// correctionFiles: uids,
// correctionRemark: value.upCorrectionRemark,
// })
// console.log(upFileArray);
// 将upFileArray 数组周末和每项的response里的data 里的 fileId 拼接成一个字符串，用逗号隔开
const uids = upFileArray.map((file: any) => file.response.data.fileId).join(',');
// console.log('提取的 uid 字符串:', uids);
submitData({ submitData({
correctionFiles: uids, correctionFiles: uids,
correctionRemark: value.upCorrectionRemark, correctionRemark: value.upCorrectionRemark,
}) })
}} }}
onFinishFailed={() => { onFinishFailed={() => {
@ -427,7 +437,13 @@ export default function File(props: any) {
<Upload <Upload
name="file" name="file"
action={uploadFileUrl()} action={uploadFileUrl()}
defaultFileList={upFileArray}
onChange={(info) => {
setUpFileArray(info.fileList)
// console.log(info.fileList);
}}
headers={{ 'Auth': `Bearer ${token}` }} headers={{ 'Auth': `Bearer ${token}` }}
> >

2
src/route/TradingGoods/TradingGoods.tsx
View File

@ -354,7 +354,7 @@ export default function TradingGoods() {
<div className='trading-goods-table-btn' <div className='trading-goods-table-btn'
style={{ style={{
// background: 'pink', // background: 'pink',
display: record.waitCorrectionCount > 0 ? 'unset' : 'none', display: record.waitCorrectionCount > 0 && record.orderStatus != '4' ? 'unset' : 'none',
position: 'relative', position: 'relative',
// color: 'black' // color: 'black'
}} }}

6
src/route/TransactionOrder/TransactionOrder.tsx
View File

@ -9,7 +9,7 @@ import {
Spin Spin
} from 'antd'; } from 'antd';
import dayjs, { } from 'dayjs'; import dayjs, { } from 'dayjs';
import { getSellOrderList ,cancelOrder} from '../../request/api' import { getSellOrderList, cancelOrder } from '../../request/api'
import File from '../../components/OrderDetailModal/components/File/File' import File from '../../components/OrderDetailModal/components/File/File'
// import type { TableColumnsType } from 'antd'; // import type { TableColumnsType } from 'antd';
// import { SearchOutlined, ClearOutlined } from '@ant-design/icons'; // import { SearchOutlined, ClearOutlined } from '@ant-design/icons';
@ -196,12 +196,12 @@ export default function TransactionOrder() {
<div className='transaction-order-table-btn' <div className='transaction-order-table-btn'
style={{ style={{
// background: 'pink', // background: 'pink',
display: record.waitCorrectionCount > 0 ? 'unset' : 'none', display: record.waitCorrectionCount > 0 && record.orderStatus != '4' ? 'unset' : 'none',
position: 'relative', position: 'relative',
// color: 'black' // color: 'black'
}} }}
onClick={() => { onClick={() => {
// console.log(record.orderId); // console.log(record);
setOrderId(record.orderId) setOrderId(record.orderId)
setFileModal(true) setFileModal(true)