bug fix

src/pages/eContract/seal/components/AddSeal.jsx

@@ -7,7 +7,9 @@ import request from '../../../../utils/request';
 
 const AddSeal = props => {
   const companyId = props.companyId
+  
   function close(e){
+    props.form.resetFields();
     props.onCancel(e)
   }
 
@@ -18,6 +20,7 @@ const AddSeal = props => {
         request({ ...apis.seal.addSeal, data: { ...values, companyId: companyId },}).then((data) => {
           message.info("保存成功")
           props.onSuccess({visable:false, companyId: companyId});
+          props.form.resetFields();
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
@@ -77,7 +80,7 @@ const AddSeal = props => {
                 message: '请填写印章名称',
                 },
             ],
-            })(<Input maxLength={10}/>)}
+            })(<Input maxLength={10} placeholder="如公章、法人章、发票章、财务章、合同章等"/>)}
         </Form.Item>
         <Form.Item label="印章图" help="166*166 像素，PNG格式透明底 ">
             {getFieldDecorator('sealImg', {

src/pages/eContract/seal/components/SealList.jsx

@@ -50,8 +50,12 @@ const header = props => {
      // 重置搜索
      function handleReset () {
       props.form.resetFields();
+      getCompanyData({companyId: companyId});
     }
 
+    function back(){
+      router.go(-1)
+    }
     function addSealInfo(){
       setSealInfo({visable: true, companyId: companyId})
     }
@@ -70,6 +74,12 @@ const header = props => {
       getCompanyData(e)
     }
 
+    function updateOnCancel(e) {
+      console.log(e, 'cancel')
+      setUpdateSeal(e);
+      getCompanyData({companyId: e.companyId})
+    }
+
     const delSealInfo = (row) => {
       Modal.confirm({
           title: '删除后无法再使用这些章继续签章，不会影响已签署的合同',
@@ -150,9 +160,10 @@ const header = props => {
       </Form>
         <div style={{marginTop:'20px', marginBottom:'20px'}}>
           <Button type="danger" onClick={() => addSealInfo({visable:true})} >新增</Button>
+          <Button style={{marginLeft:'20px'}} onClick={() => back()} >返回</Button>
         </div>
         <AddSeal visible={sealInfo.visable} companyId={sealInfo.companyId} onCancel={e => setSealInfo(e)} onSuccess={e => getList(e)}/>  
-        <UpdateSeal visible={updateSeal.visable} sealId={updateSeal.sealId} companyId={updateSeal.companyId} onCancel={e => setUpdateSeal(e)} onSuccess={e => updateOnSuccess(e)}/>  
+        <UpdateSeal visible={updateSeal.visable} sealId={updateSeal.sealId} companyId={updateSeal.companyId} onCancel={e => updateOnCancel(e)} onSuccess={e => updateOnSuccess(e)}/>  
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       </>
     )

src/pages/eContract/seal/components/UpdateSeal.jsx

@@ -23,16 +23,19 @@ const UpdateSeal = props => {
   }  
 
   function close(e){
-    props.onSuccess(e)
+    props.onCancel(e)
   }
 
+  function success(e){
+    props.onSuccess(e)
+  }
   function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err){
         request({ ...apis.seal.updateSealById, urlData:{id: sealId}, data: { ...values, id: sealId, companyId: companyId },}).then((data) => {
           message.info("保存成功")
-          close({visable:false, sealId:'', companyId: companyId})
+          success({visable:false, sealId:'', companyId: companyId})
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
@@ -82,7 +85,7 @@ const UpdateSeal = props => {
   const { getFieldDecorator } = props.form
 
   return (
-    <Modal footer={null} title="修改印章" visible={props.visible} onCancel={() => close({visable:false, sealId:''})} width={800}>
+    <Modal footer={null} title="修改印章" visible={props.visible} onCancel={() => close({visable:false, companyId:companyId, sealId:''})} width={800}>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="印章名称">
             {getFieldDecorator('sealName',{initialValue:sealData.sealName,
@@ -104,7 +107,7 @@ const UpdateSeal = props => {
         <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
             <Button type="primary" htmlType="submit">确定</Button>
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <Button onClick={() => close({visable:false, sealId:''})}>取消</Button>
+            <Button onClick={() => close({visable:false, companyId: companyId, sealId:''})}>取消</Button>
          </Form.Item>
       </Form>
     </Modal>