.

src/pages/cardNoList/index.jsx

@@ -81,7 +81,7 @@ export default (props) => {
         footer={null}
       >
         <Form {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="卡号前缀" name="prefix" rules={[{ required: true, message: '请输入' }]}>
+          <FormItem label="卡号前缀" name="prefix" rules={[{ required: true, message: '请输入卡号前缀' }]}>
             <Input placeholder="请输入卡号前缀" />
           </FormItem>
           <FormItem label="生成数量" name="num" tooltip='生成数建议1~1000' rules={[{ required: true, message: '请输入正整数' }]}>

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>
               </>