Commit c56d1a5926f082702b1b3e468c0783470c53df43
1 parent
0460bf4a
feat: update分期账单
Showing
4 changed files
with
29 additions
and
29 deletions
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
@@ -223,7 +223,7 @@ export default ({ payBody, thisId, currtSave }) => { | @@ -223,7 +223,7 @@ export default ({ payBody, thisId, currtSave }) => { | ||
223 | <ProFormUploadButton | 223 | <ProFormUploadButton |
224 | name={record.id} | 224 | name={record.id} |
225 | onChange={(value) => { | 225 | onChange={(value) => { |
226 | - // console.log(value); | 226 | + console.log(value); |
227 | // console.log(payWayDetailBody); | 227 | // console.log(payWayDetailBody); |
228 | let remakeBody = []; | 228 | let remakeBody = []; |
229 | let remakeBodyItem = {}; | 229 | let remakeBodyItem = {}; |
@@ -231,8 +231,8 @@ export default ({ payBody, thisId, currtSave }) => { | @@ -231,8 +231,8 @@ export default ({ payBody, thisId, currtSave }) => { | ||
231 | if (item.id === record.id) { | 231 | if (item.id === record.id) { |
232 | remakeBodyItem = { | 232 | remakeBodyItem = { |
233 | ...item, | 233 | ...item, |
234 | - fileUrl: value.file.originFileObj, | ||
235 | - fileName: value.file.name, | 234 | + fileUrl: value.fileList.originFileObj, |
235 | + fileName: value.fileList.name, | ||
236 | }; | 236 | }; |
237 | } else { | 237 | } else { |
238 | remakeBodyItem = { ...item }; | 238 | remakeBodyItem = { ...item }; |
src/pages/Instalment/components/read/readPayWay.tsx
@@ -167,25 +167,19 @@ export default ({ payBody, thisId, currtSave }) => { | @@ -167,25 +167,19 @@ export default ({ payBody, thisId, currtSave }) => { | ||
167 | dataIndex: 'payDate', | 167 | dataIndex: 'payDate', |
168 | editable: false, | 168 | editable: false, |
169 | render: (_text, record) => { | 169 | render: (_text, record) => { |
170 | - return ( | ||
171 | - <span> | ||
172 | - {new Intl.DateTimeFormat('zh-CN', { | ||
173 | - year: 'numeric', | ||
174 | - month: 'long', | ||
175 | - day: 'numeric', | ||
176 | - }).format(record.payDate)} | ||
177 | - </span> | ||
178 | - // <ProFormDatePicker | ||
179 | - // className='dataChoose' | ||
180 | - // initialValue={record.payDate} | ||
181 | - // value={record.payDate} | ||
182 | - // placeholder={"请填写时间"} | ||
183 | - // fieldProps={{ | ||
184 | - // format: (value) => value.format('YYYY-MM-DD'), | ||
185 | - // onChange: handleChange, | ||
186 | - // }} | ||
187 | - // /> | ||
188 | - ); | 170 | + if (record.payDate) { |
171 | + return ( | ||
172 | + <span> | ||
173 | + {new Intl.DateTimeFormat('zh-CN', { | ||
174 | + year: 'numeric', | ||
175 | + month: 'long', | ||
176 | + day: 'numeric', | ||
177 | + }).format(record.payDate)} | ||
178 | + </span> | ||
179 | + ); | ||
180 | + } else { | ||
181 | + return <span></span>; | ||
182 | + } | ||
189 | }, | 183 | }, |
190 | }, | 184 | }, |
191 | { | 185 | { |
src/pages/Instalment/components/read/readProduct.tsx
@@ -85,7 +85,7 @@ export default ({ productBody, EditProductBody }) => { | @@ -85,7 +85,7 @@ export default ({ productBody, EditProductBody }) => { | ||
85 | { | 85 | { |
86 | title: '设备型号', | 86 | title: '设备型号', |
87 | dataIndex: 'deviceModel', | 87 | dataIndex: 'deviceModel', |
88 | - width: '15%', | 88 | + width: '20%', |
89 | formItemProps: () => { | 89 | formItemProps: () => { |
90 | return { | 90 | return { |
91 | rules: [{ required: true, message: '此项为必填项' }], | 91 | rules: [{ required: true, message: '此项为必填项' }], |
src/pages/ZoNing/components/modal.tsx
1 | +import { getOrderErpOrderZoNingSelectProvinceAll } from '@/services'; | ||
1 | import { PlusOutlined } from '@ant-design/icons'; | 2 | import { PlusOutlined } from '@ant-design/icons'; |
2 | import { | 3 | import { |
3 | ModalForm, | 4 | ModalForm, |
@@ -54,12 +55,17 @@ export default () => { | @@ -54,12 +55,17 @@ export default () => { | ||
54 | </ProForm.Group> | 55 | </ProForm.Group> |
55 | <ProForm.Group> | 56 | <ProForm.Group> |
56 | <ProFormSelect | 57 | <ProFormSelect |
57 | - request={async () => [ | ||
58 | - { | ||
59 | - value: 'chapter', | ||
60 | - label: '盖章后生效', | ||
61 | - }, | ||
62 | - ]} | 58 | + request={async () => { |
59 | + const provinceList = | ||
60 | + await getOrderErpOrderZoNingSelectProvinceAll(); | ||
61 | + if (provinceList) { | ||
62 | + return provinceList.data.map((item) => ({ | ||
63 | + value: { pId: item.pId, province: item.province }, | ||
64 | + label: item.province, | ||
65 | + })); | ||
66 | + } | ||
67 | + return []; | ||
68 | + }} | ||
63 | width="xs" | 69 | width="xs" |
64 | name="orderProvinceVoList" | 70 | name="orderProvinceVoList" |
65 | label="合同约定生效方式" | 71 | label="合同约定生效方式" |