canrd-main / canrd-erp-front · Commits

Commit e9ef594bfbfb81018d76eb9c0c7a8e15cf459c26

Authored by PurelzMgnead
1 parent 74f66707
build: skipped

feat: update编辑

Inline Side-by-side
Showing 2 changed files with 41 additions and 32 deletions
src/pages/Order/components/OrderDrawer.tsx
  View file @e9ef594
... ... @@ -3,7 +3,6 @@ import {
3 3 postCanrdApiUserAddressList,
4 4 postCanrdApiUserDetail,
5 5 postCanrdApiUserNowMoneyCheck,
6   - postDistrictAddOrderAndProvince,
7 6 postDistrictSelectByLevel,
8 7 postDistrictSelectByNameAndLevel,
9 8 postDistrictSelOrderProvince,
... ... @@ -877,21 +876,12 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
877 876 if (typeof values.erpCustomerId !== 'string') {
878 877 values.erpCustomerId = values.erpCustomerId?.id;
879 878 }
880   -
  879 + values.province = province;
  880 + values.city = city;
  881 + values.district = district;
881 882 //新增
882 883 if (optType('add') || optType('copy')) {
883 884 res = await postServiceOrderAddOrder({ data: values });
884   - if (res && res.data.length === 2) {
885   - const orderMainProDo = {
886   - oId: res.data[0],
887   - province: province,
888   - city: city,
889   - district: district,
890   - };
891   - await postDistrictAddOrderAndProvince({
892   - data: orderMainProDo,
893   - });
894   - }
895 885 }
896 886 //修改或者申请售后或者申请修改
897 887 if (
... ... @@ -915,6 +905,9 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
915 905 values.deleteSubOrderLists = diff;
916 906  
917 907 if (optType('edit')) {
  908 + values.province = province;
  909 + values.city = city;
  910 + values.district = district;
918 911 res = await postServiceOrderUpdateOrder({ data: values });
919 912 }
920 913  
... ... @@ -1134,12 +1127,20 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1134 1127 const resp = await postDistrictSelOrderProvince({
1135 1128 data: form.getFieldValue('id'),
1136 1129 });
1137   - setProvince(resp.data.province);
1138   - form.setFieldValue('province', resp.data.province);
1139   - setCity(resp.data.city);
1140   - form.setFieldValue('city', resp.data.city);
1141   - setDistrict(resp.data.district);
1142   - form.setFieldValue('district', resp.data.district);
  1130 + if (resp && resp.data) {
  1131 + if (resp.data.province) {
  1132 + setProvince(resp.data.province);
  1133 + form.setFieldValue('province', resp.data.province);
  1134 + }
  1135 + if (resp.data.city) {
  1136 + setCity(resp.data.city);
  1137 + form.setFieldValue('city', resp.data.city);
  1138 + }
  1139 + if (resp.data.district) {
  1140 + setDistrict(resp.data.district);
  1141 + form.setFieldValue('district', resp.data.district);
  1142 + }
  1143 + }
1143 1144 console.log(form.getFieldsValue());
1144 1145 }
1145 1146 //判断如果是在修改或者复制，那么第一次请求的时候，默认生成当前收货人信息的option
... ... @@ -1226,7 +1227,11 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1226 1227 labelInValue: true,
1227 1228 }}
1228 1229 onChange={(value) => {
  1230 + console.log(value);
  1231 +
1229 1232 if (value !== undefined || value !== null) {
  1233 + console.log('setProvince');
  1234 +
1230 1235 setProvince(value?.value);
1231 1236 }
1232 1237 }}
... ... @@ -1274,11 +1279,14 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1274 1279 let cityOptions = [];
1275 1280 console.log(form.getFieldValue('id'));
1276 1281 if (form.getFieldValue('id')) {
1277   - console.log('id');
1278 1282 const resp = await postDistrictSelOrderProvince({
1279 1283 data: form.getFieldValue('id'),
1280 1284 });
1281   - if (resp.data.province !== null) {
  1285 + if (
  1286 + resp.data.province !== null &&
  1287 + resp.data.province !== undefined
  1288 + ) {
  1289 + console.log('province is ok');
1282 1290 let res = await postDistrictSelectByNameAndLevel({
1283 1291 data: { district: resp.data.province, level: 1 },
1284 1292 });
... ... @@ -1291,6 +1299,8 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1291 1299 }
1292 1300 }
1293 1301 if (province !== '') {
  1302 + console.log(province);
  1303 + console.log('province is okk');
1294 1304 let res = await postDistrictSelectByNameAndLevel({
1295 1305 data: { district: province, level: 1 },
1296 1306 });
... ... @@ -1332,7 +1342,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1332 1342 const resp = await postDistrictSelOrderProvince({
1333 1343 data: form.getFieldValue('id'),
1334 1344 });
1335   - if (resp.data.city !== null) {
  1345 + if (resp.data.city !== null && resp.data.city !== undefined) {
1336 1346 let res = await postDistrictSelectByNameAndLevel({
1337 1347 data: { district: resp.data.city, level: 2 },
1338 1348 });
... ...
src/pages/OrderReport/index.tsx
  View file @e9ef594
1 1 import {
2 2 getOrderErpOrderZoNingSelectAll,
3   - getOrderErpOrderZoNingSelectUserAll,
4 3 postOrderErpOrderZoNingSelectSaleUserByProvince,
5 4 postServiceOrderQueryReportFormsInformation,
6 5 postServiceOrderQuerySalesCode,
... ... @@ -66,7 +65,7 @@ const OrderReportPage = () => {
66 65 setLoading(true);
67 66 let body = {
68 67 statisticsMethod: '',
69   - salesCode: [null],
  68 + // salesCode: [null],
70 69 productBelongBusiness: form.getFieldValue('productBelongBusiness'),
71 70 maxAccount: form.getFieldValue('maxAccount'),
72 71 includeExperimentalEquipment: form.getFieldValue(
... ... @@ -77,14 +76,14 @@ const OrderReportPage = () => {
77 76 };
78 77 // console.log(form.getFieldValue('zoning').value);
79 78  
80   - let res = await getOrderErpOrderZoNingSelectUserAll();
81   - if (res && res.data) {
82   - let safeUserList = [];
83   - res.data.forEach((element) => {
84   - safeUserList.push(element.userName);
85   - });
86   - body = { ...body, salesCode: safeUserList };
87   - }
  79 + // let res = await getOrderErpOrderZoNingSelectUserAll();
  80 + // if (res && res.data) {
  81 + // let safeUserList = [];
  82 + // res.data.forEach((element) => {
  83 + // safeUserList.push(element.userName);
  84 + // });
  85 + // body = { ...body, salesCode: safeUserList };
  86 + // }
88 87 if (form.getFieldValue('salesCode')) {
89 88 body = { ...body, salesCode: [form.getFieldValue('salesCode')] };
90 89 }
... ...