Selaa lähdekoodia

Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

张延森 4 vuotta sitten
vanhempi
commit
2da5879325

+ 1
- 1
src/pages/property/bill/order/index.jsx Näytä tiedosto

145
             ))
145
             ))
146
           }}
146
           }}
147
         />
147
         />
148
-        <Table.Column title="总费用金额" dataIndex="sumPrice" key="sumPrice" render={sumPrice => (sumPrice === null || sumPrice === undefined ? '' : Number(sumPrice).toFixed(2))} />
148
+        <Table.Column title="总费用金额" dataIndex="sumPrice" key="sumPrice" render={sumPrice => (sumPrice === null || sumPrice === undefined ? '' : sumPrice/100)} />
149
         <Table.Column
149
         <Table.Column
150
           title="订单状态"
150
           title="订单状态"
151
           dataIndex="orderStatus"
151
           dataIndex="orderStatus"

+ 1
- 1
src/pages/property/ticket/Detail.jsx Näytä tiedosto

172
                 title={(
172
                 title={(
173
                   <Title title={item.statusName}>
173
                   <Title title={item.statusName}>
174
                     {
174
                     {
175
-                      ticketData.status === '0' && (
175
+                      item.status === '0' && (
176
                         <>
176
                         <>
177
                           <Button type="primary" onClick={() => setShowDispatch(true)}>分配工单</Button>
177
                           <Button type="primary" onClick={() => setShowDispatch(true)}>分配工单</Button>
178
                           <Button type="danger" style={{marginLeft: '24px'}} onClick={() => setShowReject(true)}>拒绝受理</Button>
178
                           <Button type="danger" style={{marginLeft: '24px'}} onClick={() => setShowReject(true)}>拒绝受理</Button>