发证

config/routes.js

@@ -64,7 +64,6 @@ export default [
     path: '/applicationList/detail.jsx',
     name: '申请详情',
     hideInMenu: true,
-    icon: 'apartment',
     component: '@/pages/applicationList/detail.jsx',
   },
   {
@@ -77,7 +76,6 @@ export default [
     path: '/examine/detail.jsx',
     name: '犬证审核',
     hideInMenu: true,
-    icon: 'apartment',
     component: '@/pages/examine/detail.jsx',
   },
   {
@@ -86,10 +84,16 @@ export default [
     icon: 'IdcardOutlined',
     component: '@/pages/certificateIssuance',
   },
+  {
+    path: '/certificateIssuance/issuance.jsx',
+    name: '证件发放详情',
+    hideInMenu: true,
+    component: '@/pages/certificateIssuance/issuance.jsx',
+  },
   
   {
     path: '/userList',
-    name: '用户注册列表',
+    name: '犬主列表',
     icon: 'SolutionOutlined',
     component: '@/pages/userList',
   },

src/pages/certificateIssuance/index.jsx

@@ -1,10 +1,10 @@
 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 { getMakeList } from '@/services/application'
+import { history } from 'umi';
 
 const { RangePicker } = DatePicker;
 
@@ -13,86 +13,91 @@ 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(`certificateIssuance/issuance.jsx?id=${id}`);
   }
   const columns = [
-    
     {
       title: '证件号',
-      dataIndex: 'userName',
-      key: 'userName',
+      dataIndex: 'originCardNo',
+      key: 'originCardNo',
       search: true,
     },
     {
       title: '犬主',
-      dataIndex: 'userName',
-      key: 'userName',
+      dataIndex: 'personName',
+      key: 'personName',
       search: true,
     },
     {
       title: '犬名',
-      dataIndex: 'userName',
-      key: 'userName',
+      dataIndex: 'petName',
+      key: 'petName',
       search: true,
     },
     {
       title: '申领方式',
-      dataIndex: 'userName',//快递到家，上门自取
-      key: 'userName',
+      dataIndex: 'applyMethod',
+      key: 'applyMethod',
       search: true,
+      render: (_, record) => {
+        return record.applyMethod === 1
+          ? '上门自取'
+          : record.applyMethod === 2
+            ? '快递到家' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        1: { text: '上门自取' },
+        2: { text: '快递到家' },
+      },
     },
     {
       title: '申请时间',
       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: 'userName',
-      key: 'userName',
-      search: true,//待发放 已发放
+      title: '制证状态',
+      dataIndex: 'makeStatus',
+      key: 'makeStatus',
+      search: true,// 
+      render: (_, record) => {
+        return record.makeStatus === 0
+          ? '待发放'
+          : record.makeStatus === 1
+            ? '已发放' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待发放' },
+        1: { text: '已发放' },
+      },
     },
     {
       title: '发放人',
-      dataIndex: 'userName',
-      key: 'userName',
-      search: true,//待发放 已发放
+      dataIndex: 'makeUserName',
+      key: 'makeUserName',
+      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: 'makeDate',
+      key: 'makeDate',
+      render: (t) => t != '-' ? formatterTime(t) : '-',
+      renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} 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>
       ],
@@ -105,16 +110,9 @@ export default (props) => {
       <PageTable
         actionRef={actionRef}
         columns={columns}
-        request={getList}
+        request={getMakeList}
         options={false}
-        search={{
-          defaultCollapsed: false
-        }}
-        form={{ ignoreRules: false }}
-        manualRequest={true}
-        revalidateOnFocus={false}
-        beforeSearchSubmit={handleBeforSearch}
-        rowKey="formId"
+        rowKey="applyId"
       />
     </PageHeaderWrapper>
   )

src/pages/certificateIssuance/issuance.jsx

@@ -1,10 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Button, message, Input } from 'antd';
+import { Card, Form, Button, message, Input, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getWithdrawalDetail, updateWithdrawal } from '@/services/withdrawal'
+import { getApplicationDetail, updateMake, getCardNo } from '@/services/application'
 import { history } from 'umi';
 
