新需求

src/pages/house/house/list/index.jsx

@@ -156,7 +156,7 @@ const header = props => {
       key: '',
       align: 'center',
       render: (text, record) => (
-        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+        <AuthButton name="admin.house.detail.get" noRight={null}>
           <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >查看详情</a>
         </AuthButton>
       ),
@@ -252,10 +252,10 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.salesBatch.add.post" noRight={null}>
+      <AuthButton name="admin.house.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
-      <AuthButton name="admin.salesBatch.del" noRight={null}>
+      <AuthButton name="admin.house.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
       <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)} />

src/pages/house/preSelect/list/index.jsx

@@ -165,7 +165,7 @@ const header = props => {
       key: '',
       align: 'center',
       render: (text, record) => (
-        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+        <AuthButton name="admin.preselection.detail.get" noRight={null}>
           <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >查看详情</a>
         </AuthButton>
       ),
@@ -253,10 +253,10 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.salesBatch.add.post" noRight={null}>
+      <AuthButton name="admin.preselection.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
-      <AuthButton name="admin.salesBatch.del" noRight={null}>
+      <AuthButton name="admin.preselection.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
       <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)} />

src/pages/house/raise/edit/components/IdentifyingChips.jsx

@@ -25,7 +25,7 @@ import BatchRefund from './BatchRaise/BatchRefund';
  */
 function PreselectionRecord(props) {
   const [data, setData] = useState([])
-  const [userInfo, setUserInfo] = useState({visable:false, raiseId:'', raiseRecordId: ''})
+  const [userInfo, setUserInfo] = useState({visable:false, raiseId:'', raiseRecord: {}})
   const [houseInfo, setHouseInfo] = useState({visable:false, raiseRecordId:''})
   const [invalid, setInvalid] = useState({visable:false,houseIds:''})
   const [pay, setPay] = useState({visable:false,houseIds:''})
@@ -189,7 +189,7 @@ function PreselectionRecord(props) {
       dataIndex: 'tel',
       key: 'tel',
       render: (text, record) => (
-      <a style={{ color: '#66B3FF' }} onClick={() => showUserInfo({visable:true, raiseId:raiseId, raiseRecordId:record.raiseRecordId  })} >{record.tel}</a>
+      <a style={{ color: '#66B3FF' }} onClick={() => showUserInfo({visable:true, raiseId:raiseId, raiseRecord:record  })} >{record.tel}</a>
       ),
     },
     {
@@ -210,8 +210,8 @@ function PreselectionRecord(props) {
     },
     {
       title: '缴费状态',
-      dataIndex: 'payStatus1',
-      key: 'payStatus1',
+      // dataIndex: 'payStatus1',
+      // key: 'payStatus1',
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
     },
     {
@@ -222,14 +222,14 @@ function PreselectionRecord(props) {
     },
     {
       title: '缴费结果',
-      dataIndex: 'payStatus2',
-      key: 'payStatus2',
+      // dataIndex: 'payStatus2',
+      // key: 'payStatus2',
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus3',
-      key: 'payStatus3',
+      // dataIndex: 'payStatus3',
+      // key: 'payStatus3',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
@@ -239,8 +239,8 @@ function PreselectionRecord(props) {
     },
     {
         title: '退费结果',
-        dataIndex: 'payStatus4',
-        key: 'payStatus4',
+        // dataIndex: 'payStatus4',
+        // key: 'payStatus4',
         render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
@@ -393,7 +393,7 @@ function PreselectionRecord(props) {
       <Button type="primary" onClick={() => toDelBatch({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量删除</Button>
       <Button type="primary" onClick={() => showPay({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下缴费</Button>
       <Button type="primary" onClick={() => showRefund({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下退费</Button>
-      <UserInfo visible={userInfo.visable} raiseId={userInfo.raiseId} raiseRecordId={userInfo.raiseRecordId} onCancel={() => setUserInfo({visable:false, raiseId:userInfo.raiseId})} />
+      <UserInfo visible={userInfo.visable} raiseId={userInfo.raiseId} raiseRecordId={userInfo.raiseRecord} onCancel={e => setUserInfo(e)} />
       <HouseInfo visible={houseInfo.visable} salesBatchId={houseInfo.salesBatchId} raiseRecordId={houseInfo.raiseRecordId} buildingId={houseInfo.buildingId} onCancel={() => setHouseInfo({visable:false, raiseRecordId: houseInfo.raiseRecordId})} />
       <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />

src/pages/house/raise/edit/components/PaymentChips.jsx

@@ -70,15 +70,15 @@ const header = (props) => {
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus1',
-      key: 'payStatus1',
+      // dataIndex: 'payStatus1',
+      // key: 'payStatus1',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
       title: '退费结果',
-      dataIndex: 'payStatus2',
-      key: 'payStatus2',
+      // dataIndex: 'payStatus2',
+      // key: 'payStatus2',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },

src/pages/house/raise/edit/components/Refund.jsx

@@ -33,15 +33,17 @@ const header = (props) => {
   const columns = [
     {
       title: '退费单编号',
-      dataIndex: 'orderId',
-      key: 'orderId',
+      // dataIndex: 'orderId',
+      // key: 'orderId',
       align: 'center',
+      render: (text, record) => (<><span>{record.orderId}</span></>),
     },
     {
       title: '缴费单编号',
-      dataIndex: 'orderId',
-      key: 'orderId',
+      // dataIndex: 'orderId',
+      // key: 'orderId',
       align: 'center',
+      render: (text, record) => (<><span>{record.orderId}</span></>),
     },
     {
       title: '认筹单编号',
@@ -63,15 +65,15 @@ const header = (props) => {
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus1',
-      key: 'payStatus1',
+      // dataIndex: 'payStatus',
+      // key: 'payStatus1',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
       title: '退费结果',
-      dataIndex: 'payStatus2',
-      key: 'payStatus2',
+      // dataIndex: 'payStatus',
+      // key: 'payStatus2',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
@@ -96,15 +98,15 @@ const header = (props) => {
     },
     {
       title: '退费成功时间',
-      dataIndex: 'updateDate',
-      key: 'updateDate',
+      // dataIndex: 'updateDate',
+      // key: 'updateDate',
       align: 'center',
       render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '退费失败时间',
-      dataIndex: 'updateDate',
-      key: 'updateDate',
+      // dataIndex: 'updateDate',
+      // key: 'updateDate',
       align: 'center',
       render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },

src/pages/house/raise/edit/components/UserInfo/index.jsx

@@ -8,41 +8,42 @@ import request from '../../../../../../utils/request';
 import apis from '../../../../../../services/apis';
 
 const UserInfo = props => {
-  const [data, setData] = useState({})
-  const raiseRecordId = props.raiseRecordId
+  // const [data, setData] = useState({})
+  const raiseRecord = props.raiseRecordId
   const raiseId = props.raiseId
 
-  useEffect(() => {
-    console.log('userInfoLog', raiseId)
-    getList({ pageNum: 1, pageSize: 10 });
-  }, [raiseRecordId])
-
-  function getList(params) {
-    // 网路请求
-    request({ ...apis.house.getUserInfo, params: { raiseRecordId:raiseRecordId} }).then(res => {
-      console.log(res,'adminData')
-      setData(res)
-      console.log(data)
-      if (data==null){
-        return
-      }
-    }).catch(err => {
-      message.info("出错了")
-    })
+  // useEffect(() => {
+  //   console.log('userInfoLog', raiseId)
+  //   getList({ pageNum: 1, pageSize: 10 });
+  // }, [raiseRecordId])
+
+  // function getList(params) {
+  //   // 网路请求
+  //   request({ ...apis.house.getUserInfo, params: { raiseRecordId:raiseRecordId} }).then(res => {
+  //     console.log(res,'adminData')
+  //     setData(res)
+  //   }).catch(err => {
+  //     message.info("出错了")
+  //   })
+  // }
+
+  function refreshList(e){
+    console.log('.....',e)
+    props.onCancel(e)
   }
 
   return (
-    <Modal footer={null} title="个人信息" visible={props.visible} onCancel={props.onCancel} width={800}>
+    <Modal footer={null} title="个人信息" visible={props.visible} onCancel={() => refreshList({visable:false, raiseRecord:raiseRecord})} width={800}>
       <div className={Style.cardBox}>
         <div className={Style.rightBox}>
           <div className={Style.flexBox}>
-            {/* <img className={Style.touxiang} src={data.avrtarurl} /> */}
+            <img className={Style.touxiang} src={raiseRecord.avatarurl} />
             <div className={Style.right}>
-  <p className={Style.rightItem}>昵称：{data}</p>
-              {/* <p className={Style.rightItem}>姓名：{data.name}</p>
-              <p className={Style.rightItem}>用户手机号：{data.tel}</p>
-              <p className={Style.rightItem}>身份证号：{data.idcard}</p>
-              <p className={Style.rightItem}>认筹手机号：{data.tel}</p> */}
+              <p className={Style.rightItem}>昵称：{raiseRecord.nickname}</p>
+              <p className={Style.rightItem}>姓名：{raiseRecord.name}</p>
+              <p className={Style.rightItem}>用户手机号：{raiseRecord.tel}</p>
+              <p className={Style.rightItem} style={{width:'400px'}}>身份证号：{raiseRecord.idcard}</p>
+              <p className={Style.rightItem}>认筹手机号：{raiseRecord.tel}</p> 
             </div>
           </div>
         </div>

src/pages/house/raise/list/index.jsx

@@ -185,7 +185,7 @@ const header = props => {
       key: '',
       align: 'center',
       render: (text, record) => (
-        <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
+        <AuthButton name="admin.raise.detail.get" noRight={null}>
           <a style={{ color: '#66B3FF' }} onClick={toAddHouse(record)} >查看详情</a>
         </AuthButton>
       ),
@@ -281,10 +281,10 @@ const header = props => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.salesBatch.add.post" noRight={null}>
+      <AuthButton name="admin.raise.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
-      <AuthButton name="admin.salesBatch.del" noRight={null}>
+      <AuthButton name="admin.raise.del" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}}>删除</Button>
       </AuthButton>
       <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)} />