.

src/pages/cardList/detail.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { Card, Form, Button, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getCardDetail,getCardQRCode } from '@/services/card'
+import { getCardDetail, getCardQRCode } from '@/services/card'
 import { history } from 'umi';
 
 const FormItem = Form.Item;
@@ -13,11 +13,11 @@ export default (props) => {
   const { location } = props;
   const { id } = location.query;
   const [card, setCard] = useState({});
-  const [qrcode,setQrcode]=useState();
+  const [qrcode, setQrcode] = useState();
   useEffect(() => {
     getCardDetail(id).then((res) => {
       setCard(res)
-      getCardQRCode(res.cardNo).then((res2)=>{
+      getCardQRCode(res.cardNo).then((res2) => {
         setQrcode(res2.qrImage)
       })
     }).catch((err) => {
@@ -41,6 +41,12 @@ export default (props) => {
           <FormItem label="犬主">
             {card?.personName}
           </FormItem>
+          {
+            card?.isOrg &&
+            <FormItem label="企业">
+              {card?.orgName}
+            </FormItem>
+          }
           <FormItem label="电话">
             {card?.phone}
           </FormItem>
@@ -68,10 +74,22 @@ export default (props) => {
           <FormItem label="狗证有效期">
             {card?.startDate + '~' + card?.expireDate}
           </FormItem>
+          {
+            card?.criminalInfo &&
+            <FormItem label="伤人信息">
+              <Image src={card.criminalInfo} width={100} />
+            </FormItem>
+          }
+          {
+            card?.penaltyInfo &&
+            <FormItem label="处罚信息">
+              <Image src={card.penaltyInfo} width={100} />
+            </FormItem>
+          }
           <FormItem label="小程序码">
             {
-              qrcode&&<Image src={qrcode} width={100} />
-            }            
+              qrcode && <Image src={qrcode} width={100} />
+            }
           </FormItem>
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={() => goBack()}>

src/pages/cardList/index.jsx

@@ -23,6 +23,28 @@ export default (props) => {
       key: 'personName',
       search: true,
     },
+    {
+      title: '是否企业',
+      dataIndex: 'isOrg',
+      key: 'isOrg',
+      search: true,
+      hideInTable:true,
+      render: (_, record) => {
+        return record.isOrg
+          ? '企业':'个人'
+      },
+      valueType: 'select',
+      valueEnum: {
+        true: { text: '企业' },
+        false: { text: '个人' },
+      },
+    },
+    {
+      title: '企业名称',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: true,
+    },
     {
       title: '犬名',
       dataIndex: 'petName',