Merge branch 'master' of http://git.ycjcjy.com/pet_identity/pc-admin

src/components/SettingRow/index.jsx

@@ -26,7 +26,7 @@ const SettingRow = (props) => {
   };
   return (
     <div style={{ marginBottom:'16px' }}>
-      {value.title}：
+      <span style={{width:'120px', display:'inline-block', textAlign:'right'}}>{value.title}</span>：
       <Input style={{ width: '200px',marginRight:value.desc?'16px':'0' }} value={val} onChange={handleChange} onInput={handleInput} />
       {value.desc?'('+value.desc+')':''}
       <Button

src/pages/cardNoList/index.jsx

@@ -1,4 +1,3 @@
-import { history } from 'umi';
 import { useRef,useState } from 'react';
 import { Button, Modal, message, Image,Form,Input, InputNumber } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
@@ -82,11 +81,11 @@ export default (props) => {
         footer={null}
       >
         <Form {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="卡号前缀" name="prefix" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
+          <FormItem label="卡号前缀" name="prefix" rules={[{ required: true, message: '请输入卡号前缀' }]}>
+            <Input placeholder="请输入卡号前缀" />
           </FormItem>
-          <FormItem label="生成数量" name="num" tooltip='生成数建议至多1000' rules={[{ required: true, message: '请输入正整数' }]}>
-            <InputNumber style={{width:'100%'}} min={1} placeholder="请输入" />
+          <FormItem label="生成数量" name="num" tooltip='生成数建议1~1000' rules={[{ required: true, message: '请输入正整数' }]}>
+            <InputNumber style={{width:'100%'}} min={1} max={1000} placeholder="请输入制卡数量1~1000" />
           </FormItem>
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={onCancel}>

src/pages/certificateIssuance/index.jsx

@@ -98,7 +98,7 @@ export default (props) => {
         <Button key={1} style={{ padding: 0 }} type="link"
           onClick={() => goDetail(record.applyId)}
         >
-          发放
+          发证
         </Button>
       ],
     },

src/pages/certificateIssuance/issuance.jsx

@@ -14,20 +14,21 @@ export default (props) => {
   const { id } = location.query;
   const [application, setApplication] = useState({});
   const [loading, setLoading] = useState(false)
+  const [form] = Form.useForm();
   //需要改一下
-  const handleMake = () => {
-    if (application.originCardNo) {
+  const handleMake = (value) => {
+    if (value.originCardNo) {
       if (
         (application.applyMethod == 2
-          && application.trackingType
-          && application.trackingNo)
+          && value.trackingType
+          && value.trackingNo)
         || application.applyMethod == 1) {
         setLoading(true)
         var data = {
-          cardNo: application.originCardNo,
+          cardNo: value.originCardNo,
           makeStatus: application.makeStatus,
-          trackingType: application.trackingType,
-          trackingNo: application.trackingNo
+          trackingType: value.trackingType,
+          trackingNo: value.trackingNo
         }
         updateMake(id, data).then(() => {
           message.success('操作成功');
@@ -47,6 +48,7 @@ export default (props) => {
   }
   useEffect(() => {
     getApplicationDetail(id).then((res) => {
+      form.setFieldsValue(res);
       setApplication(res)
     }).catch((err) => {
       console.log(err.message)
@@ -55,7 +57,7 @@ export default (props) => {
   return (
     <PageHeaderWrapper    >
       <Card>
-        <Form {...formItemLayout}>
+        <Form {...formItemLayout} onFinish={handleMake} form={form}>
           <FormItem label="犬主">
             {application?.personName}
           </FormItem>
@@ -118,29 +120,28 @@ export default (props) => {
                     ? '已支付' : ''
             }
           </FormItem>
-          <FormItem label="证件号">
+          <FormItem label="证件号" name='originCardNo' rules={[{ required: true, message: '请输入证件号' }]}>
             <Input
-              value={application.originCardNo}
               style={{ width: '350px' }}
               readOnly={application?.makeStatus != 0}
               placeholder='请输入证件号（必填）'
-              onChange={e => setApplication({ ...application, originCardNo: e.target.value })} />
+            />
           </FormItem>
           {
             application.applyMethod == 2 && <>
-              <FormItem label="快递公司">
-                <Input value={application.trackingType}
+              <FormItem label="快递公司" name='trackingType' rules={[{ required: true, message: '请输入快递公司' }]}>
+                <Input
                   style={{ width: '350px' }}
                   placeholder='请输入快递公司（必填）'
                   readOnly={application?.makeStatus != 0}
-                  onChange={e => setApplication({ ...application, trackingType: e.target.value })} />
+                 />
               </FormItem>
-              <FormItem label="快递单号">
-                <Input value={application.trackingNo}
+              <FormItem label="快递单号" name='trackingNo' rules={[{ required: true, message: '请输入快递公司' }]}>
+                <Input
                   style={{ width: '350px' }}
                   placeholder='请输入快递单号（必填）'
                   readOnly={application?.makeStatus != 0}
-                  onChange={e => setApplication({ ...application, trackingNo: e.target.value })} />
+                />
               </FormItem>
             </>
           }
@@ -149,7 +150,8 @@ export default (props) => {
               application?.makeStatus == 0 &&
               <>
                 <Button type="primary" loading={loading}
-                  style={{ marginRight: '16px' }} onClick={() => handleMake()}>
+                htmlType="Submit"
+                  style={{ marginRight: '16px' }}>
                   发放
                 </Button>
               </>

src/pages/examine/detail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Form, Button, Image, Input, message } from 'antd';
+import { Card, Form, Button, Image, Input, message, Radio, Modal } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getApplicationDetail, updateAudit, getPetCardNo } from '@/services/application'
 import { history } from 'umi';
@@ -15,6 +15,7 @@ export default (props) => {
   const { id } = location.query;
   const [application, setApplication] = useState({});
   const [rejectReason, setRejectReason] = useState();
+  const [examineType, SetExamineType] = useState(1);
   const [loading, setLoading] = useState(false)
 
   const getAudit = (val) => {
@@ -28,29 +29,44 @@ export default (props) => {
       setLoading(false)
     })
   }
-  const handleAudit = (val) => {
-    if ((val == 2 && rejectReason) || val == 1) {
-      if (val == 1 && application.applyType == 'first') {
+  const handleAudit = () => {
+    if ((examineType == 2 && rejectReason) || examineType == 1) {
+      if (examineType == 1 && application.applyType == 'first') {
         getPetCardNo(application.petId).then((res) => {
           if (!res) {
-            getAudit(val);
+            getAudit(examineType);
           } else {
-            message.info('该宠物已有犬证，请驳回犬主申请');
+            message.info('该宠物已有犬证，请拒绝犬主办证申请');
           }
         })
       } else {
-        getAudit(val);
+        getAudit(examineType);
       }
     }
     else {
       message.success('请输入处理结果');
     }
   }
+  //列表切换通知状态方法
+  const handleOK = (record, data) => {
+    const title = examineType == 1
+      ? '您确定要通过该申请吗'
+      : '您确定要拒绝该申请吗';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        handleAudit()
+      },
+    });
+  };
 
   useEffect(() => {
     getApplicationDetail(id).then((res) => {
       setApplication(res)
       setRejectReason(res.rejectReason)
+      if (res.verifyStatus == 2) { SetExamineType(2) }
     }).catch((err) => {
       console.log(err.message)
     });
@@ -121,8 +137,14 @@ export default (props) => {
                     ? '已支付' : ''
             }
           </FormItem>
+          <FormItem label="审核意见">
+            <Radio.Group onChange={e =>{if(application.verifyStatus==0)SetExamineType(e.target.value)}} value={examineType}>
+              <Radio value={1}>同意</Radio>
+              <Radio value={2}>拒绝</Radio>
+            </Radio.Group>
+          </FormItem>
           {
-            application.verifyStatus != 1 &&
+            application.verifyStatus != 1 && 
             <FormItem label="驳回原因">
               <TextArea placeholder='请输入驳回原因' rows='3'
                 style={{ width: '350px' }}
@@ -135,16 +157,11 @@ export default (props) => {
           <FormItem label=" " colon={false}>
             {
               application.verifyStatus == 0 &&
-              <>
-                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(1)}>
-                  同意
-                </Button>
-                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(2)}>
-                  拒绝
-                </Button>
-              </>
+              <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={handleOK}>
+                确定
+              </Button>
             }
-            <Button type="default" onClick={() => goBack()}>
+            <Button type="default" onClick={goBack}>
               返回
             </Button>
           </FormItem>