-const { TextArea } = Input;
 const FormItem = Form.Item;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 const goBack = () => {
@@ -13,30 +12,47 @@ 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 [loading, setLoading] = useState(false)
-
-  const handleAudit = (val) => {
-    if (remarks) {
-      setLoading(true)
-      updateWithdrawal(withdrawal.withdrawalId, { ...withdrawal, auditStatus: val, auditRemark: remarks }).then(() => {
-        message.success('操作成功');
-        goBack()
-        setLoading(false)
-      }).catch(err => {
-        console.log(err.message)
-        setLoading(false)
-      })
+  //需要改一下
+  const handleMake = () => {
+    if (application.originCardNo) {
+      if (
+        (application.applyMethod == 2
+          && application.trackingType
+          && application.trackingNo)
+        || application.applyMethod == 1) {
+        setLoading(true)
+        var data = {
+          cardNo: application.originCardNo,
+          makeStatus: application.makeStatus,
+          trackingType: application.trackingType,
+          trackingNo: application.trackingNo
+        }
+        updateMake(id, data).then(() => {
+          message.success('操作成功');
+          goBack()
+          setLoading(false)
+        }).catch(err => {
+          console.log(err.message)
+          setLoading(false)
+        })
+      } else {
+        message.success('请输入快递信息');
+      }
     }
     else {
-      message.success('请输入处理结果');
+      message.success('请输入证件号');
     }
   }
+  const handleCardNo = () => {
+    getCardNo().then((res) => {
+      setApplication({ ...application, originCardNo: res })
+    })
+  }
   useEffect(() => {
-    getWithdrawalDetail(id).then((res) => {
-      setWithdrawal(res)
-      setRemarks(res.auditRemark)
+    getApplicationDetail(id).then((res) => {
+      setApplication(res)
     }).catch((err) => {
       console.log(err.message)
     });
@@ -45,49 +61,106 @@ 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="领取方式">
-            {withdrawal?.money / 100}
+          <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>
-          <FormItem label="快递单号">
+          <FormItem label="证件号">
+            <Input
+              value={application.originCardNo}
+              style={{ width: '350px' }}
+              readOnly={application?.makeStatus != 0}
+              placeholder='请输入证件号或者点击自动生成（必填）'
+              onChange={e => setApplication({ ...application, originCardNo: e.target.value })} />
             {
-              withdrawal?.auditStatus == 0 ?
-                <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onChange={(e) => setRemarks(e.target.value)} /> :
-                remarks
+              application?.makeStatus == 0 &&
+              <Button type="link" onClick={() => handleCardNo()}>
+                自动生成
+              </Button>
             }
           </FormItem>
+          {
+            application.applyMethod == 2 && <>
+              <FormItem label="快递公司">
+                <Input value={application.trackingType}
+                  style={{ width: '350px' }}
+                  placeholder='请输入快递公司（必填）'
+                  readOnly={application?.makeStatus != 0}
+                  onChange={e => setApplication({ ...application, trackingType: e.target.value })} />
+              </FormItem>
+              <FormItem label="快递单号">
+                <Input value={application.trackingNo}
+                  style={{ width: '350px' }}
+                  placeholder='请输入快递单号（必填）'
+                  readOnly={application?.makeStatus != 0}
+                  onChange={e => setApplication({ ...application, trackingNo: e.target.value })} />
+              </FormItem>
+            </>
+          }
           <FormItem label=" " colon={false}>
             {
-              withdrawal?.auditStatus == 0 &&
+              application?.makeStatus == 0 &&
               <>
-                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(1)}>
+                <Button type="primary" loading={loading}
+                  style={{ marginRight: '16px' }} onClick={() => handleMake()}>
                   发放
                 </Button>
               </>

src/pages/examine/index.jsx

@@ -3,7 +3,7 @@ import moment from 'moment';
 import { DatePicker, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
-import { getApplicationList } from '@/services/application'
+import { getAuditList } from '@/services/application'
 import { history } from 'umi';
 
 
@@ -110,7 +110,7 @@ export default (props) => {
       <PageTable
         actionRef={actionRef}
         columns={columns}
-        request={getApplicationList}
+        request={getAuditList}
         options={false}
         rowKey="applyId"
       />

src/services/application.js

@@ -21,9 +21,30 @@ export const updateMake = (id, data) => request(`/application/${id}/make`, { met
  */
 export const getApplicationList = (params) => request('/application', { params });
 
+/**
+ * 查询审核列表
+ * @param {*} params
+ * @returns
+ */
+ export const getAuditList = (params) => request('/application?process=1', { params });
+
+ /**
+ * 查询发证列表
+ * @param {*} params
+ * @returns
+ */
+ export const getMakeList = (params) => request('/application?process=2', { params });
+
 /**
  * 查询申请详情
  * @param {*} params
  * @returns
  */
 export const getApplicationDetail = (id) => request(`/application/${id}`);
+
+/**
+ * 随机生成证件号
+ * @param {*} params
+ * @returns
+ */
+ export const getCardNo = () => request('/card/next');