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

src/components/SettingRow/index.jsx

@@ -26,8 +26,7 @@ const SettingRow = (props) => {
   };
   return (
     <div style={{ marginBottom:'16px' }}>
-      <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} />
+      <Input style={{ width: '360px',marginRight:value.desc?'16px':'0' }} value={val} onChange={handleChange} onInput={handleInput} />
       {value.desc?'('+value.desc+')':''}
       <Button
         type="text"

src/pages/BasicParameters/index.jsx

@@ -1,9 +1,11 @@
-import { Card, message } from 'antd';
+import { Card, message, Form } from 'antd';
 import { useEffect, useState } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { getSetting, updateSetting } from '@/services/setting';
 import SettingRow from '@/components/SettingRow';
 
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const FormItem = Form.Item;
 export default (props) => {
   const [data, setData] = useState([]);
 
@@ -26,9 +28,13 @@ export default (props) => {
   return (
     <PageHeaderWrapper>
       <Card>
-        {data.map((item) => {
-          return <SettingRow key={item.settingId} value={item} onChange={handleChange} />;
-        })}
+        <Form {...formItemLayout}>
+          {data.map((item) => {
+            return <FormItem key={item.settingId} label={item.title}>
+              <SettingRow value={item} onChange={handleChange} />
+            </FormItem>
+          })}
+        </Form>
       </Card>
     </PageHeaderWrapper>
   );

src/pages/applicationList/detail.jsx

@@ -138,7 +138,7 @@ export default (props) => {
             orderStatus == 3 &&
             <FormItem label="驳回原因">
               <TextArea placeholder='请输入驳回原因' rows='3'
-                style={{ width: '350px' }}
+                style={{ width: '360px' }}
                 value={application.rejectReason}
                 readOnly
               />

src/pages/banner/edit.jsx

@@ -62,7 +62,7 @@ export default (props) => {
               <UploadImage value={image} onChange={setImage} />
             </FormItem>
             <FormItem label="排序" name="sortNo" rules={[{ required: true, message: '请输入' }]}>
-              <InputNumber min={0} placeholder="请输入排序" style={{ width: '350px' }} />
+              <InputNumber min={0} placeholder="请输入排序" style={{ width: '360px' }} />
             </FormItem>
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>

src/pages/certificateIssuance/issuance.jsx

@@ -122,7 +122,7 @@ export default (props) => {
           </FormItem>
           <FormItem label="证件号" name='originCardNo' rules={[{ required: true, message: '请输入证件号' }]}>
             <Input
-              style={{ width: '350px' }}
+              style={{ width: '360px' }}
               readOnly={application?.makeStatus != 0}
               placeholder='请输入证件号（必填）'
             />
@@ -131,14 +131,14 @@ export default (props) => {
             application.applyMethod == 2 && <>
               <FormItem label="快递公司" name='trackingType' rules={[{ required: true, message: '请输入快递公司' }]}>
                 <Input
-                  style={{ width: '350px' }}
+                  style={{ width: '360px' }}
                   placeholder='请输入快递公司（必填）'
                   readOnly={application?.makeStatus != 0}
                  />
               </FormItem>
               <FormItem label="快递单号" name='trackingNo' rules={[{ required: true, message: '请输入快递公司' }]}>
                 <Input
-                  style={{ width: '350px' }}
+                  style={{ width: '360px' }}
                   placeholder='请输入快递单号（必填）'
                   readOnly={application?.makeStatus != 0}
                 />

src/pages/examine/detail.jsx

@@ -144,10 +144,10 @@ export default (props) => {
             </Radio.Group>
           </FormItem>
           {
-            application.verifyStatus != 1 && 
+            application.verifyStatus != 1 && examineType == 2 &&
             <FormItem label="驳回原因">
               <TextArea placeholder='请输入驳回原因' rows='3'
-                style={{ width: '350px' }}
+                style={{ width: '360px' }}
                 value={rejectReason}
                 readOnly={application.verifyStatus == 2}
                 onChange={(e) => setRejectReason(e.target.value)}

src/pages/notice/edit.jsx

@@ -45,7 +45,7 @@ export default (props) => {
         .then((res) => {
           setLoading(false);
           message.success('数据保存成功');
-          history.replace(`./edit.jsx?id=${res.noticeId}`);
+          goBack();
         })
         .catch((err) => {
           setLoading(false);
@@ -71,16 +71,16 @@ export default (props) => {
         <ProCard.TabPane key={1} tab="通知编辑">
           <Form {...formItemLayout} onFinish={Submit} form={form}>
             <FormItem label="标题" name="title" rules={[{ required: true, message: '请输入' }]}>
-              <Input placeholder="请输入" style={{ width: '350px' }} />
+              <Input placeholder="请输入" style={{ width: '360px' }} />
             </FormItem>
             <FormItem label="正文" name='content' rules={[{ required: true, message: '请输入' }]}>
               <RichEditor ref={editorRef} />
             </FormItem>
             <FormItem label="权重" name="weight" rules={[{ required: true, message: '请输入' }]}>
-              <InputNumber min={0} placeholder="请输入权重" style={{ width: '350px' }} />
+              <InputNumber min={0} placeholder="请输入权重" style={{ width: '360px' }} />
             </FormItem>
             <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
-              <Select placeholder="请选择是否发布" style={{ width: '350px' }}>
+              <Select placeholder="请选择是否发布" style={{ width: '360px' }}>
                 <Option value={1}>发布</Option>
                 <Option value={0}>未发布</Option>
               </Select>