zls

src/pages/eContract/manage/edit.jsx

@@ -99,7 +99,7 @@ const header = props => {
         {
             name: "已签署合同",
             // value:data.,
-            render: (x, row) => <><a href={data.contractViewUrl}><Button type="primary"  className={Styles.btn}>查看合同</Button></a> <a href={data.contractDownloadUrl} style={{ color: '#1D74D9',marginLeft:'30px' }}>下载合同</a> </>
+            render: (x, row) => <><a href={data.contractViewUrl} target = "_blank"><Button type="primary"  className={Styles.btn}>查看合同</Button></a> <a href={data.contractDownloadUrl} download="234.pdf" style={{ color: '#1D74D9',marginLeft:'30px' }}>下载合同</a> </>
         },
         {
             name: "是否归档",
@@ -136,7 +136,7 @@ const header = props => {
 
                 </Row>
             })}
-            <div align="center"><Button className={Styles.rebtn} >返回</Button></div>
+            <div align="center"><Button className={Styles.rebtn} onClick={()=>router.go(-1)}>返回</Button></div>
 
         </>
     )

src/pages/eContract/manage/list.jsx

@@ -21,10 +21,10 @@ const header = props => {
 
 
   useEffect(() => {
-   
-      getList({ pageNum: 1, pageSize: 10});
-   
-    
+
+    getList({ pageNum: 1, pageSize: 10 });
+
+
   }, [])
 
   // 查询列表
@@ -38,13 +38,13 @@ const header = props => {
 
   // 跳转到编辑
   const toDetail = id => () => {
-    if(id) {
+    if (id) {
       router.push({
-      pathname: '/eContract/manage/edit',
-      query: {
-        id: id,
-      },
-    });
+        pathname: '/eContract/manage/edit',
+        query: {
+          id: id,
+        },
+      });
       return
     }
   }
@@ -68,57 +68,59 @@ const header = props => {
       dataIndex: 'signatoryName',
       key: 'signatoryName',
       align: 'center',
-      
+
     },
     {
       title: '甲方是否签署',
       dataIndex: 'signatoryStatus',
       key: 'signatoryStatus',
       align: 'center',
+      render: (x, row) => <><span>{row.signatoryStatus === 1 ? '是' :  row.signatoryStatus===0?'否':''}</span></>
     },
     {
       title: '甲方签署时间',
       dataIndex: 'signatoryTime',
       key: 'signatoryTime',
       align: 'center',
-      render: (x, row) => <><span>{row.invalidTime?`${moment(row.signatoryTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
+      render: (x, row) => <><span>{row.signatoryTime ? `${moment(row.signatoryTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
     },
     {
-        title: '乙方名称',
-        dataIndex: 'customerName',
-        key: 'customerName',
-        align: 'center',
-        
-      },
+      title: '乙方名称',
+      dataIndex: 'customerName',
+      key: 'customerName',
+      align: 'center',
+
+    },
     {
       title: '乙方是否签署',
       dataIndex: 'demandStatus',
       key: 'demandStatus',
       align: 'center',
-      
+      render: (x, row) => <><span>{row.demandStatus === 1 ? '是' : row.demandStatus===0?'否':''}</span></>
+
     },
     {
-        title: '乙方签署时间',
-        dataIndex: 'customerTime',
-        key: 'customerTime',
-        align: 'center',
-        render: (x, row) => <><span>{row.invalidTime?`${moment(row.customerTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
-      },
-      {
-        title: '是否归档',
-        dataIndex: 'archives',
-        key: 'archives',
-        align: 'center',
-        render: (x, row) =><><span>{row.archives?'是':'否'}</span></>
-        
-      },
-      {
-        title: '归档时间',
-        dataIndex: 'archivesTime',
-        key: 'archivesTime',
-        align: 'center',
-        render: (x, row) => <><span>{row.invalidTime?`${moment(row.archivesTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
-      },
+      title: '乙方签署时间',
+      dataIndex: 'customerTime',
+      key: 'customerTime',
+      align: 'center',
+      render: (x, row) => <><span>{row.customerTime ? `${moment(row.customerTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
+    {
+      title: '是否归档',
+      dataIndex: 'archives',
+      key: 'archives',
+      align: 'center',
+      render: (x, row) => <><span>{row.archives ? '是' : '否'}</span></>
+
+    },
+    {
+      title: '归档时间',
+      dataIndex: 'archivesTime',
+      key: 'archivesTime',
+      align: 'center',
+      render: (x, row) => <><span>{row.archivesTime ? `${moment(row.archivesTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
     {
       title: '操作',
       dataIndex: 'handle',
@@ -131,7 +133,7 @@ const header = props => {
       ),
     },
   ];
-  
+
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
@@ -146,37 +148,53 @@ const header = props => {
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        let {archivesDate, ...submitValue} = values
+        if(null != archivesDate && archivesDate.length > 0){
+          const [archivesStartDate, archivesEndDate] = archivesDate
+          submitValue.archivesStartDate = moment(archivesStartDate).format('YYYY-MM-DD');
+          submitValue.archivesEndDate = moment(archivesEndDate).format('YYYY-MM-DD');
+        }else{
+          submitValue.archivesStartDate = null
+          submitValue.archivesEndDate = null
+        }        
+        console.log(submitValue)
+        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+      }
+    });
     // props.form.validateFields((err, values) => {
     //   if (!err) {
-        
-    //     if (values.startCreateDate != null){
-    //       values.startCreateDate = moment(values.startCreateDate).format('YYYY-MM-DD HH:mm:ss')
+
+    //     if (values.startCreateDate != null) {
+    //       values.archivesStartDate = moment(values.startCreateDate).format('YYYY-MM-DD HH:mm:ss')
     //     }
-    //     if (values.endCreateDate != null){
+    //     if (values.endCreateDate != null) {
     //       values.endCreateDate = moment(values.endCreateDate).format('YYYY-MM-DD HH:mm:ss')
     //     }
     //     getList({ pageNum: 1, pageSize: 10, ...values })
     //   }
     // });
+    // getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
   }
 
   //重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })
   }
 
-//   function showBatchDel(e){
-  
-//     if (demandIds.length <= 0){
-//       message.info("请选择数据");
-//       return;
-//     }
-//     setBatchDel(e);
-//     if(!e.visable){
-//       getList()
-//     }
-//   }
+  //   function showBatchDel(e){
+
+  //     if (demandIds.length <= 0){
+  //       message.info("请选择数据");
+  //       return;
+  //     }
+  //     setBatchDel(e);
+  //     if(!e.visable){
+  //       getList()
+  //     }
+  //   }
 
 
 
@@ -186,21 +204,21 @@ const header = props => {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('contractName',{
+          {getFieldDecorator('contractName', {
             // initialValue: sampleName
           })(
             <Input
-            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-            placeholder="合同标题"
-          />,
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="合同标题"
+            />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('signatoryName')(
             <Input
-            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-            placeholder="请输入甲方名称"
-          />,
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入甲方名称"
+            />,
           )}
         </Form.Item>
         <Form.Item>
@@ -214,55 +232,61 @@ const header = props => {
         <Form.Item>
           {getFieldDecorator('customerStatus')(
             <Select style={{ width: '180px' }} placeholder="甲方是否签署">
-                <option value="2">全部</option>
-                <option value="1">已提交</option>
-                <option value="0">处理中</option>
-               
+              <option value="">全部</option>
+              <option value="1">是</option>
+              <option value="0">否</option>
+
             </Select>
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('demandStatus')(
             <Select style={{ width: '180px' }} placeholder="乙方是否签署">
-                <option value="">全部</option>
-                <option value="1">已提交</option>
-                <option value="2">处理中</option>
-                <option value="3">已交付</option>
-                <option value="4">作废</option>
+              <option value="">全部</option>
+              <option value="1">是</option>
+              <option value="0">否</option>
             </Select>
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('archives')(
             <Select style={{ width: '180px' }} placeholder="是否归档">
-                <option value="">全部</option>
-                <option value={true}>是</option>
-                <option value={false}>否</option>
+              <option value="">全部</option>
+              <option value={true}>是</option>
+              <option value={false}>否</option>
             </Select>
           )}
         </Form.Item>
+
         <Form.Item>
+        
+          {getFieldDecorator('archivesDate')(
+            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />
+          )}
+        </Form.Item>
+
+        {/* <Form.Item>
           {getFieldDecorator('archivesStartDate')(
-            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档开始时间"/>,
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档开始时间" />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('archivesEndDate')(
-            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档结束时间"/>,
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档结束时间" />,
           )}
-        </Form.Item>  
-       
+        </Form.Item> */}
+
         <Form.Item>
-            <AuthButton name="admin.taShareActivity.search" noRight={null}>
-                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-                    搜索
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
                 </Button>
-            </AuthButton>
-            <AuthButton name="admin.taShareActivity.search" noRight={null}>
-                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-                        重置
+          </AuthButton>
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
                 </Button>
-            </AuthButton>
+          </AuthButton>
         </Form.Item>
       </Form>
       <AuthButton name="admin.h5Demand.add.post" noRight={null}>
@@ -273,7 +297,7 @@ const header = props => {
       </AuthButton>
       {/* <AddDemand visible={addDemand.visable} onCancel={() => addDemandInfo({visable:false})}></AddDemand> */}
       {/* <BatchDel visible={batchDel.visable} demandIds={batchDel.demandIds} onCancel={() => showBatchDel({visable:false, demandIds: ''})} onSuccess={() => showBatchDel({visable:false, demandIds:'' })}/> */}
-      <Table  style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>