Commit 74f667072cad5fce6a5bda58f70ac14b1610db6b
1 parent
f6ae1f17
feat: update选择修改
Showing
1 changed file
with
38 additions
and
10 deletions
src/pages/Order/components/OrderDrawer.tsx
... | ... | @@ -1134,8 +1134,6 @@ export default ({ onClose, data, subOrders, orderOptType }) => { |
1134 | 1134 | const resp = await postDistrictSelOrderProvince({ |
1135 | 1135 | data: form.getFieldValue('id'), |
1136 | 1136 | }); |
1137 | - console.log(); | |
1138 | - | |
1139 | 1137 | setProvince(resp.data.province); |
1140 | 1138 | form.setFieldValue('province', resp.data.province); |
1141 | 1139 | setCity(resp.data.city); |
... | ... | @@ -1273,8 +1271,26 @@ export default ({ onClose, data, subOrders, orderOptType }) => { |
1273 | 1271 | }, |
1274 | 1272 | ]} |
1275 | 1273 | request={async () => { |
1274 | + let cityOptions = []; | |
1275 | + console.log(form.getFieldValue('id')); | |
1276 | + if (form.getFieldValue('id')) { | |
1277 | + console.log('id'); | |
1278 | + const resp = await postDistrictSelOrderProvince({ | |
1279 | + data: form.getFieldValue('id'), | |
1280 | + }); | |
1281 | + if (resp.data.province !== null) { | |
1282 | + let res = await postDistrictSelectByNameAndLevel({ | |
1283 | + data: { district: resp.data.province, level: 1 }, | |
1284 | + }); | |
1285 | + if (res && res.data) { | |
1286 | + cityOptions = res.data.map((item) => ({ | |
1287 | + value: item.district, | |
1288 | + label: item.district, | |
1289 | + })); | |
1290 | + } | |
1291 | + } | |
1292 | + } | |
1276 | 1293 | if (province !== '') { |
1277 | - let cityOptions = []; | |
1278 | 1294 | let res = await postDistrictSelectByNameAndLevel({ |
1279 | 1295 | data: { district: province, level: 1 }, |
1280 | 1296 | }); |
... | ... | @@ -1284,9 +1300,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { |
1284 | 1300 | label: item.district, |
1285 | 1301 | })); |
1286 | 1302 | } |
1287 | - return cityOptions; | |
1288 | 1303 | } |
1289 | - return []; | |
1304 | + return cityOptions; | |
1290 | 1305 | }} |
1291 | 1306 | /> |
1292 | 1307 | <ProFormSelect |
... | ... | @@ -1312,10 +1327,24 @@ export default ({ onClose, data, subOrders, orderOptType }) => { |
1312 | 1327 | }, |
1313 | 1328 | ]} |
1314 | 1329 | request={async () => { |
1315 | - console.log(form.getFieldsValue()); | |
1316 | - | |
1330 | + let districtOptions = []; | |
1331 | + if (form.getFieldValue('id')) { | |
1332 | + const resp = await postDistrictSelOrderProvince({ | |
1333 | + data: form.getFieldValue('id'), | |
1334 | + }); | |
1335 | + if (resp.data.city !== null) { | |
1336 | + let res = await postDistrictSelectByNameAndLevel({ | |
1337 | + data: { district: resp.data.city, level: 2 }, | |
1338 | + }); | |
1339 | + if (res && res.data) { | |
1340 | + districtOptions = res.data.map((item) => ({ | |
1341 | + value: item.district, | |
1342 | + label: item.district, | |
1343 | + })); | |
1344 | + } | |
1345 | + } | |
1346 | + } | |
1317 | 1347 | if (city !== '') { |
1318 | - let districtOptions = []; | |
1319 | 1348 | let res = await postDistrictSelectByNameAndLevel({ |
1320 | 1349 | data: { district: city, level: 2 }, |
1321 | 1350 | }); |
... | ... | @@ -1325,9 +1354,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => { |
1325 | 1354 | label: item.district, |
1326 | 1355 | })); |
1327 | 1356 | } |
1328 | - return districtOptions; | |
1329 | 1357 | } |
1330 | - return []; | |
1358 | + return districtOptions; | |
1331 | 1359 | }} |
1332 | 1360 | /> |
1333 | 1361 | </div> | ... | ... |