审核列表

src/pages/applicationList/detail.jsx

@@ -57,7 +57,7 @@ export default (props) => {
             {application?.immunizationCode}
           </FormItem>
           <FormItem label="免疫证明">
-            <Image src={application?.immunizationImg} />
+            <Image src={application?.immunizationImg} width={100} />
           </FormItem>
           <FormItem label="最近免疫日期">
             {application?.immunizationDate}
@@ -69,6 +69,15 @@ export default (props) => {
                   application?.applyType == 'renewal' ? '续期' : ''
             }
           </FormItem>
+          {
+            application?.applyType !== 'renewal' &&
+            <FormItem label="申领方式">
+              {
+                application?.applyMethod == '1' ? '上门自取' :
+                  application?.applyMethod == '2' ? '快递到家' : ''
+              }
+            </FormItem>
+          }
           <FormItem label="付款状态">
             {
               application.payStatus === 0
@@ -82,12 +91,7 @@ export default (props) => {
           {/* <FormItem label="狗证有效期">
            2021-1-5~2022-1-5
           </FormItem>
-          <FormItem label="申领方式">
-            {
-              application?.applyMethod == '1' ? '上门自取' :
-                application?.applyMethod == '2' ? '快递到家' : ''
-            }
-          </FormItem>
+          //判断是否为续期
           <FormItem label="快递公司">
             <Input type="text" value='极兔快递' style={{ width: '350px' }} />
           </FormItem>

src/pages/applicationList/index.jsx

@@ -15,7 +15,7 @@ const formatterTime = (val) => {
 
 export default (props) => {
   const actionRef = useRef();
-  const goDetail=(id)=>{
+  const goDetail = (id) => {
     history.push(`applicationList/detail.jsx?id=${id}`);
   }
   const columns = [
@@ -25,6 +25,12 @@ export default (props) => {
       key: 'personName',
       search: true,
     },
+    {
+      title: '犬名',
+      dataIndex: 'petName',
+      key: 'petName',
+      search: true,
+    },
     {
       title: '申请时间',
       dataIndex: 'createDate',
@@ -68,7 +74,6 @@ export default (props) => {
       valueType: 'select',
       valueEnum: {
         0: { text: '待支付' },
-        1: { text: '支付中' },
         2: { text: '已支付' },
       },
     },
@@ -97,7 +102,8 @@ export default (props) => {
       valueType: 'option',
       width: 160,
       render: (_, record) => [
-        <Button key={1} style={{ padding: 0 }} type="link" onClick={()=>goDetail(record.applyId)}>
+        <Button key={1} style={{ padding: 0 }} type="link"
+          onClick={() => goDetail(record.applyId)}>
           详情
         </Button>
       ],

src/pages/examine/detail.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Button, message, Input } from 'antd';
+import { Card, Form, Button, Image, Input, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getWithdrawalDetail, updateWithdrawal } from '@/services/withdrawal'
+import { getApplicationDetail, updateAudit } from '@/services/application'
 import { history } from 'umi';
 
 const { TextArea } = Input;
@@ -13,14 +13,14 @@ const goBack = () => {
 export default (props) => {
   const { location } = props;
   const { id } = location.query;
-  const [withdrawal, setWithdrawal] = useState();
-  const [remarks, setRemarks] = useState()
+  const [application, setApplication] = useState({});
+  const [rejectReason, setRejectReason] = useState();
   const [loading, setLoading] = useState(false)
 
   const handleAudit = (val) => {
-    if (remarks) {
+    if ((val == 2 && rejectReason) || val == 1) {
       setLoading(true)
-      updateWithdrawal(withdrawal.withdrawalId, { ...withdrawal, auditStatus: val, auditRemark: remarks }).then(() => {
+      updateAudit(id, { rejectReason: rejectReason, verifyStatus: val }).then(() => {
         message.success('操作成功');
         goBack()
         setLoading(false)
@@ -33,10 +33,11 @@ export default (props) => {
       message.success('请输入处理结果');
     }
   }
+
   useEffect(() => {
-    getWithdrawalDetail(id).then((res) => {
-      setWithdrawal(res)
-      setRemarks(res.auditRemark)
+    getApplicationDetail(id).then((res) => {
+      setApplication(res)
+      setRejectReason(res.rejectReason)
     }).catch((err) => {
       console.log(err.message)
     });
@@ -45,37 +46,82 @@ export default (props) => {
     <PageHeaderWrapper    >
       <Card>
         <Form {...formItemLayout}>
-          <FormItem label="申请人">
-            {withdrawal?.userName}
-          </FormItem>
           <FormItem label="犬主">
-            {withdrawal?.phone}
+            {application?.personName}
+          </FormItem>
+          <FormItem label="电话">
+            {application?.phone}
           </FormItem>
           <FormItem label="犬名">
-            {withdrawal?.orgName}
+            {application?.petName}
+          </FormItem>
+          <FormItem label="性别">
+            {
+              application?.petSex == 1 ? '雄' :
+                application?.petSex == 2 ? '雌' : '未说明性别'
+            }
           </FormItem>
           <FormItem label="犬种">
-            {withdrawal?.amountLeft / 100}
+            {application?.petType}
           </FormItem>
           <FormItem label="毛色">
-            {withdrawal?.bankCard.ownerBank}
+            {application?.petColor}
           </FormItem>
           <FormItem label="照片">
-            {withdrawal?.bankCard.cardNo}
+            <Image src={application?.img1} width={100} />
           </FormItem>
           <FormItem label="养狗地址">
-            {withdrawal?.money / 100}
+            {application?.address}
+          </FormItem>
+          <FormItem label="免疫证号">
+            {application?.immunizationCode}
+          </FormItem>
+          <FormItem label="免疫证明">
+            <Image src={application?.immunizationImg} width={100} />
+          </FormItem>
+          <FormItem label="最近免疫日期">
+            {application?.immunizationDate}
+          </FormItem>
+          <FormItem label="申请类型">
+            {
+              application?.applyType == 'first' ? '办证' :
+                application?.applyType == 'reissue' ? '补办' :
+                  application?.applyType == 'renewal' ? '续期' : ''
+            }
           </FormItem>
-          <FormItem label="处理结果">
+          {
+            application?.applyType !== 'renewal' &&
+            <FormItem label="申领方式">
+              {
+                application?.applyMethod == '1' ? '上门自取' :
+                  application?.applyMethod == '2' ? '快递到家' : ''
+              }
+            </FormItem>
+          }
+          <FormItem label="付款状态">
             {
-              withdrawal?.auditStatus == 0 ?
-                <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onChange={(e) => setRemarks(e.target.value)} /> :
-                remarks
+              application.payStatus === 0
+                ? '待支付'
+                : application.payStatus === 1
+                  ? '支付中'
+                  : application.payStatus === 2
+                    ? '已支付' : ''
             }
           </FormItem>
+          {
+            application.verifyStatus != 1 &&
+            <FormItem label="驳回原因">
+              <TextArea placeholder='请输入驳回原因' rows='3'
+                style={{ width: '350px' }}
+                value={rejectReason}
+                readOnly={application.verifyStatus==2}
+                onChange={(e) => setRejectReason(e.target.value)}
+              />
+            </FormItem>
+          }
           <FormItem label=" " colon={false}>
             {
-              withdrawal?.auditStatus == 0 &&
+              application.verifyStatus == 0 &&
               <>
                 <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(1)}>
                   同意

src/pages/examine/index.jsx

@@ -1,10 +1,11 @@
 import React, { useRef } from 'react'
-import { useModel } from 'umi';
 import moment from 'moment';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
-import { getList } from '@/services/work'
+import { getApplicationList } from '@/services/application'
+import { history } from 'umi';
+
 
 const { RangePicker } = DatePicker;
 
@@ -13,33 +14,21 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
-  const initDate = useRef(moment())
   const actionRef = useRef();
-  const { initialState } = useModel('@@initialState');
-
-  const handleBeforSearch = (params) => {
-    const { createDate, ...others } = params;
-
-    let start, end, orgId;
-    if (!createDate || createDate.length < 1) {
-      // 默认时间是今天
-      start = moment().format('YYYY-MM-DD')
-      end = start
-    } else {
-      start = moment(createDate[0]).format('YYYY-MM-DD')
-      end = moment(createDate[1]).format('YYYY-MM-DD')
-    }
-    if (initialState.currentUser.orgId) {
-      orgId = initialState.currentUser.orgId
-      return { ...others, start, end, orgId };
-    }
-    return { ...others, start, end };
+  const goDetail = (id) => {
+    history.push(`examine/detail.jsx?id=${id}`);
   }
   const columns = [
     {
-      title: '申请人',
-      dataIndex: 'userName',
-      key: 'userName',
+      title: '犬主',
+      dataIndex: 'personName',
+      key: 'personName',
+      search: true,
+    },
+    {
+      title: '犬名',
+      dataIndex: 'petName',
+      key: 'petName',
       search: true,
     },
     {
@@ -47,33 +36,68 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+    },
+    {
+      title: '订单状态',
+      dataIndex: 'payStatus',
+      key: 'payStatus',
+      search: true,//已支付 待支付
+      render: (_, record) => {
+        return record.payStatus === 0
+          ? '待支付'
+          : record.payStatus === 1
+            ? '支付中'
+            : record.payStatus === 2
+              ? '已支付' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待支付' },
+        2: { text: '已支付' },
+      },
     },
     {
       title: '审核状态',
-      dataIndex: 'userName',
-      key: 'userName',
+      dataIndex: 'verifyStatus',
+      key: 'verifyStatus',
       search: true,
+      render: (_, record) => {
+        return record.verifyStatus === 0
+          ? '待审核'
+          : record.verifyStatus === 1
+            ? '审核通过'
+            : record.verifyStatus === 2
+              ? '审核驳回' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待审核' },
+        1: { text: '审核通过' },
+        2: { text: '审核驳回' },
+      },
     },
     {
       title: '审核人',
-      dataIndex: 'userName',
-      key: 'userName',
+      dataIndex: 'verifyUser',
+      key: 'verifyUser',
       search: true,
     },
     {
       title: '审核时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      dataIndex: 'verifyDate',
+      key: 'verifyDate',
+      render: (t) => t != '-' ? formatterTime(t) : '-',
+      renderFormItem: (_, record) => <RangePicker format='YYYY-MM-DD' />
     },
     {
       title: '操作',
       valueType: 'option',
       width: 160,
       render: (_, record) => [
-        <Button key={1} style={{ padding: 0 }} type="link">
+        <Button key={1} style={{ padding: 0 }} type="link"
+          onClick={() => goDetail(record.applyId)}
+        >
           详情
         </Button>
       ],
@@ -86,16 +110,9 @@ export default (props) => {
       <PageTable
         actionRef={actionRef}
         columns={columns}
-        request={getList}
+        request={getApplicationList}
         options={false}
-        search={{
-          defaultCollapsed: false
-        }}
-        form={{ ignoreRules: false }}
-        manualRequest={true}
-        revalidateOnFocus={false}
-        beforeSearchSubmit={handleBeforSearch}
-        rowKey="formId"
+        rowKey="applyId"
       />
     </PageHeaderWrapper>
   )