暂存
This commit is contained in:
lyp
parent
db099fbc43
commit
3b9c88dfc9
@ -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)
|
||||
|
||||
// ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -41,6 +41,13 @@ export default function TrademarkAiEdit() {
|
||||
trademarkTypeDTOS: [],
|
||||
trademarkTypeIds: []
|
||||
})
|
||||
const [editThreeData, setEditThreeData] = useState<any>({
|
||||
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)
|
||||
|
||||
@ -107,30 +107,46 @@ export default function TrademarkMall() {
|
||||
</span>
|
||||
)
|
||||
},
|
||||
{
|
||||
title: '申请人',
|
||||
dataIndex: 'leaderName',
|
||||
align: 'center',
|
||||
key: 'appOrderId',
|
||||
width: 150,
|
||||
render: (text) => (
|
||||
<span>
|
||||
{text ? text : '未完善'}
|
||||
</span>
|
||||
)
|
||||
},
|
||||
{
|
||||
title: '申请人证件号',
|
||||
dataIndex: 'leaderIdcard',
|
||||
align: 'center',
|
||||
key: 'appOrderId',
|
||||
width: 150,
|
||||
render: (text) => (
|
||||
<span>
|
||||
{text ? text : '未完善'}
|
||||
</span>
|
||||
)
|
||||
},
|
||||
// {
|
||||
// title: '申请人',
|
||||
// // 使用数组形式访问嵌套对象属性
|
||||
// dataIndex: ['trademarkUserDTO', 'name'],
|
||||
// align: 'center',
|
||||
// // 修改 key 保证唯一性
|
||||
// key: 'trademarkUserDTOName',
|
||||
// width: 150,
|
||||
// render: (text) => (
|
||||
// <span>
|
||||
// {text || '-'}
|
||||
// </span>
|
||||
// )
|
||||
// },
|
||||
// // {
|
||||
// // title: '申请人证件号',
|
||||
// // dataIndex: ['trademarkUserDTO', 'name'],
|
||||
// // align: 'center',
|
||||
// // key: 'appOrderId',
|
||||
// // width: 150,
|
||||
// // render: (text) => (
|
||||
// // <span>
|
||||
// // {text ? text : '未完善'}
|
||||
// // </span>
|
||||
// // )
|
||||
// // },
|
||||
// {
|
||||
// title: '联系人',
|
||||
// // 使用数组形式访问嵌套对象属性
|
||||
// dataIndex: ['trademarkUserDTO', 'contactName'],
|
||||
// align: 'center',
|
||||
// // 修改 key 保证唯一性
|
||||
// key: 'trademarkUserDTOContactName',
|
||||
// width: 150,
|
||||
// render: (text) => (
|
||||
// <span>
|
||||
// {text || '-'}
|
||||
// </span>
|
||||
// )
|
||||
// },
|
||||
{
|
||||
title: '操作',
|
||||
// dataIndex: 'contractManagementId',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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<GetProp<UploadProps, 'beforeUpload'>>[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<any>({
|
||||
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<any>({
|
||||
@ -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<any>(); //认领人
|
||||
// 退款弹窗显示
|
||||
const [refundModal, setRefundModal] = useState(false)
|
||||
const renderData = () => {
|
||||
get<any>({
|
||||
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() {
|
||||
|
||||
</div>
|
||||
<div className="btn-container">
|
||||
<Button size="large" style={{
|
||||
width: '200px',
|
||||
height: '40px',
|
||||
fontSize: '16px',
|
||||
backgroundColor: 'white',
|
||||
display: claimer ? 'none' : 'unset',
|
||||
background: 'red',
|
||||
color: 'white',
|
||||
marginRight: 10
|
||||
// color: '#A0A0A0',
|
||||
// border: 'none',
|
||||
}} onClick={() => {
|
||||
console.log(claimer);
|
||||
setRefundModal(true)
|
||||
}}>退款</Button>
|
||||
<Button size="large" style={{
|
||||
width: '200px',
|
||||
height: '40px',
|
||||
@ -1288,6 +1332,64 @@ export default function ProjEditAll() {
|
||||
<div style={{ marginTop: 10 }}>{progress == 'PRODUCTION' ? '您申请的软著正在制作中,预计一日内完成' : progress == 'SUBMIT_FOR_REVIEW' ? '您申请的软著已提交国家版权中心,预计60个工作日内下证' : progress == 'DONE' ? '您申请的软著已完成,请在页面证书下载处下载' : '您申请的软著等待制作中,预计两日内完成'}</div>
|
||||
</div>
|
||||
</Modal>
|
||||
< Modal
|
||||
centered
|
||||
title="提示"
|
||||
open={refundModal}
|
||||
destroyOnClose={true}
|
||||
|
||||
onCancel={() => {
|
||||
setRefundModal(false);
|
||||
}
|
||||
}
|
||||
// 确定按钮为红色,显示文字为确认
|
||||
okButtonProps={{
|
||||
style: {
|
||||
backgroundColor: '#ff4d4f',
|
||||
borderColor: '#ff4d4f',
|
||||
color: '#fff',
|
||||
},
|
||||
}}
|
||||
okText="确认"
|
||||
onOk={() => {
|
||||
// refund()
|
||||
post<any>({
|
||||
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="取消"
|
||||
>
|
||||
确定退款吗?
|
||||
</ Modal>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user