bug fix

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

@@ -25,12 +25,41 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.house.paidOrderList, params: { ...params, raiseId:raiseId, type:type },}).then((data) => {
+    request({ ...apis.house.paidOrderList, params: { ...params, raiseId:raiseId, payStatus:type },}).then((data) => {
         console.log(data)
         setData(data)
     })
   }
   
+  function toDecimal2 (x){
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    console.log(s)
+    return s;
+  }
+  function regFenToYuan(fen){
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    console.log(num, 'yuan')
+    num = toDecimal2(num)
+    return num
+  }
+
   const columns = [
     {
       title: '缴费单编号',
@@ -61,6 +90,7 @@ const header = (props) => {
       dataIndex: 'totalFee',
       key: 'totalFee',
       align: 'center',
+      render: (x,row) => <><span>{row.totalFee != null ? regFenToYuan(row.totalFee) : null}</span></>,
     },
     {
       title: '支付成功时间',
@@ -70,29 +100,29 @@ const header = (props) => {
       render: (x, row) => <><span>{row.payTime != null ? `${moment(row.payTime).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
     },
     {
-      title: '退费状态',
+      title: '缴费状态',
       // dataIndex: 'payStatus1',
       // key: 'payStatus1',
       align: 'center',
-      render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
-    },
-    {
-      title: '退费结果',
-      // dataIndex: 'payStatus2',
-      // key: 'payStatus2',
-      align: 'center',
-      render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
-    },
-    {
-      title: '退费单编号',
-      dataIndex: 'refundNo',
-      key: 'refundNo',
-      align: 'center',
+      render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':'未缴费'}</span></>),
     },
+    // {
+    //   title: '退费结果',
+    //   // dataIndex: 'payStatus2',
+    //   // key: 'payStatus2',
+    //   align: 'center',
+    //   render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
+    // },
+    // {
+    //   title: '退费单编号',
+    //   dataIndex: 'refundNo',
+    //   key: 'refundNo',
+    //   align: 'center',
+    // },
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, raiseId : raiseId, type:type, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, raiseId : raiseId, payStatus:type, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -108,7 +138,7 @@ const handleSubmit = (e, props) => {
         if (submitValue.payEndTime != null){
           submitValue.payEndTime = moment(submitValue.payEndTime).format('YYYY-MM-DD HH:mm:ss')
         }
-        getList({ pageNum: 1, pageSize: 10, raiseId : raiseId,  ...submitValue })
+        getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, payStatus:type, ...submitValue })
       }
     });
   }
@@ -143,21 +173,20 @@ const handleSubmit = (e, props) => {
             <Input placeholder="微信订单号"/>
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('refundNo')(
             <Input placeholder="退费单编号"/>
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
-          {getFieldDecorator('shareType')(
-            <Select style={{ width: '180px' }} placeholder="退费状态">
-              <Option value="housePost">不限</Option>
-              <Option value="houseApp">已发起</Option>
-              <Option value="houseApp">已退费</Option>
+          {getFieldDecorator('payStatus')(
+            <Select style={{ width: '180px' }} placeholder="缴费状态">
+              <Option value="paid">已缴费</Option>
+              <Option value="unpaid">未缴费</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('shareType')(
             <Select style={{ width: '180px' }} placeholder="退费结果">
                <Option value="housePost">不限</Option>
@@ -165,7 +194,7 @@ const handleSubmit = (e, props) => {
                <Option value="houseApp">失败</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item>  */}
         <Form.Item>
           {getFieldDecorator('payStartTime')(
             <DatePicker placeholder="支付成功开始时间"/>,

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

@@ -126,7 +126,7 @@ function RaiseHouse(props) {
       title: '锁定状态',
       dataIndex: 'houseLockingStatus',
       key: 'houseLockingStatus',
-      render: (text, records) => <span>{records.houseLockingStatus === 0 ? '未锁定':'已锁定'}</span>,
+      render: (text, records) => <span>{records.houseLockingStatus === 'locked' ? '已锁定':'未锁定'}</span>,
     },
     {
       title: '锁定认筹单编号',

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

@@ -19,12 +19,12 @@ const header = (props) => {
   const type = props.type
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, type:type});
+    getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, payStatus:type,});
   },[])
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.house.refundOrderList, params: { ...params, raiseId:raiseId, type:type },}).then((data) => {
+    request({ ...apis.house.refundOrderList, params: { ...params, raiseId:raiseId, payStatus:type,},}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -70,13 +70,13 @@ const header = (props) => {
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
-    {
-      title: '退费结果',
-      // dataIndex: 'payStatus',
-      // key: 'payStatus2',
-      align: 'center',
-      render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
-    },
+    // {
+    //   title: '退费结果',
+    //   // dataIndex: 'payStatus',
+    //   // key: 'payStatus2',
+    //   align: 'center',
+    //   render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
+    // },
     {
       title: '退费失败原因',
       dataIndex: 'refundReason',
@@ -94,26 +94,26 @@ const header = (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '退费成功时间',
-      // dataIndex: 'updateDate',
-      // key: 'updateDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => <><span>{row.createDate != null ? `${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
     },
     {
-      title: '退费失败时间',
+      title: '退费时间',
       // dataIndex: 'updateDate',
       // key: 'updateDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => <><span>{row.payTime != null ? `${moment(row.payTime).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
     },
+    // {
+    //   title: '退费失败时间',
+    //   // dataIndex: 'updateDate',
+    //   // key: 'updateDate',
+    //   align: 'center',
+    //   render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    // },
   ];
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, raiseId : raiseId, type:type, ...props.form.getFieldsValue() })
+      getList({ pageNum: pageNumber, pageSize: 10, raiseId : raiseId, payStatus:type, ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -129,7 +129,7 @@ const handleSubmit = (e, props) => {
         if (submitValue.payEndTime != null){
           submitValue.payEndTime = moment(submitValue.payEndTime).format('YYYY-MM-DD HH:mm:ss')
         }
-        getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, type:type, ...values })
+        getList({ pageNum: 1, pageSize: 10, raiseId : raiseId, payStatus:type, ...values })
       }
     });
   }

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

