魏超 пре 5 година
родитељ
комит
c7ee7c2aea

+ 3
- 3
src/pages/house/raise/edit/components/HouseGrid/Room.jsx Прегледај датотеку

@@ -4,10 +4,10 @@ import HotBlock from "../HotBlock"
4 4
 import Style from './style.less'
5 5
 
6 6
 export default function Room(props) {
7
-  const { roomName, price, apartmentName, status, heat, realHeat } = props.dataset || {}
8
-  let personNum = props.hotType === 1 ? (heat || 0) : (realHeat || 0)
7
+  const { roomName, price, apartmentName, status, raiseHeat, realRaiseHeat } = props.dataset || {}
8
+  let personNum = props.hotType === 1 ? (raiseHeat || 0) : (realRaiseHeat || 0)
9 9
   if (props.hotType === 3) {
10
-    personNum = 0 + heat + realHeat
10
+    personNum = 0 + raiseHeat + realRaiseHeat
11 11
   }
12 12
 
13 13
   const handleClick = () => {

+ 1
- 1
src/pages/house/raise/edit/components/IdentifyingChips.jsx Прегледај датотеку

@@ -69,7 +69,7 @@ function PreselectionRecord(props) {
69 69
 
70 70
   // 分页
71 71
   const changePageNum = (pageNumber) => {
72
-    getList({ pageNum: pageNumber, pageSize: 10, salesBatchId : salesBatchId, ...props.form.getFieldsValue() })
72
+    getList({ pageNumber: pageNumber, pageSize: 10, salesBatchId : salesBatchId, raiseId: raiseId, ...props.form.getFieldsValue() })
73 73
   }
74 74
 
75 75
   const rowSelection = {

+ 30
- 0
src/pages/house/raise/edit/components/Refund.jsx Прегледај датотеку

@@ -30,6 +30,35 @@ const header = (props) => {
30 30
     })
31 31
   }
32 32
   
33
+  function toDecimal2 (x){
34
+    var f = parseFloat(x);
35
+    if (isNaN(f)) {
36
+      return false;
37
+    }
38
+    var f = Math.round(x * 100) / 100;
39
+    var s = f.toString();
40
+    var rs = s.indexOf('.');
41
+    if (rs < 0) {
42
+      rs = s.length;
43
+      s += '.';
44
+    }
45
+    while (s.length <= rs + 2) {
46
+      s += '0';
47
+    }
48
+    console.log(s)
49
+    return s;
50
+  }
51
+  function regFenToYuan(fen){
52
+    var num = fen;
53
+    num = fen * 0.01;
54
+    num += '';
55
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
56
+    num = num.replace(reg, '$1');
57
+    console.log(num, 'yuan')
58
+    num = toDecimal2(num)
59
+    return num
60
+  }
61
+  
33 62
   const columns = [
34 63
     {
35 64
       title: '退费单编号',
@@ -88,6 +117,7 @@ const header = (props) => {
88 117
       dataIndex: 'totalFee',
89 118
       key: 'totalFee',
90 119
       align: 'center',
120
+      render: (x, row) => <span>{regFenToYuan(row.totalFee)}</span>
91 121
     },
92 122
     {
93 123
       title: '退费发起时间',