diff --git a/src/request/api.ts b/src/request/api.ts index 52298e5..662ca32 100644 --- a/src/request/api.ts +++ b/src/request/api.ts @@ -197,7 +197,12 @@ export const addTrademarkApplicant = (params:any) => aiShopRequest.post(`/aishop export const trademarkApplicantList = (params:any) => aiShopRequest.get(`/aishop/api/trademarkuser/listpage`,{params}) // 删除商标申请人 export const deleteTrademarkApplicant = (trademarkUserId:any) => aiShopRequest.delete(`/aishop/api/trademarkuser/remove/${trademarkUserId}`) - +// 获取申请人详情 +export const trademarkApplicantDetails = (trademarkUserId:any) => aiShopRequest.get(`/aishop/api/trademarkuser/get/${trademarkUserId}`) +// 修改申请人信息 +export const updateTrademarkApplicant = (trademarkUserId:any,params:any) => aiShopRequest.put(`/aishop/api/trademarkuser/update/${trademarkUserId}`,params) +// 提交申请人 +export const submitTrademarkApplicant = (trademarkId:any,params:any) => aiShopRequest.post(`/aishop/api/trademark/save3/${trademarkId}`,params) // ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/src/route/TrademarkMall/TrademarkAiEdit.tsx b/src/route/TrademarkMall/TrademarkAiEdit.tsx index a253386..332b949 100644 --- a/src/route/TrademarkMall/TrademarkAiEdit.tsx +++ b/src/route/TrademarkMall/TrademarkAiEdit.tsx @@ -41,6 +41,13 @@ export default function TrademarkAiEdit() { trademarkTypeDTOS: [], trademarkTypeIds: [] }) + const [editThreeData, setEditThreeData] = useState({ + trademarkUserId: '', + name:'' + }) + useEffect(()=>{ + + },[]) // const [trademarkId, setTrademarkId] = useState(state.trademarkId?state.trademarkId:''); const [loading, setLoading] = useState(false) const getTrademarkDetail = async (trademarkId: string) => { @@ -66,6 +73,10 @@ export default function TrademarkAiEdit() { trademarkTypeDTOS: res.trademarkTypeDTOS, trademarkTypeIds: res.trademarkTypeIds }) + setEditThreeData({ + trademarkUserId: res.trademarkUserDTO.trademarkUserId, + name: res.trademarkUserDTO.name + }) } catch (error: any) { setLoading(false) diff --git a/src/route/TrademarkMall/TrademarkMall.tsx b/src/route/TrademarkMall/TrademarkMall.tsx index 75a372e..37b6120 100644 --- a/src/route/TrademarkMall/TrademarkMall.tsx +++ b/src/route/TrademarkMall/TrademarkMall.tsx @@ -107,30 +107,46 @@ export default function TrademarkMall() { ) }, - { - title: '申请人', - dataIndex: 'leaderName', - align: 'center', - key: 'appOrderId', - width: 150, - render: (text) => ( - - {text ? text : '未完善'} - - ) - }, - { - title: '申请人证件号', - dataIndex: 'leaderIdcard', - align: 'center', - key: 'appOrderId', - width: 150, - render: (text) => ( - - {text ? text : '未完善'} - - ) - }, + // { + // title: '申请人', + // // 使用数组形式访问嵌套对象属性 + // dataIndex: ['trademarkUserDTO', 'name'], + // align: 'center', + // // 修改 key 保证唯一性 + // key: 'trademarkUserDTOName', + // width: 150, + // render: (text) => ( + // + // {text || '-'} + // + // ) + // }, + // // { + // // title: '申请人证件号', + // // dataIndex: ['trademarkUserDTO', 'name'], + // // align: 'center', + // // key: 'appOrderId', + // // width: 150, + // // render: (text) => ( + // // + // // {text ? text : '未完善'} + // // + // // ) + // // }, + // { + // title: '联系人', + // // 使用数组形式访问嵌套对象属性 + // dataIndex: ['trademarkUserDTO', 'contactName'], + // align: 'center', + // // 修改 key 保证唯一性 + // key: 'trademarkUserDTOContactName', + // width: 150, + // render: (text) => ( + // + // {text || '-'} + // + // ) + // }, { title: '操作', // dataIndex: 'contractManagementId', diff --git a/src/route/TrademarkMall/components/EditThree/EditThree.tsx b/src/route/TrademarkMall/components/EditThree/EditThree.tsx index 5ab5f4d..5fdbacd 100644 --- a/src/route/TrademarkMall/components/EditThree/EditThree.tsx +++ b/src/route/TrademarkMall/components/EditThree/EditThree.tsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react' import { Button, Form, Input, message, Modal, Radio, Upload, Image, Spin, Cascader, Table } from "antd" import type { TableColumnsType } from 'antd'; import { uploadImageUrl, showImage } from '../../../../request/request' -import { addTrademarkApplicant, trademarkApplicantList, deleteTrademarkApplicant } from '../../../../request/api' +import { addTrademarkApplicant, trademarkApplicantList, deleteTrademarkApplicant, trademarkApplicantDetails, updateTrademarkApplicant, submitTrademarkApplicant } from '../../../../request/api' import { PlusOutlined } from '@ant-design/icons'; @@ -27,15 +27,130 @@ import useMessage from "antd/es/message/useMessage"; // address: string; // trademarkUserId: string; // } +const { Search } = Input; export default function EditThree(props: any) { // 申请人信息 - const [applicantData, setApplicantData] = useState({ - name: '', - trademarkUserId: '', - }) + // const [applicantData, setApplicantData] = useState({ + // name: '', + // trademarkUserId: '', + // }) + // 获取联系人详情 + const getContactDetails = async (trademarkUserId: string) => { + try { + const res: any = await trademarkApplicantDetails(trademarkUserId) + console.log(res); + if (res.type == '1') { + setApplicantType('1') + setQualifications(res.subType) + setPersonalIdCard([ + { + uid: res.identityPhoto, + name: res.identityPhoto, + status: 'done', + url: showImage(res.identityPhoto, false) + } + ]) + setPersonalLicense([ + { + uid: res.businessLicense, + name: res.businessLicense, + status: 'done', + url: showImage(res.businessLicense, false) + } + ]) + // console.log(res.rangeAddress.split(',')[0]); + const rangeAddressArray = res.rangeAddress.split(','); + // 检查省份 ID 是否存在 + if (rangeAddressArray.length > 0) { + const provinceId = rangeAddressArray[0]; + const provinceOption = areaArray.find(option => option.value === provinceId); + if (provinceOption) { + // 加载该省份下的城市 + loadCityList([provinceOption]); + } + } + // getLoadProvinces(res.rangeAddress.split(',')[0]) + // 给formA表单赋值 + formA.setFieldsValue({ + identityPhoto: res.identityPhoto, + identity: res.identity, + businessLicense: res.businessLicense, + businessLicenseIdcard: res.businessLicenseIdcard, + name: res.name, + rangeAddress: res.rangeAddress.split(','), + address: res.address, + contactName: res.contactName, + contactPhone: res.contactPhone, + contactEmail: res.contactEmail, + contactAddress: res.contactAddress, + contactEmailCode: res.contactEmailCode, + }) + + } + if (res.type == '2') { + setApplicantType('2') + setEnterpriseLicense([ + { + uid: res.businessLicense, + name: res.businessLicense, + status: 'done', + url: showImage(res.businessLicense, false) + } + ]) + const rangeAddressArray = res.rangeAddress.split(','); + // 检查省份 ID 是否存在 + if (rangeAddressArray.length > 0) { + const provinceId = rangeAddressArray[0]; + const provinceOption = areaArray.find(option => option.value === provinceId); + if (provinceOption) { + // 加载该省份下的城市 + loadCityList([provinceOption]); + } + } + formB.setFieldsValue({ + // identityPhoto: res.identityPhoto, + // identity: res.identity, + businessLicense: res.businessLicense, + name: res.name, + businessLicenseIdcard: res.businessLicenseIdcard, + rangeAddress: res.rangeAddress.split(','), + address: res.address, + contactName: res.contactName, + contactPhone: res.contactPhone, + contactEmail: res.contactEmail, + contactAddress: res.contactAddress, + contactEmailCode: res.contactEmailCode, + }) + + } + } catch (error: any) { + // setAddLoading(false) + if (error.response) { + const data = error.response.data; + messageApi.open({ + type: 'error', + content: data.msg ? data.msg : `${data.path}(${data.status})`, + }); + } else { + console.error(error) + } + } finally { + // setAddLoading(false) + } + } const [trademarkUserId, setTrademarkUserId] = useState('') const [selectPeopleModal, setSelectPeopleModal] = useState(false) - const [selectedRowKey, setSelectedRowKey] = useState('2'); + const [selectedRowKey, setSelectedRowKey] = useState(''); + // 临时选择的申请人信息 + const [nowSelectPeopleData, setNowSelectPeopleData] = useState({ + trademarkUserId: '', + name: '', + }); + // 确定选择的申请人信息 + const [confirmSelectPeopleData, setConfirmSelectPeopleData] = useState({ + trademarkUserId: '', + name: '', + }); const [disabled, setDisabled] = useState(false) const [showBtn, setShowBtn] = useState(true) const columns: TableColumnsType = [ @@ -99,12 +214,13 @@ export default function EditThree(props: any) { setDisabled(false) setAddPeopleModal(true) setShowBtn(true) - + getContactDetails(record.trademarkUserId) }}>编辑 - - - { - if (applicantType == '1') { - formA.submit() - } - if (applicantType == '2') { - formB.submit() - } - }} - okText='保存' - cancelText='取消' - // 点击遮罩禁止关闭 - maskClosable={false} - onCancel={() => { - setAddPeopleModal(false) - init() + +
+ {contextHolder} +
+
- - -
-
-
申请人信息
-
+
+
+ 选择申请人*： +
+
-
- *申请人类型： + +
{ + setPage(1) + setSelectPeopleModal(true) + getTrademarkApplicantList(1) + setNowSelectPeopleData({ + trademarkUserId: '', + name: '', + }) + if (confirmSelectPeopleData.trademarkUserId) { + setSelectedRowKey(confirmSelectPeopleData.trademarkUserId) + } else { + setSelectedRowKey('') + } + }} + > + 选择
- - 个人/个体工商户 - 企业 - + position: 'absolute', + width: 290, + height: '46px', + top: '0', + right: '0', + // background: 'skyblue', + // textAlign: 'right', + // lineHeight: '42px', + // cursor: 'pointer', + paddingRight: '10px', + color: '#1F79FF', + display: confirmSelectPeopleData.name ? 'unset' : 'none', + }} + // onClick={() => { + // setPage(1) + // setSelectPeopleModal(true) + // getTrademarkApplicantList(1) + // setNowSelectPeopleData({ + // trademarkUserId: '', + // name: '', + // }) + // if (confirmSelectPeopleData.trademarkUserId) { + // setSelectedRowKey(confirmSelectPeopleData.trademarkUserId) + // } else { + // setSelectedRowKey('') + // } + // }} + > +
+ { + setPage(1) + setSelectPeopleModal(true) + getTrademarkApplicantList(1) + setNowSelectPeopleData({ + trademarkUserId: '', + name: '', + }) + if (confirmSelectPeopleData.trademarkUserId) { + setSelectedRowKey(confirmSelectPeopleData.trademarkUserId) + } else { + setSelectedRowKey('') + } + }}>重选 + +
-
- 营业执照类型为(个体工商户)，请选择:(个人/个体工商户) 营业执照类型为(公司企业)，请选择:(企业) -
-
- {/* 申请人提交审核后，不支持修改类型:如需修改，请重新创建申请人 */} -
+
+
{ + setAddPeopleModal(true) + setDisabled(false) + setTrademarkUserId('') + setShowBtn(true) + }}>
+
添加新申请人
+
+
+ +
+
+
+ + +
+ { + if (applicantType == '1') { + formA.submit() + } + if (applicantType == '2') { + formB.submit() + } + }} + okText='保存' + cancelText='取消' + // 点击遮罩禁止关闭 + maskClosable={false} + onCancel={() => { + setAddPeopleModal(false) + init() + + }}> + + +
+
+
申请人信息
- *资质类型： + *申请人类型：
- 个人 - 个体工商户 + 个人/个体工商户 + 企业
-
-
{ - // console.log(errorInfo) - // message.error('请填写完整的信息!') - errorInfo.errorFields.forEach((field) => { - if (field.errors.length > 0) { - // 显示每条错误信息 - message.error(field.errors[0]); - } - }); - }} - initialValues={{ softWare: '' }} - style={{ marginTop: 20 }} - > -
-
- *身份证 - (注 ：身份证正反面复印件并在空白处签名) - -
-
-
- - { - const isPNG = file.type === 'image/png'; - const isJPG = file.type === 'image/jpg' || file.type === 'image/jpeg'; - if (!isPNG && !isJPG) { - // console.error('仅支持 PNG、PDF、JPG 格式的文件!'); - message.error('仅支持 PNG、JPG 格式的文件!'); - } - return isPNG || isJPG; - }} - onChange={personalIdCardChange} - - headers={{ 'Auth': `Bearer ${token}` }} - disabled={personalIdCard.length > 0 || disabled} - > - - { - personalIdCard.length > 0 ? -
-
- - -
-
{ - setPersonalIdCard([]) - formA.setFieldsValue({ identityPhoto: '' }); - }} - >删除
-
- : -
-
-
- -
-
- 上传身份证 -
-
- -
- } - - - - -
-
- -
- 示例图片 -
-
- -
- -
-
-
- - - -
-
- *身份证件号码 -
- -
- - - - - - - -
- - -
-
-
- *个体工商户营业执照 - {/* (注 ：上传图片的尺寸最小为600*600) */} - -
-
-
-
- - { - const isPNG = file.type === 'image/png'; - const isJPG = file.type === 'image/jpg' || file.type === 'image/jpeg'; - if (!isPNG && !isJPG) { - // console.error('仅支持 PNG、PDF、JPG 格式的文件!'); - message.error('仅支持 PNG、JPG 格式的文件!'); - } - return isPNG || isJPG; - }} - onChange={personalLicenseChange} - - headers={{ 'Auth': `Bearer ${token}` }} - disabled={personalLicense.length > 0 || disabled} - > - - { - personalLicense.length > 0 ? -
-
- - -
-
{ - setPersonalLicense([]) - formA.setFieldsValue({ businessLicense: '' }); - }} - >删除
-
- : -
-
-
- -
-
- 上传营业执照 -
-
- -
- } - - - - - -
-
-
- -
- 示例图片 -
-
- -
- -
-
-
-
-
- *统一社会信用代码 -
- -
- - - - - - - -
- - -
-
-
- *申请人名称 -
- -
- - - - - - - -
- - -
- - -
-
- *申请人地址 - (注 ：省/自治区/直辖市请下拉选择，无需重复填写) -
- -
- - - - -
-
-
- - - - - - - -
- - -
- -
联系信息 - (联系信息仅供与您联系，非递交商标局信息。) -
-
-
- *联系人姓名 -
- -
- - - - - - - -
- - -
-
-
- *联系人电话 -
- -
- - - - - - - -
- - -
- -
-
- *联系人邮箱 -
- -
- - - - - - - -
- - -
- -
-
- *联系人地址 -
- -
- - - - - - - -
- - -
- -
-
- *联系人邮编 -
- -
- - - - - - - -
- - -
-
+
+ 营业执照类型为(个体工商户)，请选择:(个人/个体工商户) 营业执照类型为(公司企业)，请选择:(企业) +
+
+ {/* 申请人提交审核后，不支持修改类型:如需修改，请重新创建申请人 */}
-
- - - -
-
-
{ - // console.log(errorInfo) - // message.error('请填写完整的信息!') - errorInfo.errorFields.forEach((field) => { - if (field.errors.length > 0) { - // 显示每条错误信息 - message.error(field.errors[0]); - } - }); - }} - initialValues={{ softWare: '' }} - style={{ marginTop: 20 }} - > - -
+
+ *资质类型： +
+
-
+ 个人 + 个体工商户 + +
+
+
+ { + // console.log(errorInfo) + // message.error('请填写完整的信息!') + errorInfo.errorFields.forEach((field) => { + if (field.errors.length > 0) { + // 显示每条错误信息 + message.error(field.errors[0]); + } + }); + }} + initialValues={{ softWare: '' }} + style={{ marginTop: 20 }} + > +
- *营业执照 - {/* (注 ：上传图片的尺寸最小为600*600) */} - -
-
-
-
+ *身份证 + (注 ：身份证正反面复印件并在空白处签名) + +
+
+
0 || disabled} + disabled={personalIdCard.length > 0 || disabled} > - + { - enterpriseLicense.length > 0 ? + personalIdCard.length > 0 ?
{ - setPersonalLicense([]) - formB.setFieldsValue({ businessLicense: '' }); + setPersonalIdCard([]) + formA.setFieldsValue({ identityPhoto: '' }); }} >删除
@@ -1363,7 +1032,7 @@ export default function EditThree(props: any) {
- 上传营业执照 + 上传身份证
@@ -1373,431 +1042,1076 @@ export default function EditThree(props: any) { - -
-
-
- -
- 示例图片 +
+
+ +
+ 示例图片 +
+
-
-
-
-
- *申请人名称 -
-
- - +
+ *身份证件号码 +
+ +
+ - + + > + + + + + +
- - -
-
-
- *统一社会信用代码 +
+ *个体工商户营业执照 + {/* (注 ：上传图片的尺寸最小为600*600) */} + +
+
+
+
+ + { + const isPNG = file.type === 'image/png'; + const isJPG = file.type === 'image/jpg' || file.type === 'image/jpeg'; + if (!isPNG && !isJPG) { + // console.error('仅支持 PNG、PDF、JPG 格式的文件!'); + message.error('仅支持 PNG、JPG 格式的文件!'); + } + return isPNG || isJPG; + }} + onChange={personalLicenseChange} + + headers={{ 'Auth': `Bearer ${token}` }} + disabled={personalLicense.length > 0 || disabled} + > + + { + personalLicense.length > 0 ? +
+
+ + +
+
{ + setPersonalLicense([]) + formA.setFieldsValue({ businessLicense: '' }); + }} + >删除
+
+ : +
+
+
+ +
+
+ 上传营业执照 +
+
+ +
+ } + + + + + +
+
+
+ +
+ 示例图片 +
+
+ +
+ +
+
+
+
+ *统一社会信用代码 +
-
- + - - + + - + + + +
+ + +
+
+
+ *申请人名称 +
+ +
+ + + + + + + +
-
+
+
+ *申请人地址 + (注 ：省/自治区/直辖市请下拉选择，无需重复填写) +
+ +
+ + + + +
+
+
+ + + + + +
-
-
- *申请人地址 + +
+ +
联系信息 (注 ：省/自治区/直辖市请下拉选择，无需重复填写) + color: '#979797', + marginTop: 10, + fontWeight: 200 + }}>(联系信息仅供与您联系，非递交商标局信息。)
- -
- - - - -
+
-
+ *联系人姓名
- - - - +
+ + + + + + + +
+ + +
+
+
+ *联系人电话 +
+ +
+ + + + + + + +
+
+
+ *联系人邮箱 +
-
+
联系信息 - + + + + + + + +
+ + +
+ +
+
+ *联系人地址 +
+ +
+ + + + + + + +
+ + +
+ +
+
+ *联系人邮编 +
+ +
+ + + + + + + +
+ + +
+ +
+
+ + + +
+ +
+
{ + // console.log(errorInfo) + // message.error('请填写完整的信息!') + errorInfo.errorFields.forEach((field) => { + if (field.errors.length > 0) { + // 显示每条错误信息 + message.error(field.errors[0]); + } + }); + }} + initialValues={{ softWare: '' }} + style={{ marginTop: 20 }} + > + +
+
+ *营业执照 + {/* (联系信息仅供与您联系，非递交商标局信息。) -
-
-
- *联系人姓名 + color: 'red', + marginTop: 10 + }}>(注 ：上传图片的尺寸最小为600*600) */} + +
+
+
+
+ + { + const isPNG = file.type === 'image/png'; + const isJPG = file.type === 'image/jpg' || file.type === 'image/jpeg'; + if (!isPNG && !isJPG) { + // console.error('仅支持 PNG、PDF、JPG 格式的文件!'); + message.error('仅支持 PNG、JPG 格式的文件!'); + } + return isPNG || isJPG; + }} + onChange={enterpriseLicenseChange} + + headers={{ 'Auth': `Bearer ${token}` }} + disabled={enterpriseLicense.length > 0 || disabled} + > + + { + enterpriseLicense.length > 0 ? +
+
+ + +
+
{ + setPersonalLicense([]) + formB.setFieldsValue({ businessLicense: '' }); + }} + >删除
+
+ : +
+
+
+ +
+
+ 上传营业执照 +
+
+ +
+ } + + + + + +
+
+
+ +
+ 示例图片 +
+
+ +
+ +
+
+
+
+ *申请人名称 +
-
- + - - + + - + + + +
+
+
+ *统一社会信用代码 +
+
-
-
- *联系人电话 -
+ }}> + - - - + + - + + + +
-
-
-
- *联系人邮箱 -
+
+
+ *申请人地址 + (注 ：省/自治区/直辖市请下拉选择，无需重复填写) +
-
- - + - + - - - -
- - -
- -
-
- *联系人地址 -
- -
- - +
+
+
+ - + + - + + + +
- -
- -
-
- *联系人邮编 +
联系信息 + (联系信息仅供与您联系，非递交商标局信息。)
+
+
+ *联系人姓名 +
-
- + - - + + - + + + +
+ + +
+
+
+ *联系人电话 +
+ +
+ + + + + + + +
+
+
+ *联系人邮箱 +
-
- +
+ + + + + + + +
+ + +
+ +
+
+ *联系人地址 +
+ +
+ + + + + + + +
+ + +
+ +
+
+ *联系人邮编 +
+ +
+ + + + + + + +
+ + +
+ +
-
- + - - { setSelectPeopleModal(false) }} - width={1200} > -
- + + { setSelectPeopleModal(false) }} + onOk={() => { + if (nowSelectPeopleData.name) { + setConfirmSelectPeopleData(nowSelectPeopleData) -
- - - rowSelection={{ - type: 'radio', - selectedRowKeys: [selectedRowKey], - onChange: (selectedRowKeys: React.Key[]) => { - setSelectedRowKey(selectedRowKeys[0] as string); - }, - }} - // 设置分页 - pagination={{ - total: total, - pageSize: 5, - current: page, - // 取消设置每显示几条 - showSizeChanger: false, - // 点击分页按钮 - onChange: (page: number) => { - setPage(page); - getTrademarkApplicantList(page) - } - }} - columns={columns} - dataSource={tableData} - onRow={(record) => ({ - style: { - cursor: 'pointer', - }, - onClick: (event) => { - // 检查点击的元素是否属于操作列 - const isOperationColumn = (event.target as HTMLElement).closest('.ant-table-cell-operations'); - if (!isOperationColumn) { - setSelectedRowKey(record.trademarkUserId); - } - - } - })} - rowKey='trademarkUserId' - /> - - - - { setDeleteModal(false) }} - onOk={async () => { - try { - await deleteTrademarkApplicant(trademarkUserId) - getTrademarkApplicantList(page) - setDeleteModal(false) - } catch (error: any) { - if (error.response) { - const data = error.response.data; - messageApi.open({ - type: 'error', - content: data.msg ? data.msg : `${data.path}(${data.status})`, - }); - } else { - console.error(error) } - } - }} - > - 删除后无记录?确定删除吗? - -
+ setSelectPeopleModal(false) + // console.log(nowSelectPeopleData); + + }} + width={1200} > +
+ + { + setSearchKeyWords(nowSearchKeyWords) + }} + onChange={(e) => { + setNowSearchKeyWords(e.target.value) + if (e.target.value === '') { + setSearchKeyWords('') + } + }} + className='searchInputmedia' + style={{ + // maxWidth: '200px', + width: '170px', + height: '31px', + marginLeft: '5px' + }} + allowClear + /> +
+ + + rowSelection={{ + type: 'radio', + selectedRowKeys: [selectedRowKey], + onChange: (selectedRowKeys: React.Key[]) => { + setSelectedRowKey(selectedRowKeys[0] as string); + }, + }} + // 设置分页 + pagination={{ + total: total, + pageSize: 5, + current: page, + // 取消设置每显示几条 + showSizeChanger: false, + // 点击分页按钮 + onChange: (page: number) => { + setPage(page); + getTrademarkApplicantList(page) + } + }} + columns={columns} + dataSource={tableData} + onRow={(record) => ({ + style: { + cursor: 'pointer', + }, + onClick: (event) => { + // 检查点击的元素是否属于操作列 + const isOperationColumn = (event.target as HTMLElement).closest('.ant-table-cell-operations'); + if (!isOperationColumn) { + setSelectedRowKey(record.trademarkUserId); + setNowSelectPeopleData({ + trademarkUserId: record.trademarkUserId, + name: record.name, + }) + } + + } + })} + rowKey='trademarkUserId' + /> + + + + { setDeleteModal(false) }} + onOk={async () => { + try { + await deleteTrademarkApplicant(trademarkUserId) + getTrademarkApplicantList(page) + setDeleteModal(false) + } catch (error: any) { + if (error.response) { + const data = error.response.data; + messageApi.open({ + type: 'error', + content: data.msg ? data.msg : `${data.path}(${data.status})`, + }); + } else { + console.error(error) + } + } + }} + > + 删除后无记录?确定删除吗? + +
+ ) } diff --git a/src/route/proj/ProjEditAll.tsx b/src/route/proj/ProjEditAll.tsx index 2752337..2ea1cdb 100644 --- a/src/route/proj/ProjEditAll.tsx +++ b/src/route/proj/ProjEditAll.tsx @@ -9,6 +9,7 @@ import { // GetProp, UploadProps, } from "antd"; +import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; import { UploadOutlined } from '@ant-design/icons'; import TextArea from "antd/es/input/TextArea"; import StepProjEdit from "../../components/step/StepProjEdit.tsx"; @@ -18,7 +19,7 @@ import CardProjLoading from "../../components/card/CardProjLoading.tsx"; import CardProjResult from "../../components/card/CardProjResult.tsx"; import CardProjDownload from "../../components/card/CardProjDownload.tsx"; import CardProjJump from "../../components/card/CardProjJump.tsx"; -import { useEffect, useState } from "react"; +import { useEffect, useState, useContext } from "react"; import { Axios, get, put, post, uploadFileUrl, downloadUrl } from "../../util/AjaxUtils.ts"; import { EditStepEnum, IProjEdit } from "../../interfaces/card/ICardProj.ts"; import { MIN_MOD_SIZE } from "./edit/ProjConfigModList.tsx"; @@ -53,7 +54,9 @@ import ING from '../../static/status/ING.gif' // desc: string // } // type FileType = Parameters>[0]; +import { useDispatch } from 'react-redux' export default function ProjEditAll() { + const globalDispatchContext = useContext(GlobalDispatchContext); // 是否显示下载安装包模块 const [showPkg, setShowPkg] = useState(false) // 是否显示下载演示视频 @@ -62,6 +65,29 @@ export default function ProjEditAll() { const [pkgStatus, setPkgStatus] = useState('') // 视频模块生成状态 const [videoStatus, setVideoStatus] = useState('') + const dispath = useDispatch() + // 获取套餐包数量 + const getMyPackNum = () => { + get({ + messageApi, + url: `/api/proj/servicepkg/packageorder/count/self`, + onBefore() { + + }, + onSuccess({ data }) { + dispath({ + type: 'upPackNum', + val: { + ALL: data.ALL, + MATERIAL: data.MATERIAL, + } + }) + }, + onFinally() { + + } + }) + } // 点击刷新页面数据获取安装包状态 const upData = () => { get({ @@ -163,10 +189,10 @@ export default function ProjEditAll() { maxCount: 6,//上传限制最多6个 action: uploadFileUrl(), headers: { - 'Auth': `Bearer ${token}`, + 'Auth': `Bearer ${token}`, }, // headers={{'X-USER-ID': DevUserId}} - + beforeUpload: (file) => { const isPNG = file.type === 'application/pdf'; if (!isPNG) { @@ -437,14 +463,17 @@ export default function ProjEditAll() { setConfigArray(configArray); setIsConfigEdited(isConfig); } - + const [claimer, setClaimer] = useState(); //认领人 + // 退款弹窗显示 + const [refundModal, setRefundModal] = useState(false) const renderData = () => { get({ messageApi: messageApi, // url: `/api/proj/get/${pathParams.projId}`, url: `/api/proj/claim/get/${pathParams.projId}`, onSuccess({ data }) { - // console.log('嘻嘻', data); + // console.log('详情', data); + setClaimer(data.claimer); setcertificate(data.certificates) setprogress(data.progress) // console.log('状态判断', data.pay.chargeAdditionals); @@ -879,6 +908,21 @@ export default function ProjEditAll() {
+
+ < Modal + centered + title="提示" + open={refundModal} + destroyOnClose={true} + + onCancel={() => { + setRefundModal(false); + } + } + // 确定按钮为红色,显示文字为确认 + okButtonProps={{ + style: { + backgroundColor: '#ff4d4f', + borderColor: '#ff4d4f', + color: '#fff', + }, + }} + okText="确认" + onOk={() => { + // refund() + post({ + messageApi, + url: `/api/proj/refund/apply/save-full-proj/${pathParams.projId}`, + // body: { + // projId: refunProjId + // }, + onBefore() { + + }, + onSuccess() { + reloadUser(messageApi, globalDispatchContext).then(() => { + // nav(-1) + // messageApi.success('退款成功'); + message.success('退款成功'); + // setTimeout(() => { + setRefundModal(false); + nav(-1) + getMyPackNum() + // }, 500); + // setShowBuyPicIng(true); + // setBuyModalShow(false); + // setShowBuyPicAgain(false) + }); + + }, + // onError(error) { + // messageApi.error(error.message); + // }, + onFinally() { + setRefundModal(false); + } + }) + }} + cancelText="取消" + > + 确定退款吗? +
) } \ No newline at end of file