暂存

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(
+        //   <div>
 
+        //   </div>
+        // )
+        trademarkTypeDTOS.length > 0 ? (
+          trademarkTypeDTOS.map((item: any) => {
+            return (
+              <div key={item.id} title={item.name}>
+                第{item.code}类 : {item.name}
+              </div>
+            )
+
+          })
+        ) : '暂无'
+      )
+
+    },
     {
       title: '商标图样',
       dataIndex: 'trademarkPhoto',
@@ -87,11 +118,28 @@ export default function TrademarkMall() {
       dataIndex: 'trademarkStatus',
       align: 'center',
       key: 'trademarkStatus',
-      width: 100,
+      width: 110,
-      render: (text) => (
+      render: (text, record) => (
-        <span>
+        <div>
           {text == '-1' ?
-            <span >审核未通过</span>
+            <div style={{
+              color: 'red',
+              cursor: 'pointer',
+            }}
+              title='点击查看原因'
+              onClick={() => {
+                setCheckRemark(record.checkRemark)
+
+                setModal(true)
+                // console.log(record.checkRemark);
+              }}
+            >
+              <div>审核未通过</div>
+              <div>已退款</div>
+              <div style={{
+                fontSize: '12px',
+              }}>(点击查看原因)</div>
+            </div>
             : text == '0' ?
               <span
                 style={{
@@ -100,63 +148,60 @@ export default function TrademarkMall() {
               >待付款</span>
               : text == '1' ?
                 <span
-
                   style={{
                     color: 'green',
                   }}
                 >已付款</span>
                 : text == '2' ?
                   <span
-
                     style={{
                       color: 'rgb(0, 127, 255)',
                     }}
                   >审核中</span>
                   : text == '3' ?
                     <span
-
                       style={{
                         color: 'rgb(136, 185, 233)',
                       }}
-                    >审核通过</span>
+                    >提交至商标局</span>
                     : text == '4' ?
                       <span
-
                         style={{
                           color: 'rgb(136, 185, 233)',
                         }}
                       >不予受理</span>
                       : text == '5' ?
                         <span
-
                           style={{
                             color: 'rgb(136, 185, 233)',
                           }}
                         >已受理</span>
                         : text == '6' ?
                           <span
-
                             style={{
                               color: 'rgb(136, 185, 233)',
                             }}
                           >已发初审公告</span>
                           : text == '7' ?
                             <span
-
                               style={{
                                 color: 'rgb(136, 185, 233)',
                               }}
                             >部分驳回</span>
-                            :
+                            : text == '8' ?
-                            text == '8' ?
                               <span
-
                                 style={{
                                   color: 'rgb(136, 185, 233)',
                                 }}
-                              >全部驳回</span>:'未知'
+                              >全部驳回</span>
+                              : text == '9' ?
+                                <span
+                                  style={{
+                                    color: 'rgb(136, 185, 233)',
+                                  }}
+                                >下证</span> : '未知'
           }
-        </span>
+        </div>
       )
     },
 
@@ -215,7 +260,7 @@ export default function TrademarkMall() {
         <div style={{
           cursor: 'pointer',
           color: '#007FFF',
-          display: record.trademarkStatus != '-1' && record.trademarkModeName === '智能申请注册' ? 'unset' : 'none',
+          display: record.trademarkModeName === '智能申请注册' ? 'unset' : 'none',
 
         }} onClick={() => {
           nav(`/trademark-ai-edit/${record.trademarkId}`, {
@@ -229,6 +274,7 @@ export default function TrademarkMall() {
           // console.log(record.checkStatus);
 
 
+
         }}>{
             record.trademarkStatus == '2' || record.trademarkStatus == '3' ? '查看' : '编辑'
           }</div>
@@ -330,6 +376,16 @@ export default function TrademarkMall() {
           </div>
         )}
       </div>
+      <Modal
+        title="失败原因"
+        centered
+        open={modal}
+        footer={null}
+        onCancel={() => { setModal(false) }}
+
+      >
+        失败原因:{checkRemark}
+      </Modal>
     </Spin>
   )
 }

src/route/TrademarkMall/components/EditSix/EditSix.tsx

@@ -275,7 +275,7 @@ export default function EditSix(props: any) {
             fontSize: '18px',
             color: 'green',
           }}>
-           审核通过正在申请
+           已提交至商标局
           </div>
 
         </div>