zls

src/pages/eContract/relatedOrganization/add.jsx

@@ -37,21 +37,17 @@ function header(props) {
       message.info("关联成功")
       router.push({
         pathname: '/eContract/relatedOrganization',
-        query: {
-          //   salesBatchId: data.salesBatchId,
-        },
       });
     }).catch((err) => {
       message.info(err.msg || err.message)
     })
   }
+
   const onChange = current => {
-    console.log('onChange:', current);
     setCurrent(current);
   };
 
   const onChoiceEnt = (value) => {
-    console.log("onChoiceEnt", value);
     ent = value.companyId
     setCurrent(1)
     setStatus({
@@ -80,8 +76,6 @@ function header(props) {
       >
         <Step status={status.ent} title="选择已认证企业" disabled />
         <Step status={status.org} title="选择关联的组织" disabled />
-        {/* <Step status="wait" title="Step 3" /> */}
-
       </Steps>
 
     </div>

src/pages/eContract/relatedOrganization/components/organization.jsx

@@ -16,7 +16,6 @@ function header(props) {
     const [ data, setData ] = useState({})
 
     useEffect(() => {
-        console.log('org')
         getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
@@ -41,7 +40,6 @@ function header(props) {
     }
 
     const choiceorg = value =>{
-        console.log(value,'org')
         props.onChoiceOrg(value)
     }
 
@@ -117,16 +115,10 @@ function header(props) {
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                 </Form.Item>
             </Form>
-
-            
-
             <Table id='noticeTable' style={{ marginTop: '30px' }}  dataSource={data.records} columns={columns} pagination={false} />
-
                 <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                     <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
                 </div>
-
-
         </div>
     </>)
 }

src/pages/eContract/relatedOrganization/index.jsx

@@ -9,9 +9,9 @@ import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 
 function header(props) {
-    
+
     const [taNoticeList, setTaNoticeList] = useState([])
-    const [ data, setData ] = useState({})
+    const [data, setData] = useState({})
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 });
@@ -25,33 +25,28 @@ function header(props) {
     }
 
     const toAdd = (id) => () => {
-        
-            router.push({
-                pathname: '/eContract/relatedOrganization/add',
-                  query: {
-                    id
-                  },
-            });
-        
-    }
 
-    const onDelete = rowData =>  {
-        // if (taNoticeList.length < 1) {
-        //     message.error('请至少选择一条数据')
-        //     return
-        // }
+        router.push({
+            pathname: '/eContract/relatedOrganization/add',
+            query: {
+                id
+            },
+        });
 
+    }
+
+    const onDelete = rowData => {
         Modal.confirm({
             title: '删除后组织将不能使用企业电子签章，确认删除？',
             okText: '确定',
             cancelText: '取消',
             onOk() {
-                request({ ...apis.relatedOrganization.delete, urlData: { id: rowData.companyOrgId }}).then((data) => {
+                request({ ...apis.relatedOrganization.delete, urlData: { id: rowData.companyOrgId } }).then((data) => {
                     message.info("操作成功")
                     getList({ pageNum: 1, pageSize: 10 });
-                  
-                  }).catch((err) => {
-                  })
+
+                }).catch((err) => {
+                })
             },
         });
     }
@@ -84,7 +79,7 @@ function header(props) {
             dataIndex: 'companyCode',
             key: 'companyCode',
             align: 'center',
-           
+
         },
         {
             title: '实名认证状态',
@@ -92,16 +87,16 @@ function header(props) {
             key: 'companyStatus',
             align: 'center',
             render: (companyStatus) => <>
-            {companyStatus === 0 && <span>未认证</span>}
-            {companyStatus === 1 && <span>管理员资料已提交</span>}
-            {companyStatus === 2 && <span>企业基本资料（没有申请表）已提交</span>}
-            {companyStatus === 3 && <span>已提交待审核</span>}
-            {companyStatus === 4 && <span>审核通过</span>}
-            {companyStatus === 5 && <span>审核不通过</span>}
-            {companyStatus === 6 && <span>人工初核通过</span>}
-           
+                {companyStatus === 0 && <span>未认证</span>}
+                {companyStatus === 1 && <span>管理员资料已提交</span>}
+                {companyStatus === 2 && <span>企业基本资料（没有申请表）已提交</span>}
+                {companyStatus === 3 && <span>已提交待审核</span>}
+                {companyStatus === 4 && <span>审核通过</span>}
+                {companyStatus === 5 && <span>审核不通过</span>}
+                {companyStatus === 6 && <span>人工初核通过</span>}
+
             </>,
-          
+
         },
         {
             title: '关联组织名',
@@ -114,22 +109,22 @@ function header(props) {
             dataIndex: 'orgId',
             key: 'orgId',
             align: 'center',
-           
-        }, 
+
+        },
         {
             title: '小程序名称',
             dataIndex: 'miniAppName',
             key: 'miniAppName',
             align: 'center',
-            
+
         },
-        
+
         {
             title: '关联时间',
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+            render: (x, row) => <><span>{row.createDate ? `${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
         },
         {
             title: '操作',
@@ -140,19 +135,19 @@ function header(props) {
                 <>
 
 
-                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={e=>onDelete(row)}>
-                    删除<Icon type="form" className={styles.edit} />
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={e => onDelete(row)}>
+                        删除<Icon type="form" className={styles.edit} />
                     </span>
 
                 </>
             ),
         },
-        
+
     ];
 
-     
+
     const { getFieldDecorator } = props.form
- 
+
     return (
 
         <>
@@ -210,11 +205,11 @@ function header(props) {
             </Form>
             <Button type="danger" className={styles.addBtn} onClick={toAdd()}>新增</Button>
 
-            <Table id='noticeTable'   dataSource={data.records} columns={columns} pagination={false} />
+            <Table id='noticeTable' dataSource={data.records} columns={columns} pagination={false} />
 
-                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
-                </div>
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
         </>
     )
 }

src/pages/eContract/signedContract/index.jsx

@@ -57,11 +57,11 @@ function header(props) {
                     submitValue.settlementStartTime = null
                     submitValue.settlementEndTime = null
                 }
-              
+
                 getList({ pageNum: 1, pageSize: 10, ...submitValue });
             }
         });
-       
+
     }
 
     function handleReset() {
@@ -69,25 +69,33 @@ function header(props) {
         getList({ pageNum: 1, pageSize: 10 });
     }
 
-    const toDelBatch = rowData => () => {
-        // if (taContractList.length < 1) {
-        //     message.error('请至少选择一条数据')
-        //     return
-        // }
-
-        Modal.confirm({
-            title: '确认将所选数据删除？',
-            okText: '确定',
-            cancelText: '取消',
-            onOk() {
-            
-                console.log(price,'price')
-            },
-        });
-    }
-
     const changePageNum = pageNumber => {
-        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                let { signatoryTime, settlementTime, ...submitValue } = values
+                if (null != signatoryTime && signatoryTime.length > 0) {
+                    const [signatoryStartTime, signatoryEndTime] = signatoryTime
+                    submitValue.signatoryStartTime = moment(signatoryStartTime).format('YYYY-MM-DD');
+                    submitValue.signatoryEndTime = moment(signatoryEndTime).format('YYYY-MM-DD');
+                } else {
+                    submitValue.signatoryStartTime = null
+                    submitValue.signatoryEndTime = null
+                }
+
+                if (null != settlementTime && settlementTime.length > 0) {
+                    const [settlementStartTime, settlementEndTime] = settlementTime
+                    submitValue.settlementStartTime = moment(settlementStartTime).format('YYYY-MM-DD');
+                    submitValue.settlementEndTime = moment(settlementEndTime).format('YYYY-MM-DD');
+                } else {
+                    submitValue.settlementStartTime = null
+                    submitValue.settlementEndTime = null
+                }
+
+                getList({ pageNum: pageNumber, pageSize: 10, ...submitValue });
+            }
+        });
+        // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
     }
 
 
@@ -161,7 +169,7 @@ function header(props) {
             dataIndex: 'settlement',
             key: 'settlement',
             align: 'center',
-        render: (x, row) =><><span>{row.settlement?'是':'否'}</span></>
+            render: (x, row) => <><span>{row.settlement ? '是' : '否'}</span></>
         },
         {
             title: '结算时间',
@@ -174,8 +182,8 @@ function header(props) {
             title: '结算单价',
             dataIndex: 'settlementPrice',
             key: 'settlementPrice',
-         
-            render: (x, row) =><><span>{row.settlementPrice? `￥ ${row.settlementPrice/100}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','):row.settlementPrice===0?0:''}</span></>
+
+            render: (x, row) => <><span>{row.settlementPrice ? `￥ ${row.settlementPrice / 100}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : row.settlementPrice === 0 ? 0 : ''}</span></>
         },
     ];
 
@@ -186,15 +194,15 @@ function header(props) {
             return
         }
         let count = 0
-        taContractList.map((x)=>{
-         
-            if(x.settlement) {
+        taContractList.map((x) => {
+
+            if (x.settlement) {
                 count++
             }
         })
         setCheckData(count)
-   
- setVisible(true);
+
+        setVisible(true);
 
     }
 
@@ -203,15 +211,13 @@ function header(props) {
     }
 
     const handleOk = val => {
-
-        console.log(price,'price')
-        request({ ...apis.signedContract.put, data:  { price: price||0, taContractList: taContractList }}).then(data => {
+        request({ ...apis.signedContract.put, data: { price: price || 0, taContractList: taContractList } }).then(data => {
             message.info("操作成功")
             setVisible(false);
             getList({ pageNum: 1, pageSize: 10 })
-            
+
         })
-        
+
     }
 
 
@@ -316,7 +322,7 @@ function header(props) {
             // footer={null} 
             >
                 <p>确认结算所选{taContractList.length}份合同手续费？其中{checkData}份已结算过，若不想再结算，请取消勾选。</p>
-                <div style={{  marginTop: '50px',textAlign:'center' }}>结算单价:<InputNumber  style={{  marginLeft: '10px',width:'150px' }} formatter={value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')} defaultValue={0} precision={2} onChange={onChange} />元/份</div>
+                <div style={{ marginTop: '50px', textAlign: 'center' }}>结算单价:<InputNumber style={{ marginLeft: '10px', width: '150px' }} formatter={value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')} defaultValue={0} precision={2} onChange={onChange} />元/份</div>