Merge branch 'callback'

曾国涛
2 parents 0ac97673 e9ef594b
Showing 2 changed files with 41 additions and 32 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/OrderReport/index.tsx
@@ -3,7 +3,6 @@ import {
   postCanrdApiUserAddressList,
   postCanrdApiUserDetail,
   postCanrdApiUserNowMoneyCheck,
-  postDistrictAddOrderAndProvince,
   postDistrictSelectByLevel,
   postDistrictSelectByNameAndLevel,
   postDistrictSelOrderProvince,
@@ -877,21 +876,12 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
           }
-
+          values.province = province;
+          values.city = city;
+          values.district = district;
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
-            if (res && res.data.length === 2) {
-              const orderMainProDo = {
-                oId: res.data[0],
-                province: province,
-                city: city,
-                district: district,
-              };
-              await postDistrictAddOrderAndProvince({
-                data: orderMainProDo,
-              });
-            }
           }
           //修改或者申请售后或者申请修改
           if (
@@ -915,6 +905,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             values.deleteSubOrderLists = diff;
  
             if (optType('edit')) {
+              values.province = province;
+              values.city = city;
+              values.district = district;
               res = await postServiceOrderUpdateOrder({ data: values });
             }
  
@@ -1134,12 +1127,20 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               const resp = await postDistrictSelOrderProvince({
                 data: form.getFieldValue('id'),
               });
-              setProvince(resp.data.province);
-              form.setFieldValue('province', resp.data.province);
-              setCity(resp.data.city);
-              form.setFieldValue('city', resp.data.city);
-              setDistrict(resp.data.district);
-              form.setFieldValue('district', resp.data.district);
+              if (resp && resp.data) {
+                if (resp.data.province) {
+                  setProvince(resp.data.province);
+                  form.setFieldValue('province', resp.data.province);
+                }
+                if (resp.data.city) {
+                  setCity(resp.data.city);
+                  form.setFieldValue('city', resp.data.city);
+                }
+                if (resp.data.district) {
+                  setDistrict(resp.data.district);
+                  form.setFieldValue('district', resp.data.district);
+                }
+              }
               console.log(form.getFieldsValue());
             }
             //判断如果是在修改或者复制，那么第一次请求的时候，默认生成当前收货人信息的option
@@ -1226,7 +1227,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               labelInValue: true,
             }}
             onChange={(value) => {
+              console.log(value);
+
               if (value !== undefined || value !== null) {
+                console.log('setProvince');
+
                 setProvince(value?.value);
               }
             }}
@@ -1274,11 +1279,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               let cityOptions = [];
               console.log(form.getFieldValue('id'));
               if (form.getFieldValue('id')) {
-                console.log('id');
                 const resp = await postDistrictSelOrderProvince({
                   data: form.getFieldValue('id'),
                 });
-                if (resp.data.province !== null) {
+                if (
+                  resp.data.province !== null &&
+                  resp.data.province !== undefined
+                ) {
+                  console.log('province is ok');
                   let res = await postDistrictSelectByNameAndLevel({
                     data: { district: resp.data.province, level: 1 },
                   });
@@ -1291,6 +1299,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 }
               }
               if (province !== '') {
+                console.log(province);
+                console.log('province is okk');
                 let res = await postDistrictSelectByNameAndLevel({
                   data: { district: province, level: 1 },
                 });
@@ -1332,7 +1342,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 const resp = await postDistrictSelOrderProvince({
                   data: form.getFieldValue('id'),
                 });
-                if (resp.data.city !== null) {
+                if (resp.data.city !== null && resp.data.city !== undefined) {
                   let res = await postDistrictSelectByNameAndLevel({
                     data: { district: resp.data.city, level: 2 },
                   });
 import {
   getOrderErpOrderZoNingSelectAll,
-  getOrderErpOrderZoNingSelectUserAll,
   postOrderErpOrderZoNingSelectSaleUserByProvince,
   postServiceOrderQueryReportFormsInformation,
   postServiceOrderQuerySalesCode,
@@ -66,7 +65,7 @@ const OrderReportPage = () =&gt; {
     setLoading(true);
     let body = {
       statisticsMethod: '',
-      salesCode: [null],
+      // salesCode: [null],
       productBelongBusiness: form.getFieldValue('productBelongBusiness'),
       maxAccount: form.getFieldValue('maxAccount'),
       includeExperimentalEquipment: form.getFieldValue(
@@ -77,14 +76,14 @@ const OrderReportPage = () =&gt; {
     };
     // console.log(form.getFieldValue('zoning').value);
  
-    let res = await getOrderErpOrderZoNingSelectUserAll();
-    if (res && res.data) {
-      let safeUserList = [];
-      res.data.forEach((element) => {
-        safeUserList.push(element.userName);
-      });
-      body = { ...body, salesCode: safeUserList };
-    }
+    // let res = await getOrderErpOrderZoNingSelectUserAll();
+    // if (res && res.data) {
+    //   let safeUserList = [];
+    //   res.data.forEach((element) => {
+    //     safeUserList.push(element.userName);
+    //   });
+    //   body = { ...body, salesCode: safeUserList };
+    // }
     if (form.getFieldValue('salesCode')) {
       body = { ...body, salesCode: [form.getFieldValue('salesCode')] };
     }