Merge branch 'master' into zgt

曾国涛
2 parents 18cc2f96 f52ca711
Showing 9 changed files with 609 additions and 19 deletions
src/pages/Instalment/components/upload/uploadApp.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/FinancialEditDrawer.tsx
src/pages/Order/components/FinancialMergeDrawer.tsx
src/pages/Order/components/OrderDrawer copy.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/ResearchGroup/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -24,7 +24,7 @@ const App: React.FC = ({ uploadFile }) =&gt; {
         <p className="ant-upload-text">点击或者拖动文件到此处</p>
       </Dragger>
       <a
-        href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2035527699&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=npHyEhfRd6LugJ0St8OkvRmLYtQ%3D"
+        href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2036232762&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=rtc7LNVK9g3flXQeHdeGOXFOocY%3D"
         className="modul-a"
       >
         下载模板
-// import { PlusOutlined } from '@ant-design/icons';
 import { RESPONSE_CODE } from '@/constants/enum';
 import {
   postServiceOrderEditOrder,
-// import { PlusOutlined } from '@ant-design/icons';
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderNoNeedInvoicingEdit } from '@/services';
 import { enumToSelect } from '@/utils';
-// import { PlusOutlined } from '@ant-design/icons';
 import { RESPONSE_CODE } from '@/constants/enum';
 import { enumToSelect } from '@/utils';
 import {
@@ -647,6 +647,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             const res = await postKingdeeRepCustomer({
               data: { search: keywords },
             });
+            console.log(res);
+
             let options = res?.rows?.map((c: any) => {
               return {
                 ...c,
@@ -3,8 +3,10 @@ import {
   postCanrdApiUserAddressList,
   postCanrdApiUserDetail,
   postCanrdApiUserNowMoneyCheck,
-  postDistrictSelectBelongByName,
+  postDistrictAddOrderAndProvince,
   postDistrictSelectByLevel,
+  postDistrictSelectByNameAndLevel,
+  postDistrictSelOrderProvince,
   postKingdeeRepCustomerDetail,
   postKingdeeRepMaterial,
   postKingdeeRepMaterialUnit,
@@ -17,15 +19,15 @@ import {
   postServiceOrderUpdateOrder,
 } from '@/services';
 import {
+  enumToSelect,
   FloatAdd,
   FloatMul,
-  enumToSelect,
   getAliYunOSSFileNameFromUrl,
   getUserInfo,
 } from '@/utils';
-import { getDefaultString } from '@/utils/StringUtil';
 import { getTeacherCustomFieldNumber } from '@/utils/kingdee';
 import { getSalesCodeOptions } from '@/utils/order';
+import { getDefaultString } from '@/utils/StringUtil';
 import {
   DrawerForm,
   FormListActionType,
@@ -38,7 +40,7 @@ import {
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
-import { Button, Form, Modal, message } from 'antd';
+import { Button, Form, message, Modal } from 'antd';
 import { cloneDeep } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 import {
@@ -879,6 +881,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           //新增
           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 (
@@ -1115,9 +1128,24 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 key: c.id,
               };
             });
-            console.log(form.getFieldsValue());
-            console.log(form.getFieldValue('customerName'));
+            console.log(form.getFieldValue('customerShippingAddress'));
+            console.log(form.getFieldValue('id'));
+            if (form.getFieldValue('id') !== undefined) {
+              const resp = await postDistrictSelOrderProvince({
+                data: form.getFieldValue('id'),
+              });
+              console.log();
+
+              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);
+              console.log(form.getFieldsValue());
+            }
             //判断如果是在修改或者复制，那么第一次请求的时候，默认生成当前收货人信息的option
+
             let realName = form.getFieldValue('customerName');
             let detail = form.getFieldValue('customerShippingAddress');
             let institution = form.getFieldValue('institution');
@@ -1195,11 +1223,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             key="province"
             width={100}
             label="省"
+            allowClear={false}
             fieldProps={{
               labelInValue: true,
             }}
             onChange={(value) => {
-              setProvince(value?.value);
+              if (value !== undefined || value !== null) {
+                setProvince(value?.value);
+              }
             }}
             placeholder="请选择"
             rules={[
@@ -1224,13 +1255,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             name="city"
             width={100}
             label="市"
+            allowClear={false}
             disabled={province === ''}
             fieldProps={{
               labelInValue: true,
             }}
             placeholder="请选择"
             onChange={(value) => {
-              setCity(value?.value);
+              if (value !== undefined || value !== null) {
+                setCity(value?.value);
+              }
             }}
             rules={[
               {
@@ -1241,8 +1275,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             request={async () => {
               if (province !== '') {
                 let cityOptions = [];
-                let res = await postDistrictSelectBelongByName({
-                  data: province,
+                let res = await postDistrictSelectByNameAndLevel({
+                  data: { district: province, level: 1 },
                 });
                 if (res && res.data) {
                   cityOptions = res.data.map((item) => ({
@@ -1260,8 +1294,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             name="district"
             width={100}
             label="区"
+            allowClear={false}
             onChange={(value) => {
-              setDistrict(value?.value);
+              if (value !== undefined || value !== null) {
+                setDistrict(value?.value);
+              }
             }}
             disabled={city === ''}
             fieldProps={{
@@ -1275,9 +1312,13 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               },
             ]}
             request={async () => {
+              console.log(form.getFieldsValue());
+
               if (city !== '') {
                 let districtOptions = [];
-                let res = await postDistrictSelectBelongByName({ data: city });
+                let res = await postDistrictSelectByNameAndLevel({
+                  data: { district: city, level: 2 },
+                });
                 if (res && res.data) {
                   districtOptions = res.data.map((item) => ({
                     value: item.district,
@@ -1690,6 +1731,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       const res = await postKingdeeRepMaterial({
                         data: { search: keywords },
                       });
+                      console.log(res.customerShippingAddress);
+
                       let options = res?.rows?.map((p: any) => {
                         return {
                           ...p,
@@ -485,9 +485,9 @@ const PrepaidPage = () =&gt; {
             defaultValue: {
               option: { fixed: 'right', disable: true },
             },
-            onChange(value) {
-              console.log('value: ', value);
-            },
+            // onChange(value) {
+            //   console.log('value: ', value);
+            // },
           }}
           rowKey="id"
           search={{
@@ -1136,6 +1136,12 @@ export interface DistrictDo {
   pid?: number;
 }
+export interface DistrictSearchDo {
+  district?: string;
+  /** @format int32 */
+  level?: number;
+}
+
 export interface Entry {
   bankAccount?: string;
   bankName?: string;
@@ -2043,6 +2049,14 @@ export interface OrderInspectionStageVO {
   value3?: string;
 }
+export interface OrderMainProDo {
+  city?: string;
+  district?: string;
+  /** @format int64 */
+  oid?: number;
+  province?: string;
+}
+
 export interface OrderOptLogQueryVO {
   /** @format int32 */
   current?: number;
@@ -3014,6 +3028,325 @@ export interface ResearchGroupMemberRequestsRequest {
   total?: number;
 }
+export interface ResearchGroupAccountAddRequest {
+  /**
+   * @description
+   *   关联的账号id
+   * @format int64
+   */
+  accountId?: number;
+  /**
+   * @description
+   *   关联的账号名称
+   */
+  accountName?: string;
+  /**
+   * @description
+   *   关联的账号手机号
+   */
+  accountPhone?: string;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+}
+
+export interface ResearchGroupAccountEditRequest {
+  /**
+   * @description
+   *   关联的账号id
+   * @format int64
+   */
+  accountId?: number;
+  /**
+   * @description
+   *   关联的账号名称
+   */
+  accountName?: string;
+  /**
+   * @description
+   *   关联的账号手机号
+   */
+  accountPhone?: string;
+  /**
+   * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupAddRequest {
+  accounts?: Array<ResearchGroupAccountAddRequest>;
+  /**
+   * @description
+   *   课题组名称
+   */
+  group?: string;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leader?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
+}
+
+export interface ResearchGroupDeleteRequest {
+  /**
+   * @description
+   *   主键id
+   */
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupDetailRequest {
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupEditRequest {
+  /**
+   * @description
+   *   课题组预存账号
+   */
+  accounts?: Array<ResearchGroupAccountEditRequest>;
+  /**
+   * @description
+   *   课题组名称
+   */
+  group?: string;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leader?: string;
+  /**
+   * @description
+   *   课题组成员集合
+   */
+  members?: Array<ResearchGroupMemberEditRequest>;
+}
+
+export interface ResearchGroupListRequest {
+  /**
+   * @description
+   *   预存账号手机号
+   */
+  accountPhone?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leaderName?: string;
+  /**
+   * @description
+   *   课题组成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   课题组成员手机号
+   */
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+}
+
+export interface ResearchGroupMemberAddRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberEditRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberRequestAddRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+}
+
+export interface ResearchGroupMemberRequestDeleteRequest {
+  /**
+   * @description
+   *   主键id
+   */
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupMemberRequestDetailRequest {
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+}
+
+export interface ResearchGroupMemberRequestEditRequest {
+  /**
+   * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+}
+
+export interface ResearchGroupMemberRequestsRequest {
+  /**
+   * @description
+   *   审核备注
+   */
+  auditNotes?: string;
+  /**
+   * @description
+   *   审核状态
+   */
+  auditStatus?: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   课题组名称
+   */
+  groupName?: string;
+  /**
+   * @description
+   *   成员名称
+   */
+  memberName?: string;
+  /**
+   * @description
+   *   成员手机号
+   */
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+}
+
 export interface ResetPwdVO {
   /** @format int64 */
   userId?: number;
@@ -45,6 +45,7 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   DistrictDo,
+  DistrictSearchDo,
   Dto,
   InventoryMaterialStockReq,
   InvoiceDto,
@@ -61,6 +62,7 @@ import type {
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
   OrderFieldLockApplyQueryVO,
+  OrderMainProDo,
   OrderOptLogQueryVO,
   OrderProfitAnalysisVo,
   OrderStagesDelDo,
@@ -1841,6 +1843,148 @@ export const postCommonAudit = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postDistrictAddOrderAndProvince */
+export interface PostDistrictAddOrderAndProvinceOption {
+  /**
+   * @description
+   *   orderMainProDo
+   */
+  body: {
+    /**
+        @description
+          orderMainProDo */
+    orderMainProDo: OrderMainProDo;
+  };
+}
+
+/** @description response type for postDistrictAddOrderAndProvince */
+export interface PostDistrictAddOrderAndProvinceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostDistrictAddOrderAndProvinceResponseSuccess =
+  PostDistrictAddOrderAndProvinceResponse[200];
+/**
+ * @description
+ *   添加到订单省市区关系表
+ * @tags order-district-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postDistrictAddOrderAndProvince = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/district/addOrderAndProvince';
+  function request(
+    option: PostDistrictAddOrderAndProvinceOption,
+  ): Promise<PostDistrictAddOrderAndProvinceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostDistrictAddOrderAndProvinceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postDistrictSelOrderProvince */
+export interface PostDistrictSelOrderProvinceOption {
+  /**
+   * @description
+   *   oId
+   */
+  body: {
+    /**
+        @description
+          oId */
+    oId: number;
+  };
+}
+
+/** @description response type for postDistrictSelOrderProvince */
+export interface PostDistrictSelOrderProvinceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostDistrictSelOrderProvinceResponseSuccess =
+  PostDistrictSelOrderProvinceResponse[200];
+/**
+ * @description
+ *   查询订单的省市区
+ * @tags order-district-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postDistrictSelOrderProvince = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/district/selOrderProvince';
+  function request(
+    option: PostDistrictSelOrderProvinceOption,
+  ): Promise<PostDistrictSelOrderProvinceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostDistrictSelOrderProvinceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for getDistrictSelectAll */
 export interface GetDistrictSelectAllResponse {
   /**
@@ -2173,6 +2317,77 @@ export const postDistrictSelectByLevel = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postDistrictSelectByNameAndLevel */
+export interface PostDistrictSelectByNameAndLevelOption {
+  /**
+   * @description
+   *   districtSearchDo
+   */
+  body: {
+    /**
+        @description
+          districtSearchDo */
+    districtSearchDo: DistrictSearchDo;
+  };
+}
+
+/** @description response type for postDistrictSelectByNameAndLevel */
+export interface PostDistrictSelectByNameAndLevelResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostDistrictSelectByNameAndLevelResponseSuccess =
+  PostDistrictSelectByNameAndLevelResponse[200];
+/**
+ * @description
+ *   根据名字和级别进行筛选
+ * @tags order-district-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postDistrictSelectByNameAndLevel = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/district/selectByNameAndLevel';
+  function request(
+    option: PostDistrictSelectByNameAndLevelOption,
+  ): Promise<PostDistrictSelectByNameAndLevelResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostDistrictSelectByNameAndLevelResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for getError */
 export interface GetErrorResponse {
   /**