diff --git a/src/route/TrademarkMall/TrademarkMall.tsx b/src/route/TrademarkMall/TrademarkMall.tsx
index 690c032..2c91f85 100644
--- a/src/route/TrademarkMall/TrademarkMall.tsx
+++ b/src/route/TrademarkMall/TrademarkMall.tsx
@@ -3,6 +3,7 @@ import nothingImg from '../../static/appimgs/nothing.png'
import { useLocation, useNavigate } from 'react-router-dom';
import { trademarkList } from '../../request/api'
import { showImage } from '../../request/request'
+import { Modal } from 'antd';
import type { TableProps } from 'antd';
import {
message, Spin,
@@ -10,6 +11,8 @@ import {
Table, Image
} from 'antd';
export default function TrademarkMall() {
+ const [modal, setModal] = useState(false)
+ const [checkRemark, setCheckRemark] = useState('') //失败原因
const [messageApi, contextHolder] = message.useMessage();
const { state } = useLocation()
const nav = useNavigate();
@@ -38,6 +41,7 @@ export default function TrademarkMall() {
},
},
+
{
title: '类型/名称',
fixed: 'left',
@@ -62,7 +66,34 @@ export default function TrademarkMall() {
)
},
+ {
+ title: '涉及类别',
+ dataIndex: 'trademarkTypeDTOS',
+ align: 'center',
+ key: 'trademarkTypeDTOS',
+ width: 150,
+ ellipsis: {
+ showTitle: true,
+ },
+ render: (trademarkTypeDTOS) => (
+ // trademarkTypeDTOS.map(
+ //
+ //
+ // )
+ trademarkTypeDTOS.length > 0 ? (
+ trademarkTypeDTOS.map((item: any) => {
+ return (
+
+ 第{item.code}类 : {item.name}
+
+ )
+
+ })
+ ) : '暂无'
+ )
+
+ },
{
title: '商标图样',
dataIndex: 'trademarkPhoto',
@@ -87,11 +118,28 @@ export default function TrademarkMall() {
dataIndex: 'trademarkStatus',
align: 'center',
key: 'trademarkStatus',
- width: 100,
- render: (text) => (
-
+ width: 110,
+ render: (text, record) => (
+
{text == '-1' ?
-
审核未通过
+
{
+ setCheckRemark(record.checkRemark)
+
+ setModal(true)
+ // console.log(record.checkRemark);
+ }}
+ >
+
审核未通过
+
已退款
+
(点击查看原因)
+
: text == '0' ?
待付款
: text == '1' ?
已付款
: text == '2' ?
审核中
: text == '3' ?
审核通过
+ >提交至商标局
: text == '4' ?
不予受理
: text == '5' ?
已受理
: text == '6' ?
已发初审公告
: text == '7' ?
部分驳回
- :
- text == '8' ?
+ : text == '8' ?
全部驳回:'未知'
+ >全部驳回
+ : text == '9' ?
+
下证 : '未知'
}
-
+
)
},
@@ -215,7 +260,7 @@ export default function TrademarkMall() {
{
nav(`/trademark-ai-edit/${record.trademarkId}`, {
@@ -229,8 +274,9 @@ export default function TrademarkMall() {
// console.log(record.checkStatus);
+
}}>{
- record.trademarkStatus == '2' || record.trademarkStatus == '3'? '查看' : '编辑'
+ record.trademarkStatus == '2' || record.trademarkStatus == '3' ? '查看' : '编辑'
}
@@ -330,6 +376,16 @@ export default function TrademarkMall() {
)}
+ { setModal(false) }}
+
+ >
+ 失败原因:{checkRemark}
+
)
}
diff --git a/src/route/TrademarkMall/components/EditSix/EditSix.tsx b/src/route/TrademarkMall/components/EditSix/EditSix.tsx
index 875209c..6ef7721 100644
--- a/src/route/TrademarkMall/components/EditSix/EditSix.tsx
+++ b/src/route/TrademarkMall/components/EditSix/EditSix.tsx
@@ -275,7 +275,7 @@ export default function EditSix(props: any) {
fontSize: '18px',
color: 'green',
}}>
- 审核通过正在申请
+ 已提交至商标局