@@ -202,8 +202,8 @@ const Base = props => {
             initialValue: saleBatchData.payType === 'onLine'?'onLine':saleBatchData.payType === 'offLine'?"offLine":['offLine','onLine'] ,
           })(
             <Checkbox.Group style={{ width: '100%' }}>
-            <Checkbox value="onLine" disabled={houseLockingType == 'onLine' ?true:false}>线上缴费</Checkbox>
-            <Checkbox value="offLine" disabled={houseLockingType == 'onLine' ?true:false}>
+            <Checkbox value="onLine" disabled={houseLockingType === 'onLine' || (saleBatchData.houseLockingType === 'auto') ?true:false}>线上缴费</Checkbox>
+            <Checkbox value="offLine" disabled={houseLockingType === 'onLine' || (saleBatchData.houseLockingType === 'auto')?true:false}>
               线下缴费
             </Checkbox>
             </Checkbox.Group>,

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

@@ -73,7 +73,7 @@ function EditHouse(props) {
         { (tab === 'raiseImg' && <PreselectionImg raiseId={raiseId} salesBatchId={salesBatchId}/>)}
         { (tab === 'identifyingChips' && <IdentifyingChips houseId={houseId} buildingId={props.location.query.buildingId} raiseId={{ raiseId }} salesBatchId={salesBatchId}/>)}
         { (tab === 'pay' && <PaymentChips raiseId={{ raiseId }} type={"paid"}/>)}
-        { (tab === 'refund' && <Refund raiseId={{ raiseId }} type={"refund"}/>)}
+        { (tab === 'refund' && <Refund raiseId={{ raiseId }} type={"refunded"}/>)}
       </div>
     </>
   )