diff --git a/.env.dev b/.env.dev index 9e9f0da..2799469 100644 --- a/.env.dev +++ b/.env.dev @@ -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_WEBSOCKET_BASE_URL=ws://${VITE_HOST}:7025/copyright # 18634604067 -VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 -# VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74 +# VITE_USERID=80d3365e-0597-4988-979e-18ef1c3ec671 +VITE_USERID=e3e40f95-7a3f-4b53-a1a0-51dd4e881d74 # VITE_CURRENT_THEME=fzkj VITE_CURRENT_THEME=mzw diff --git a/.env.fzkj b/.env.fzkj index 12f6ef3..ffab5b0 100644 --- a/.env.fzkj +++ b/.env.fzkj @@ -4,5 +4,5 @@ VITE_OPERATOR_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} VITE_WEBSOCKET_BASE_URL=/copyright -VITE_USERID='' +VITE_USERID= VITE_CURRENT_THEME=fzkj diff --git a/.env.mzw b/.env.mzw index 5bafbf3..5f3b141 100644 --- a/.env.mzw +++ b/.env.mzw @@ -4,5 +4,5 @@ VITE_OPERATOR_BASE_URL=${VITE_BASE_URL} VITE_OPERATOR_PLUGIN_BASE_URL=${VITE_BASE_URL} VITE_AI_SHOP_BASE_URL=${VITE_BASE_URL} VITE_WEBSOCKET_BASE_URL=/copyright -VITE_USERID='' +VITE_USERID= VITE_CURRENT_THEME=mzw diff --git a/src/components/OrderDetailModal/components/File/File.tsx b/src/components/OrderDetailModal/components/File/File.tsx index cbd72f7..88a2fd8 100644 --- a/src/components/OrderDetailModal/components/File/File.tsx +++ b/src/components/OrderDetailModal/components/File/File.tsx @@ -8,6 +8,7 @@ import useMessage from "antd/es/message/useMessage"; import './File.css' const { TextArea } = Input; export default function File(props: any) { + const [upFileArray, setUpFileArray] = useState([]) // 上传的文件数组 // 自定义验证函数 const validateContentOrFile = (_rule: any, _value: any, callback: (error?: string) => void, form: any) => { const { upCorrectionRemark, upFile } = form.getFieldsValue(); @@ -249,7 +250,7 @@ export default function File(props: any) { render={(_text, record: any) => ( { - console.log(record.correctionId); + // console.log(record.correctionId); setCorrectionId(record.correctionId) getSupplementDetail(record.correctionId) setIsModalVisible(true) @@ -353,7 +354,7 @@ export default function File(props: any) { onFinish={(value) => { - console.log(value); + // console.log(value); // if (value.upFile && Array.isArray(value.upFile.fileList)) { // const uids = value.upFile.fileList.map((file: any) => file.uid); // const uidString = uids.join(','); @@ -361,14 +362,23 @@ export default function File(props: any) { // // 你可以在这里继续处理 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); + // 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({ correctionFiles: uids, correctionRemark: value.upCorrectionRemark, }) + }} onFinishFailed={() => { @@ -427,7 +437,13 @@ export default function File(props: any) { { + setUpFileArray(info.fileList) + // console.log(info.fileList); + + }} + headers={{ 'Auth': `Bearer ${token}` }} > diff --git a/src/route/TradingGoods/TradingGoods.tsx b/src/route/TradingGoods/TradingGoods.tsx index e2f1d6c..103ff01 100644 --- a/src/route/TradingGoods/TradingGoods.tsx +++ b/src/route/TradingGoods/TradingGoods.tsx @@ -354,7 +354,7 @@ export default function TradingGoods() {
0 ? 'unset' : 'none', + display: record.waitCorrectionCount > 0 && record.orderStatus != '4' ? 'unset' : 'none', position: 'relative', // color: 'black' }} diff --git a/src/route/TransactionOrder/TransactionOrder.tsx b/src/route/TransactionOrder/TransactionOrder.tsx index 34d3e12..f5ceafb 100644 --- a/src/route/TransactionOrder/TransactionOrder.tsx +++ b/src/route/TransactionOrder/TransactionOrder.tsx @@ -9,7 +9,7 @@ import { Spin } from 'antd'; 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 type { TableColumnsType } from 'antd'; // import { SearchOutlined, ClearOutlined } from '@ant-design/icons'; @@ -196,12 +196,12 @@ export default function TransactionOrder() {
0 ? 'unset' : 'none', + display: record.waitCorrectionCount > 0 && record.orderStatus != '4' ? 'unset' : 'none', position: 'relative', // color: 'black' }} onClick={() => { - // console.log(record.orderId); + // console.log(record); setOrderId(record.orderId) setFileModal(true)