Commit 95615f103ddad45bb26edb9a666bd7dc208c661e
Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front
Showing
5 changed files
with
34 additions
and
9 deletions
src/pages/Instalment/components/checkModal/TableCheckModal.tsx
| @@ -55,7 +55,8 @@ export default ({ id, toReload, isShow }) => { | @@ -55,7 +55,8 @@ export default ({ id, toReload, isShow }) => { | ||
| 55 | } | 55 | } |
| 56 | toReload(); | 56 | toReload(); |
| 57 | } | 57 | } |
| 58 | - return; | 58 | + props.submit(); |
| 59 | + return true; | ||
| 59 | }} | 60 | }} |
| 60 | > | 61 | > |
| 61 | 驳回 | 62 | 驳回 |
| @@ -91,7 +92,7 @@ export default ({ id, toReload, isShow }) => { | @@ -91,7 +92,7 @@ export default ({ id, toReload, isShow }) => { | ||
| 91 | name="mark" | 92 | name="mark" |
| 92 | label="备注" | 93 | label="备注" |
| 93 | tooltip="请特别注意订单总金额与订单金额。" | 94 | tooltip="请特别注意订单总金额与订单金额。" |
| 94 | - placeholder="请输入名称" | 95 | + placeholder="如驳回请输入原因" |
| 95 | /> | 96 | /> |
| 96 | </ModalForm> | 97 | </ModalForm> |
| 97 | </Space> | 98 | </Space> |
src/pages/Instalment/components/checkModal/checkModal.tsx
| @@ -46,7 +46,7 @@ export default ({ id, toReload }) => { | @@ -46,7 +46,7 @@ export default ({ id, toReload }) => { | ||
| 46 | message.success('操作成功'); | 46 | message.success('操作成功'); |
| 47 | } | 47 | } |
| 48 | toReload(); | 48 | toReload(); |
| 49 | - return; | 49 | + return true; |
| 50 | }} | 50 | }} |
| 51 | > | 51 | > |
| 52 | 驳回 | 52 | 驳回 |
| @@ -77,7 +77,7 @@ export default ({ id, toReload }) => { | @@ -77,7 +77,7 @@ export default ({ id, toReload }) => { | ||
| 77 | name="mark" | 77 | name="mark" |
| 78 | label="备注" | 78 | label="备注" |
| 79 | tooltip="请特别注意订单总金额与订单金额。" | 79 | tooltip="请特别注意订单总金额与订单金额。" |
| 80 | - placeholder="请输入名称" | 80 | + placeholder="如驳回请输入原因" |
| 81 | /> | 81 | /> |
| 82 | </ModalForm> | 82 | </ModalForm> |
| 83 | </Space> | 83 | </Space> |
src/pages/Instalment/components/payWayDetail/payWayDetail.css
| @@ -10,6 +10,18 @@ | @@ -10,6 +10,18 @@ | ||
| 10 | margin-bottom: 0 !important; | 10 | margin-bottom: 0 !important; |
| 11 | } | 11 | } |
| 12 | 12 | ||
| 13 | -.dataChoose { | ||
| 14 | - margin: 0; | 13 | +.payway-detail-index td .ant-form-item css-nllxry { |
| 14 | + margin-bottom: 0 !important; | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +.payWaydataChoose { | ||
| 18 | + margin: 0 !important; | ||
| 19 | +} | ||
| 20 | + | ||
| 21 | +.ant-form-item css-nllxry { | ||
| 22 | + margin-bottom: 0 !important; | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +:where(.css-nllxry).ant-form-item { | ||
| 26 | + margin-bottom: 0 !important; | ||
| 15 | } | 27 | } |
src/pages/Instalment/components/payWayDetail/payWayDetail.less
| @@ -8,10 +8,22 @@ | @@ -8,10 +8,22 @@ | ||
| 8 | .css-dev-only-do-not-override-nllxry { | 8 | .css-dev-only-do-not-override-nllxry { |
| 9 | margin-bottom: 0 !important; | 9 | margin-bottom: 0 !important; |
| 10 | } | 10 | } |
| 11 | + | ||
| 12 | + .ant-form-item css-nllxry { | ||
| 13 | + margin-bottom: 0 !important; | ||
| 14 | + } | ||
| 11 | } | 15 | } |
| 12 | 16 | ||
| 13 | -.dataChoose { | ||
| 14 | - margin: 0; | 17 | +.payWaydataChoose { |
| 18 | + margin: 0 !important; | ||
| 19 | +} | ||
| 20 | + | ||
| 21 | +.ant-form-item css-nllxry { | ||
| 22 | + margin-bottom: 0 !important; | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +:where(.css-nllxry).ant-form-item { | ||
| 26 | + margin-bottom: 0 !important; | ||
| 15 | } | 27 | } |
| 16 | 28 | ||
| 17 | // .pay-way-detail-index td .css-dev-only-do-not-override-nllxry{ | 29 | // .pay-way-detail-index td .css-dev-only-do-not-override-nllxry{ |
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
| @@ -212,7 +212,7 @@ export default ({ payBody, thisId, currtSave }) => { | @@ -212,7 +212,7 @@ export default ({ payBody, thisId, currtSave }) => { | ||
| 212 | 212 | ||
| 213 | return ( | 213 | return ( |
| 214 | <ProFormDatePicker | 214 | <ProFormDatePicker |
| 215 | - className="dataChoose" | 215 | + className="payWaydataChoose" |
| 216 | initialValue={record.payDate} | 216 | initialValue={record.payDate} |
| 217 | value={record.payDate} | 217 | value={record.payDate} |
| 218 | placeholder={'请填写时间'} | 218 | placeholder={'请填写时间'} |