魏超 5 years ago
parent
commit
c64fadb0c3

+ 4
- 1
src/pages/eContract/seal/components/AddSeal.jsx View File

7
 
7
 
8
 const AddSeal = props => {
8
 const AddSeal = props => {
9
   const companyId = props.companyId
9
   const companyId = props.companyId
10
+  
10
   function close(e){
11
   function close(e){
12
+    props.form.resetFields();
11
     props.onCancel(e)
13
     props.onCancel(e)
12
   }
14
   }
13
 
15
 
18
         request({ ...apis.seal.addSeal, data: { ...values, companyId: companyId },}).then((data) => {
20
         request({ ...apis.seal.addSeal, data: { ...values, companyId: companyId },}).then((data) => {
19
           message.info("保存成功")
21
           message.info("保存成功")
20
           props.onSuccess({visable:false, companyId: companyId});
22
           props.onSuccess({visable:false, companyId: companyId});
23
+          props.form.resetFields();
21
         }).catch((err) => {
24
         }).catch((err) => {
22
           message.info(err.msg || err.message)
25
           message.info(err.msg || err.message)
23
         })
26
         })
77
                 message: '请填写印章名称',
80
                 message: '请填写印章名称',
78
                 },
81
                 },
79
             ],
82
             ],
80
-            })(<Input maxLength={10}/>)}
83
+            })(<Input maxLength={10} placeholder="如公章、法人章、发票章、财务章、合同章等"/>)}
81
         </Form.Item>
84
         </Form.Item>
82
         <Form.Item label="印章图" help="166*166 像素,PNG格式透明底 ">
85
         <Form.Item label="印章图" help="166*166 像素,PNG格式透明底 ">
83
             {getFieldDecorator('sealImg', {
86
             {getFieldDecorator('sealImg', {

+ 12
- 1
src/pages/eContract/seal/components/SealList.jsx View File

50
      // 重置搜索
50
      // 重置搜索
51
      function handleReset () {
51
      function handleReset () {
52
       props.form.resetFields();
52
       props.form.resetFields();
53
+      getCompanyData({companyId: companyId});
53
     }
54
     }
54
 
55
 
56
+    function back(){
57
+      router.go(-1)
58
+    }
55
     function addSealInfo(){
59
     function addSealInfo(){
56
       setSealInfo({visable: true, companyId: companyId})
60
       setSealInfo({visable: true, companyId: companyId})
57
     }
61
     }
70
       getCompanyData(e)
74
       getCompanyData(e)
71
     }
75
     }
72
 
76
 
77
+    function updateOnCancel(e) {
78
+      console.log(e, 'cancel')
79
+      setUpdateSeal(e);
80
+      getCompanyData({companyId: e.companyId})
81
+    }
82
+
73
     const delSealInfo = (row) => {
83
     const delSealInfo = (row) => {
74
       Modal.confirm({
84
       Modal.confirm({
75
           title: '删除后无法再使用这些章继续签章,不会影响已签署的合同',
85
           title: '删除后无法再使用这些章继续签章,不会影响已签署的合同',
150
       </Form>
160
       </Form>
151
         <div style={{marginTop:'20px', marginBottom:'20px'}}>
161
         <div style={{marginTop:'20px', marginBottom:'20px'}}>
152
           <Button type="danger" onClick={() => addSealInfo({visable:true})} >新增</Button>
162
           <Button type="danger" onClick={() => addSealInfo({visable:true})} >新增</Button>
163
+          <Button style={{marginLeft:'20px'}} onClick={() => back()} >返回</Button>
153
         </div>
164
         </div>
154
         <AddSeal visible={sealInfo.visable} companyId={sealInfo.companyId} onCancel={e => setSealInfo(e)} onSuccess={e => getList(e)}/>  
165
         <AddSeal visible={sealInfo.visable} companyId={sealInfo.companyId} onCancel={e => setSealInfo(e)} onSuccess={e => getList(e)}/>  
155
-        <UpdateSeal visible={updateSeal.visable} sealId={updateSeal.sealId} companyId={updateSeal.companyId} onCancel={e => setUpdateSeal(e)} onSuccess={e => updateOnSuccess(e)}/>  
166
+        <UpdateSeal visible={updateSeal.visable} sealId={updateSeal.sealId} companyId={updateSeal.companyId} onCancel={e => updateOnCancel(e)} onSuccess={e => updateOnSuccess(e)}/>  
156
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
167
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
157
       </>
168
       </>
158
     )
169
     )

+ 7
- 4
src/pages/eContract/seal/components/UpdateSeal.jsx View File

23
   }  
23
   }  
24
 
24
 
25
   function close(e){
25
   function close(e){
26
-    props.onSuccess(e)
26
+    props.onCancel(e)
27
   }
27
   }
28
 
28
 
29
+  function success(e){
30
+    props.onSuccess(e)
31
+  }
29
   function handleSubmit (e) {
32
   function handleSubmit (e) {
30
     e.preventDefault();
33
     e.preventDefault();
31
     props.form.validateFields((err, values) => {
34
     props.form.validateFields((err, values) => {
32
       if (!err){
35
       if (!err){
33
         request({ ...apis.seal.updateSealById, urlData:{id: sealId}, data: { ...values, id: sealId, companyId: companyId },}).then((data) => {
36
         request({ ...apis.seal.updateSealById, urlData:{id: sealId}, data: { ...values, id: sealId, companyId: companyId },}).then((data) => {
34
           message.info("保存成功")
37
           message.info("保存成功")
35
-          close({visable:false, sealId:'', companyId: companyId})
38
+          success({visable:false, sealId:'', companyId: companyId})
36
         }).catch((err) => {
39
         }).catch((err) => {
37
           message.info(err.msg || err.message)
40
           message.info(err.msg || err.message)
38
         })
41
         })
82
   const { getFieldDecorator } = props.form
85
   const { getFieldDecorator } = props.form
83
 
86
 
84
   return (
87
   return (
85
-    <Modal footer={null} title="修改印章" visible={props.visible} onCancel={() => close({visable:false, sealId:''})} width={800}>
88
+    <Modal footer={null} title="修改印章" visible={props.visible} onCancel={() => close({visable:false, companyId:companyId, sealId:''})} width={800}>
86
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
89
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
87
         <Form.Item label="印章名称">
90
         <Form.Item label="印章名称">
88
             {getFieldDecorator('sealName',{initialValue:sealData.sealName,
91
             {getFieldDecorator('sealName',{initialValue:sealData.sealName,
104
         <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
107
         <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
105
             <Button type="primary" htmlType="submit">确定</Button>
108
             <Button type="primary" htmlType="submit">确定</Button>
106
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
109
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
107
-            <Button onClick={() => close({visable:false, sealId:''})}>取消</Button>
110
+            <Button onClick={() => close({visable:false, companyId: companyId, sealId:''})}>取消</Button>
108
          </Form.Item>
111
          </Form.Item>
109
       </Form>
112
       </Form>
110
     </Modal>
113
     </Modal>