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

config/routes.js

@@ -712,13 +712,7 @@ export default [
                 name: '合同模板详情',
                 hideInMenu: true,
                 component: './eContract/template/detail',
-              },
-              {
-                path: '/eContract/template/pdfDetail',
-                name: '合同pdf查看页',
-                hideInMenu: true,
-                component: './eContract/template/pdfDetail',
-              },
+              }
             ],
           },
           // {

src/components/Wangedit/Wangedit.jsx

@@ -70,6 +70,7 @@ class Wangedit extends React.Component {
         /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
         /<[a-zA-Z0-9]+\:[^>]+\/>/ig,
         /<style>[\s\S]*?<\/style>/ig,
+        new RegExp('\u2029', 'ig'),     // 替换word分隔符 序号 8233
       ]
 
       return regs.reduce((acc, reg) => {

src/pages/eContract/businessConfig/add.jsx

@@ -66,7 +66,6 @@ const header = props => {
     setContractTemplateName(e.name)
     request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: e.id} }).then((data) => {
       setContractTemplateLink(data.contractTemplateAddress)
-      console.log(contractTemplateLink,'dddddddddd')
     })
   }
 

src/pages/eContract/businessConfig/list.jsx

@@ -18,7 +18,7 @@ const header = props => {
   const sampleName = props.location.query.sampleName;
   const [data, setData] = useState({})
   const [demend, setDemend] = useState({})
-  const [demandIds, setDemandIds] = useState([])
+  const [contractBusinessList, setContractBusinessList] = useState([])
   const [batchDel, setBatchDel] = useState({visable:false,demandIds:''})
   const [addDemand, setAddDemand] = useState({visable:false})
 
@@ -126,7 +126,7 @@ const header = props => {
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setDemandIds(selectedRows)
+      setContractBusinessList(selectedRows)
     },
   };
 
@@ -162,6 +162,22 @@ const header = props => {
     }
   }
 
+  function batchDelTaContractBusiness(){
+    Modal.confirm({
+      title: '确认将所选的' + contractBusinessList.length + '条业务配置删除？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.taEcontract.batchDelTaContractBusiness, data: {contractBusinessList} }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+        }).catch((err) => {
+          console.log('111111', err)
+        })
+      }
+    });
+  }
+
   function addContractManage(){
     router.push({
       pathname: '/eContract/businessConfig/add',
@@ -232,7 +248,7 @@ const header = props => {
         <Button type="danger" onClick={() => addContractManage()} 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>
+        <Button type="primary" onClick={() => batchDelTaContractBusiness()} className={styles.addBtn} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
       <Table rowSelection={rowSelection}
         style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />

src/pages/eContract/template/add.jsx

@@ -90,7 +90,7 @@ const header = props => {
         { required: true, message: '请选择合同文件' },
       ],
       render: <div><Upload {...uploaderProps}><Button disabled={flag}>{uploadTip}</Button></Upload></div>,
-      help: "仅支持pdf格式，合同必须按规则生成，否则无法正确签章。未按规则生成合同导致的问题，橙蕉免除相关责任。详细要求查看合同模板制作要求"
+      help: <span>仅支持pdf格式，合同必须按规则生成，否则无法正确签章。未按规则生成合同导致的问题，橙蕉免除相关责任。详细要求查看<a href='https://easydoc.xyz/s/24703398/3SqDkJDw/odnmIIwl' style={{ color: '#66B3FF' }} target='_blank'>合同模板制作要求</a></span>
     },
 
   ]

src/pages/eContract/template/detail.jsx

@@ -33,7 +33,7 @@ const header = props => {
           <span>{data.contractTemplateName}</span>
         </Form.Item>
         <Form.Item label="合同文件">
-          <div><a href={data.contractTemplateAddress} style={{ color: '#66B3FF', fontSize: '14px' }}>点击链接查看内容</a></div>
+          <div><a href={data.contractTemplateAddress} target='_blank' style={{ color: '#66B3FF', fontSize: '14px' }}>点击链接查看内容</a></div>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>

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

@@ -1477,6 +1477,26 @@ export default {
       url: `${prefix}/taContractBusiness`,
       action: 'admin.taContractBusiness.post',
     },
+    updateTaContractBusinessById: {
+      method: 'PUT',
+      url: `${prefix}/taContractBusiness/:id`,
+      action: 'admin.taContractBusiness.put',
+    },
+    batchDelTaContractBusiness: {
+      method: 'PUT',
+      url: `${prefix}/batchDelBusinessConfig`,
+      action: 'admin.taContractBusiness.del',
+    },
+    taContractBusinessById: {
+      method: 'GET',
+      url: `${prefix}/taContractBusiness/:id`,
+      action: 'admin.taContractBusiness.get',
+    },
+    taContractTemplateList: {
+      method: 'GET',
+      url: `${prefix}/taContractTemplate`,
+      action: 'admin.listContractTemplate.get',
+    },
     listContractTemplate: {
       method: 'GET',
       url: `${prefix}/taContractTemplate`,