Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

config/routes.js

@@ -695,6 +695,12 @@ export default [
                 name: '合同管理',
                 component: './eContract/manage/list',
               },
+              {
+                path: '/eContract/manage/edit',
+                name: '查看详情',
+                hideInMenu: true,
+                component: './eContract/manage/edit',
+              },
               {
                 path: '/eContract/template/add',
                 name: '新增合同模板',

src/pages/eContract/manage/edit.jsx

@@ -0,0 +1,146 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import Styles from './styles.less';
+import router from 'umi/router';
+import moment from 'moment';
+
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+
+import AuthButton from '@/components/AuthButton';
+
+
+const header = props => {
+
+    const id = props.location.query.id
+
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+
+        getList(id);
+
+
+    }, [])
+
+    const getList = (id) => {
+        // console.log(params);
+        console.log(id)
+        request({ ...apis.manage.detail, urlData: { id: id } }).then((data) => {
+
+            setData(data)
+
+        })
+    }
+
+    const onArchives = () => {
+        request({
+            ...apis.manage.archives,
+            urlData: { id: id },
+            data: { contractId: parseInt(id) , archives: true }
+        }).then((data) => {
+
+
+
+        })
+    }
+
+    const datas = [
+        {
+            name: "合同标题",
+            value: data.contractName
+        },
+        {
+            name: "关联业务类型",
+            value: data.targetType
+        },
+        {
+            name: "关联业务",
+            value: data.targetName
+
+        },
+        {
+            name: "关联单据类型",
+            value: data.invoiceTargetType
+        },
+        {
+            name: "关联单据编号",
+            value: data.invoiceTargetId
+        },
+        {
+            name: "甲方名称",
+            value: data.signatoryName,
+
+        },
+        {
+            name: "甲方签署时间",
+            value: data.signatoryTime,
+            render: <><span>{data.signatoryTime ? moment(data.signatoryTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+        {
+            name: "乙方名称",
+            value: data.customerName
+        },
+        {
+            name: "乙方手机号",
+            value: data.customerTel
+        },
+        {
+            name: "乙方身份证号",
+            value: data.customerIdcard
+        },
+        {
+            name: "乙方签署时间",
+            value: data.customerTime,
+            render: <><span>{data.customerTime ? moment(data.customerTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+        {
+            name: "已签署合同",
+            // value:data.,
+            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: "是否归档",
+            value: data.archives,
+            render: (x, row) => <><span>{data.archives ? '是' : '否'}</span>{!data.archives &&<a onClick={() => onArchives(data.contractId)} style={{ color: '#1D74D9',marginLeft:'30px' }}>归档</a>}  </>
+        },
+        {
+            name: "归档时间",
+            value: data.archivesTime,
+            render: <><span>{data.archivesTime ? moment(data.archivesTime).format('YYYY-MM-DD HH:mm:ss') : ''}</span></>
+        },
+    ]
+
+
+    return (
+
+        <>
+
+            {datas.map((x) => {
+                return <Row style={{ margin: '20px 0' }}>
+
+                    <Col span={5} className={Styles.title} align="right" >
+                        {x.name}
+                    </Col>
+                    <Col span={9} offset={2} className={Styles.text}>
+                        {
+                            x.render ? typeof x.render === 'function' ? x.render(props) : x.render : x.value
+                        }
+
+                    </Col>
+                    <Col span={2} offset={4}>
+
+                    </Col>
+
+                </Row>
+            })}
+            <div align="center"><Button className={Styles.rebtn} onClick={()=>router.go(-1)}>返回</Button></div>
+
+        </>
+    )
+}
+
+
+export default header

src/pages/eContract/manage/list.jsx

@@ -0,0 +1,309 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+
+  const [data, setData] = useState({})
+
+
+  useEffect(() => {
+
+    getList({ pageNum: 1, pageSize: 10 });
+
+
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    // console.log(params);
+    request({ ...apis.manage.list, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // 跳转到编辑
+  const toDetail = id => () => {
+    if (id) {
+      router.push({
+        pathname: '/eContract/manage/edit',
+        query: {
+          id: id,
+        },
+      });
+      return
+    }
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '合同标题',
+      dataIndex: 'contractName',
+      key: 'contractName',
+      align: 'center',
+    },
+    {
+      title: '甲方名称',
+      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.signatoryTime ? `${moment(row.signatoryTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
+    },
+    {
+      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.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',
+      key: 'handle',
+      align: 'center',
+      render: (text, row) => (
+        <AuthButton name="admin.h5Demand.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={toDetail(row.contractId)} >查看详情</a>
+        </AuthButton>
+      ),
+    },
+  ];
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setDemandIds(selectedRows)
+    },
+  };
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  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.archivesStartDate = moment(values.startCreateDate).format('YYYY-MM-DD HH:mm:ss')
+    //     }
+    //     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() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  //   function showBatchDel(e){
+
+  //     if (demandIds.length <= 0){
+  //       message.info("请选择数据");
+  //       return;
+  //     }
+  //     setBatchDel(e);
+  //     if(!e.visable){
+  //       getList()
+  //     }
+  //   }
+
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('contractName', {
+            // initialValue: sampleName
+          })(
+            <Input
+              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="请输入甲方名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('customerName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入乙方名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('customerStatus')(
+            <Select style={{ width: '180px' }} placeholder="甲方是否签署">
+              <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="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>
+            </Select>
+          )}
+        </Form.Item>
+
+        <Form.Item>
+        
+          {getFieldDecorator('archivesDate')(
+            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />
+          )}
+        </Form.Item>
+
+        {/* <Form.Item>
+          {getFieldDecorator('archivesStartDate')(
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档开始时间" />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('archivesEndDate')(
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="归档结束时间" />,
+          )}
+        </Form.Item> */}
+
+        <Form.Item>
+          <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}>
+              重置
+                </Button>
+          </AuthButton>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.h5Demand.add.post" noRight={null}>
+        {/* <Button type="danger" onClick={() => addDemandInfo({visable:true})} className={styles.addBtn}>新增</Button> */}
+      </AuthButton>
+      <AuthButton name="admin.h5Demand.del" noRight={null}>
+        {/* <Button type="primary" onClick={() => showBatchDel({visable:true, demandIds: demandIds})} className={styles.addBtn} style={{marginLeft:'30px'}}>删除</Button> */}
+      </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" />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/eContract/manage/styles.less

@@ -0,0 +1,41 @@
+.title {
+    height     : 45px;
+    font-size  : 20px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color      : rgba(102, 102, 102, 1);
+    line-height: 45px;
+   
+}
+.text {
+    font-size  : 18px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color      : rgba(51, 51, 51, 1);
+    line-height: 45px;
+}
+
+.btn {
+    width        : 140px;
+    height       : 45px;
+    background   : rgba(255, 126, 72, 1);
+    border-radius: 7px;
+    line-height  : 43px;
+    font-size    : 20px;
+    font-family  : PingFangSC-Regular, PingFang SC;
+    font-weight  : 400;
+    color        : rgba(255, 255, 255, 1);
+    
+}
+
+.rebtn {
+    width:140px;
+    height:45px;
+    background:rgba(255,255,255,1);
+    border-radius:7px;
+    border:1px solid rgba(156,156,156,1);
+    font-size:20px;
+font-weight:400;
+color:rgba(102,102,102,1);
+line-height:28px;
+}

src/pages/h5SampleManager/h5Sample/list.jsx

@@ -48,7 +48,7 @@ function CartBody(props) {
     <Card
       hoverable
       onClick={() => toEdi(data)}
-      style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+      style={{ minWidth: '330px', borderRadius: '12px', margin: '10px 20px 10px 0', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
     // cover={}
     // bodyStyle={{ padding: '10px 20px' }}
     >
@@ -61,7 +61,7 @@ function CartBody(props) {
 
       }
       <img className={Styles.cover} style={{ backgroundImage: `url('` + data.coverImg + `')` }}   ></img>
-      <p className={Styles.cardText} style={{ padding: '0.05rem 0.096rem' }}>
+      <p className={Styles.cardText} style={{ padding: '0.1rem 0.096rem',marginBottom:'0px' }}>
         {/* <span className={Styles.title}>样例名</span> */}
         <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>{data.sampleName}</span>
       </p>
@@ -177,7 +177,7 @@ function body(props) {
       </Form>
 
       {/* 卡片内容，显示楼盘项目  */}
-      <Row style={{ padding: ' 0 10px' }}>
+      <Row style={{ paddingTop: ' 16px' }}>
         {
           dataSource.records.map((item, _) => (
             <Col span={8}>

src/services/apis.js

@@ -1547,5 +1547,23 @@ export default {
       url: `${prefix}/taContractTemplate/:id`,
       action: 'admin.getContractTemplate.get',
     },
+   
+  },
+  manage: {
+    list: {
+      method: 'GET',
+      url: `${prefix}/contract/list`,
+      action: 'admin.contract.list.get',
+    },
+    detail: {
+      method: 'GET',
+      url: `${prefix}/contract/:id`,
+      action: 'admin.contract.id.get',
+    },
+    archives: {
+      method: 'PUT',
+      url: `${prefix}/contract/:id`,
+      action: 'admin.contract.id.put',
+    },
   },
 }