FEV2 / fw-cms

Commit 2cd4c73b47f9c8b237f9390e1b64faf685e061c0

Authored by 张志伟
2 parents f98a9f53 c13ead23

Merge branch 'contract' into 'master' 

Contract

perf:食堂配置流程优化

See merge request !260
Inline Side-by-side
Showing 4 changed files with 14 additions and 14 deletions
src/pages/contract/Canteen/components/PriceSaveModal.tsx
  View file @2cd4c73
... ... @@ -70,21 +70,21 @@ export default function PriceSaveModal(props: Props) {
70 70 <Item label="早餐单价(元)" name="breakfastPrice" rules={[{ required: false, message: '请输入早餐单价' }]}>
71 71 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
72 72 </Item>
73   - <Item label="早餐补贴(元)" name="breakfastSubsidy" rules={[{ required: false, message: '请输入早餐补贴' }]}>
  73 + {/* <Item label="早餐补贴(元)" name="breakfastSubsidy" rules={[{ required: false, message: '请输入早餐补贴' }]}>
74 74 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
75   - </Item>
  75 + </Item> */}
76 76 <Item label="午餐单价(元)" name="lunchPrice" rules={[{ required: false, message: '请输入午餐单价' }]}>
77 77 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
78 78 </Item>
79   - <Item label="午餐补贴(元)" name="lunchSubsidy" rules={[{ required: false, message: '请输入午餐补贴' }]}>
  79 + {/* <Item label="午餐补贴(元)" name="lunchSubsidy" rules={[{ required: false, message: '请输入午餐补贴' }]}>
80 80 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
81   - </Item>
  81 + </Item> */}
82 82 <Item label="晚餐单价(元)" name="dinnerPrice" rules={[{ required: false, message: '请输入晚餐单价' }]}>
83 83 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
84 84 </Item>
85   - <Item label="晚餐补贴(元)" name="dinnerSubsidy" rules={[{ required: false, message: '请输入晚餐补贴' }]}>
  85 + {/* <Item label="晚餐补贴(元)" name="dinnerSubsidy" rules={[{ required: false, message: '请输入晚餐补贴' }]}>
86 86 <InputNumber style={{ width: '100%' }} min={0.01} max={1000} step={0.01} placeholder="请输入" />
87   - </Item>
  87 + </Item> */}
88 88 <Item label="约定执行日期" name="execDate" required rules={[{ required: true, message: '请输选择约定执行日期' }]}>
89 89 <DatePicker
90 90 disabledDate={current => current && current < moment().add(-1, 'days').endOf('day')}
... ...
src/pages/contract/Canteen/components/PriceTableModal.tsx
  View file @2cd4c73
... ... @@ -34,7 +34,7 @@ export default function Index({visible, onCancel, item}: Props) {
34 34 ]}
35 35 >
36 36 <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'flex-start', marginBottom: 20 }}>
37   - <Select style={{width: 200}} allowClear placeholder="状态" onChange={value => setParams({...innerParams, status: value, current: 1}, true)} value={innerParams.status} >
  37 + <Select style={{width: 200}} allowClear placeholder="状态" onChange={value => setParams({...innerParams, status: value, current: 1}, true)} value={innerParams.status}>
38 38 {statusData.map(i => (<Option value={i.value} key={i.value}>{i.label}</Option>))}
39 39 </Select>
40 40 </div>
... ... @@ -47,11 +47,11 @@ export default function Index({visible, onCancel, item}: Props) {
47 47 onChange={(_pagination) => setParams({ ..._pagination }, true)}
48 48 >
49 49 <Column title="早餐单价" dataIndex="breakfastPrice" width="10%" align="center" />
50   - <Column title="早餐补贴" dataIndex="breakfastSubsidy" width="10%" align="center" />
  50 + {/* <Column title="早餐补贴" dataIndex="breakfastSubsidy" width="10%" align="center" /> */}
51 51 <Column title="午餐单价" dataIndex="lunchPrice" width="10%" align="center" />
52   - <Column title="午餐补贴" dataIndex="lunchSubsidy" width="10%" align="center" />
  52 + {/* <Column title="午餐补贴" dataIndex="lunchSubsidy" width="10%" align="center" /> */}
53 53 <Column title="晚餐单价" dataIndex="dinnerPrice" width="10%" align="center" />
54   - <Column title="晚餐补贴" dataIndex="dinnerSubsidy" width="10%" align="center" />
  54 + {/* <Column title="晚餐补贴" dataIndex="dinnerSubsidy" width="10%" align="center" /> */}
55 55 <Column title="执行日期" dataIndex="execDate" width="18%" align="center" render={(text) => text && moment(text).format("YYYY-MM-DD") || '--'} />
56 56 </Table>
57 57 </Modal>
... ...
src/pages/contract/Canteen/components/SaveModal.tsx
  View file @2cd4c73
... ... @@ -120,7 +120,7 @@ export default function SaveModal(props: Props) {
120 120 ))}
121 121 </Select>
122 122 </Item>
123   - <Item label="不就餐民族(支持多选)" name="notRepastNation" rules={[{ required: false, message: "请选择不就餐民族" }]}>
  123 + {/* <Item label="不就餐民族(支持多选)" name="notRepastNation" rules={[{ required: false, message: "请选择不就餐民族" }]}>
124 124 <Select
125 125 placeholder="请选择"
126 126 mode="multiple"
... ... @@ -134,7 +134,7 @@ export default function SaveModal(props: Props) {
134 134 </Option>
135 135 ))}
136 136 </Select>
137   - </Item>
  137 + </Item> */}
138 138 </Form>
139 139 </Modal>
140 140 );
... ...
src/pages/contract/Canteen/index.tsx
  View file @2cd4c73
... ... @@ -91,7 +91,7 @@ export default function Index() {
91 91 </a>
92 92 )}
93 93 />
94   - <Column
  94 + {/* <Column
95 95 title="不就餐民族"
96 96 dataIndex="notRepastNation"
97 97 width="10%"
... ... @@ -104,7 +104,7 @@ export default function Index() {
104 104 查看
105 105 </a>
106 106 )}
107   - />
  107 + /> */}
108 108 <Column
109 109 title="下载"
110 110 align="center"
... ...