.

config/proxy.js

@@ -11,11 +11,11 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      target: 'http://192.168.89.25:9002',
+      target: 'http://192.168.89.147:9002',
       changeOrigin: true,
       headers: {
-        origin: 'http://192.168.89.25:9002',
-        referer: 'http://192.168.89.25:9002',
+        origin: 'http://192.168.89.147:9002',
+        referer: 'http://192.168.89.147:9002',
       },
 
       // target: 'https://pet-certificate-online.njyunzhi.com',

src/pages/applicationList/detail.jsx

@@ -142,7 +142,7 @@ export default (props) => {
           {
             (orderStatus == 1 || orderStatus == 2) &&
             <FormItem label="证件号">
-              {application.originCardNo}
+              {application.cardNo}
             </FormItem>
           }
           {

src/pages/cardList/index.jsx

@@ -17,6 +17,23 @@ export default (props) => {
       key: 'cardNo',
       search: true,
     },
+    {
+      title: '证件状态',
+      dataIndex: 'status',
+      key: 'status',
+      search: true,
+      render: (_, record) => {
+        return record?.status == 1 ? '正常' :
+          record?.status == 2 ? '挂失' :
+          record?.status == 3 ? '过期' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        1: { text: '正常' },
+        2: { text: '挂失' },
+        3: { text: '过期' },
+      },
+    },
     {
       title: '犬主',
       dataIndex: 'personName',

src/pages/certificateIssuance/index.jsx

@@ -22,6 +22,7 @@ export default (props) => {
   const [selectedRowKeys, setSelectedRowKeys] = useState([])
   const [selectedRows, setSelectedRows] = useState([])
   const [application, setApplication] = useState();
+  const [exportLoading, setExportLoading] = useState(false);
 
   const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
   //绑卡弹窗
@@ -44,21 +45,26 @@ export default (props) => {
   const handleReset = () => {
     setStart()
     setEnd()
+    setSelectedRows([])
+    setSelectedRowKeys([])
   }
   const handleExport = () => {
-    // console.log(selectedRows);
 
-    const cardNoList = selectedRows.map(item => item.originCardNo)
+    const cardNoList = selectedRows.map(item => item.cardNo)
     if (cardNoList.some(item => item == null)) {
       message.info('您选中的犬证有未绑卡数据，请先绑卡再导出数据')
     } else {
-      exportCardList({ cardNoList: cardNoList }).then((res) => {
+      setExportLoading(true)
+      exportCardList(cardNoList).then((res) => {
         message.success('导出' + cardNoList.length + '条数据');
-
+        setSelectedRows([])
+        setSelectedRowKeys([])
+        setExportLoading(false)
+      }).catch((err) => {
+        console.log(err.message);
+        setExportLoading(false)
       })
     }
-    // setSelectedRows([])
-    // setSelectedRowKeys([])
   }
 
 
@@ -67,7 +73,7 @@ export default (props) => {
     setLoading(true)
     updateBindCard(
       application.applyId,
-      { cardNo: val.originCardNo }
+      { cardNo: val.cardNo }
     ).then((res) => {
       message.success('绑卡成功')
       handleBindCancel();
@@ -80,6 +86,9 @@ export default (props) => {
   }
   const handleBindShow = (id) => {
     getApplicationDetail(id).then((res) => {
+      if (res.applyType=='reissue'&&res.status==2) {
+        res.cardNo=null
+      }
       form.setFieldsValue(res);
       setApplication(res)
       setVisible(true)
@@ -131,8 +140,8 @@ export default (props) => {
   const columns = [
     {
       title: '证件号',
-      dataIndex: 'originCardNo',
-      key: 'originCardNo',
+      dataIndex: 'cardNo',
+      key: 'cardNo',
       search: true,
     },
     {
@@ -270,7 +279,7 @@ export default (props) => {
         )}
         tableAlertOptionRender={() => {
           return (
-            <Button style={{ padding: 0 }} type="link" onClick={handleExport}>导出制证</Button>
+            <Button style={{ padding: 0 }} type="link" loading={exportLoading} onClick={handleExport}>导出制证</Button>
           );
         }}
         actionRef={actionRef}
@@ -292,11 +301,11 @@ export default (props) => {
         footer={null}
       >
         <Form {...formItemLayout} onFinish={bindCard} form={form}>
-          <FormItem label="证件号" name="originCardNo" rules={[{ required: true, message: '请输入证件号' }]}>
-            <Input placeholder="请输入证件号" readOnly={application?.originCardNo != null} />
+          <FormItem label="证件号" name="cardNo" rules={[{ required: true, message: '请输入证件号' }]}>
+            <Input placeholder="请输入证件号" readOnly={application?.cardNo != null} />
           </FormItem>
           {
-            !application?.originCardNo &&
+            !application?.cardNo &&
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={handleBindCancel}>
                 取消
@@ -325,7 +334,7 @@ export default (props) => {
         footer={null}
       >
         <Form {...formItemLayout} onFinish={outCard} form={outForm}>
-          <FormItem label="证件号" name='originCardNo' rules={[{ required: true, message: '请先绑卡再发证' }]}>
+          <FormItem label="证件号" name='cardNo' rules={[{ required: true, message: '请先绑卡再发证' }]}>
             <Input
               readOnly
               placeholder='请先绑卡再发证'

src/pages/certificateIssuance/issuance.jsx

@@ -100,7 +100,7 @@ export default (props) => {
             </FormItem>
           }
           <FormItem label="证件号">
-            {application.originCardNo}
+            {application.cardNo}
           </FormItem>
           {
             application.applyMethod == 2 &&