From 23dd4dbe4ee01cfa3ee9c94f1384356914a23606 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Fri, 15 May 2026 13:28:19 +0800 Subject: [PATCH] xx --- .../SystemSetting/SerialNumGenerate.jsx | 138 ++++++++++++------ 1 file changed, 96 insertions(+), 42 deletions(-) diff --git a/src/components/SystemSetting/SerialNumGenerate.jsx b/src/components/SystemSetting/SerialNumGenerate.jsx index 3104123..2a9e423 100644 --- a/src/components/SystemSetting/SerialNumGenerate.jsx +++ b/src/components/SystemSetting/SerialNumGenerate.jsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Form, Select, Button, Space, message, Card, Typography, - Row, Col, Modal, Input, Table, Popconfirm, Tag + Row, Col, Modal, Input, Table, Popconfirm, Checkbox } from 'antd'; import QRCode from 'qrcode'; import DictManager from "../DictManager"; @@ -47,13 +47,11 @@ const SerialNumGenerate = () => { const [serialNumber, setSerialNumber] = useState(''); const [qrJson, setQrJson] = useState(''); const [loading, setLoading] = useState(false); - const qrRef = useRef(null); // 查询 - const [queryCode, setQueryCode] = useState(''); const [queryLoading, setQueryLoading] = useState(false); - // 数据管理弹窗 + // 弹窗 const [manageVisible, setManageVisible] = useState(false); const [addModalVisible, setAddModalVisible] = useState(false); @@ -62,13 +60,16 @@ const SerialNumGenerate = () => { const [models, setModels] = useState([]); const [configs, setConfigs] = useState([]); - // 二维码列表数据 + // 二维码列表 const [codeList, setCodeList] = useState([]); const [codeLoading, setCodeLoading] = useState(false); const [currentPage, setCurrentPage] = useState(1); const [pageSize] = useState(10); const [total, setTotal] = useState(0); + // 多选删除 + const [selectedRowKeys, setSelectedRowKeys] = useState([]); + // 查看二维码弹窗 const [viewModal, setViewModal] = useState(false); const [viewRecord, setViewRecord] = useState(null); @@ -77,6 +78,16 @@ const SerialNumGenerate = () => { const countryNameMap = useRef({}); const provinceNameMap = useRef({}); + // 工具方法:解析 qrJson + const parseQrJson = (qrJson) => { + if (!qrJson) return {}; + try { + return JSON.parse(qrJson); + } catch { + return {}; + } + }; + // 初始化 useEffect(() => { const countries = Country.getAllCountries(); @@ -88,15 +99,12 @@ const SerialNumGenerate = () => { loadModelList(); loadConfigList(); loadCodeList(); - }, []); + }, [currentPage]); // 国家切换 const handleCountryChange = (countryCode) => { const states = State.getStatesOfCountry(countryCode); setProvinces(states || []); - states.forEach(item => { - provinceNameMap.current[item.isoCode] = item.name; - }); form.setFieldsValue({ province: undefined }); }; @@ -110,6 +118,7 @@ const SerialNumGenerate = () => { const rows = res.data.records || res.data || []; setCodeList(rows); setTotal(res.data.total || rows.length); + setSelectedRowKeys([]); } } catch (e) { } finally { @@ -128,6 +137,21 @@ const SerialNumGenerate = () => { } }; + // 批量删除 + const handleBatchDelete = async () => { + if (selectedRowKeys.length === 0) { + message.warning('请选择要删除的数据'); + return; + } + try { + await delteCodesApi(selectedRowKeys.join(',')); + messageApi.success('批量删除成功'); + loadCodeList(); + } catch (e) { + messageApi.error('批量删除失败'); + } + }; + // 查看 const handleView = (record) => { setViewRecord(record); @@ -221,7 +245,7 @@ const SerialNumGenerate = () => { modelId: model?.id, configId: config?.id, typeId: type?.id, - qrCodeUrl: qrUrl, + qrCode: qrUrl, qrJson: qrJson }; @@ -246,22 +270,19 @@ const SerialNumGenerate = () => { // 查询 const handleQueryQRCode = async () => { - if (!queryCode) return messageApi.warning('请输入序列号'); + // 从搜索表单中获取序列号 + const serialNumber = searchForm.getFieldValue('serialNumber'); + + if (!serialNumber) { + loadCodeList(); + return; + } setQueryLoading(true); try { - const res = await getCodeImgApi(queryCode); + const res = await getCodeImgApi(serialNumber); if (res.data) { - setSerialNumber(res.data.serialNumber); - setQrUrl(res.data.qrCode); - setQrJson(res.data.qrJson); - form.setFieldsValue({ - model: res.data.model, - config: res.data.config, - type: res.data.type, - country: res.data.country, - province: res.data.province - }); - messageApi.success('查询成功'); + + setCodeList([res.data]); } else { messageApi.warning('未查询到数据'); } @@ -294,29 +315,48 @@ const SerialNumGenerate = () => { // 表格列 const columns = [ - { title: 'ID', dataIndex: 'id', key: 'id', width: 70 }, + { + title: '序号', + key: 'idx', + width: 70, + render: (_, __, index) => (currentPage - 1) * pageSize + index + 1 + }, { title: '序列号', width: 380, dataIndex: 'serialNumber', key: 'sn', ellipsis: true }, { title: '型号', key: 'model', - render: (_, r) => models.find(m => m.id === r.modelId)?.modelName || '-' + render: (_, r) => parseQrJson(r.qrJson).model || '-' }, { title: '配置', key: 'config', - render: (_, r) => configs.find(c => c.id === r.configId)?.configName || '-' + render: (_, r) => parseQrJson(r.qrJson).config || '-' + }, + { + title: '类型', + key: 'type', + render: (_, r) => parseQrJson(r.qrJson).type || '-' + }, + { + title: '国家', + key: 'country', + render: (_, r) => parseQrJson(r.qrJson).countryFullName || '-' + }, + { + title: '省份', + key: 'province', + render: (_, r) => parseQrJson(r.qrJson).provinceFullName || '-' }, { title: '二维码', key: 'img', width: 100, - render: (_, r) => r.qrCodeUrl && qrcode + render: (_, r) => r.qrCodeBase64 && qrcode }, { title: '操作', key: 'opt', width: 180, - fixed: "right", render: (_, r) => ( @@ -331,27 +371,38 @@ const SerialNumGenerate = () => { } ]; + // 多选配置 + const rowSelection = { + selectedRowKeys, + onChange: setSelectedRowKeys + }; + return (
{contextHolder} - + + + + - }> + } + > {/* 筛选栏 */}
- + - - + + @@ -363,15 +414,18 @@ const SerialNumGenerate = () => { columns={columns} dataSource={codeList} loading={codeLoading} + rowSelection={rowSelection} pagination={{ current: currentPage, pageSize, total, onChange: setCurrentPage }} + style={{ width: '100%' }} /> - {/* 新增弹窗 = 原来的生成二维码页面 */} + {/* 新增弹窗 */} { setAddModalVisible(false); form.resetFields(); @@ -382,7 +436,7 @@ const SerialNumGenerate = () => { destroyOnClose > - +