feat(order): 新增订单发货功能并优化订单列表

- 新增订单发货相关的字段和功能，包括自研产品、代买代购、竞标/打折等选项- 优化订单列表的展示和筛选功能，增加新的查询条件- 调整订单详情页面的布局和内容，提高可读性和易用性

feat(order): 新增订单发货功能并优化订单列表
- 新增订单发货相关的字段和功能，包括自研产品、代买代购、竞标/打折等选项- 优化订单列表的展示和筛选功能，增加新的查询条件- 调整订单详情页面的布局和内容，提高可读性和易用性
曾国涛
1 parent 7302113c
Showing 4 changed files with 276 additions and 109 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/services/definition.ts
src/services/request.ts
@@ -35,6 +35,7 @@ import {
   DrawerForm,
   FormListActionType,
   ProCard,
+  ProFormDatePicker,
   ProFormDateTimePicker,
   ProFormDependency,
   ProFormDigit,
@@ -86,42 +87,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
   const [district, setDistrict] = useState('');
   // const [productCustomerContactOptions, setProductCustomerContactOptions] =
   //   useState([]); //客户的收货人选项
-  const [form] = Form.useForm<{
-    isLocalData: boolean;
-    salesCode: '';
-    customerName: '';
-    customerContactNumber: '';
-    institution: '';
-    institutionContactName: '';
-    customerShippingAddress: '';
-    totalPayment: '';
-    paymentChannel: '';
-    paymentMethod: '';
-    productBelongBusiness: '';
-    invoicingStatus: '';
-    invoiceIdentificationNumber: '';
-    invoicingTime: '';
-    productBelongBusinessUpdateTime: '';
-    bank: '';
-    bankAccountNumber: '';
-    deleteSubOrderLists: [];
-    filePaths: [];
-    notes: '';
-    invoiceFirst: boolean;
-    list: [
-      {
-        productCode: '';
-        productName: '';
-        quantity: '';
-        productPrice: '';
-        parameters: '';
-        subOrderPayment: '';
-        unit: '';
-        serialNumber: '';
-        notes: '';
-      },
-    ];
-  }>();
+  const [form] = Form.useForm();
   const [accountOptions, setAccountOptions] = useState<any>([]);
   let copyData = cloneDeep(data);
@@ -1279,30 +1245,46 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           <ProFormDependency name={['companyType']}>
             {({ companyType }) => {
               const renderInstitutionContactName = () => (
-                <ProFormSelect
-                  key="institutionContactName"
-                  width="md"
-                  showSearch
-                  name="institutionContactName"
-                  rules={[{ required: true, message: '请输入课题组名称!' }]}
-                  request={async (value) => {
-                    const keywords = value?.keyWords || '';
-                    const res = await postResearchGroupsNameSet({
-                      data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
-                    });
-                    return res?.data?.map((c) => ({
-                      label: c,
-                      value: c,
-                      key: c,
-                    }));
-                  }}
-                  fieldProps={{ filterOption: () => true }}
-                  debounceTime={1000}
-                  label="课题组名称"
-                  placeholder="请输入名称"
-                />
+                <>
+                  <ProFormSelect
+                    key="institutionContactName"
+                    width="md"
+                    showSearch
+                    name="institutionContactName"
+                    rules={[{ required: true, message: '请输入课题组名称!' }]}
+                    request={async (value) => {
+                      const keywords = value?.keyWords || '';
+                      const res = await postResearchGroupsNameSet({
+                        data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
+                      });
+                      return Object.entries(res?.data || {}).map(
+                        ([researchGroupsId, researchGroupsName]) => ({
+                          label: researchGroupsName,
+                          value: researchGroupsName, // 使用 researchGroupsId 作为 value
+                          key: researchGroupsId,
+                          id: researchGroupsId,
+                        }),
+                      );
+                    }}
+                    fieldProps={{
+                      filterOption: () => true,
+                      onChange: (_, option) => {
+                        form.setFieldsValue({
+                          researchGroupId: option?.id || '',
+                        });
+                      },
+                    }}
+                    debounceTime={1000}
+                    label="课题组名称"
+                    placeholder="请输入名称"
+                  />
+                  <ProFormText
+                    hidden={true}
+                    key="researchGroupId"
+                    name="researchGroupId"
+                  ></ProFormText>
+                </>
               );
-
               const renderPlatformType = (fieldKey) => (
                 <ProFormSelect
                   key={fieldKey}
@@ -2114,11 +2096,59 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '所属事业部必填' }]}
                     disabled={optType('after-sales-check')}
                   />,
+                  <Group key="selfDevelop">
+                    <ProFormRadio.Group
+                      key="selfDevelop"
+                      name="selfDevelop"
+                      label="是否自研"
+                      initialValue={false}
+                      options={[
+                        {
+                          label: '是',
+                          value: true,
+                        },
+                        {
+                          label: '否',
+                          value: false,
+                        },
+                      ]}
+                    />
+                    <ProFormDependency name={['selfDevelop']}>
+                      {({ selfDevelop }) => {
+                        if (selfDevelop) {
+                          return (
+                            <ProFormDatePicker
+                              name="deliveryDatetime"
+                              label="日期"
+                            />
+                          );
+                        }
+                      }}
+                    </ProFormDependency>
+                  </Group>,
                   <ProFormRadio.Group
                     key="proxy"
                     name="proxy"
                     label="是否代买代购"
-                    initialValue={false}
+                    //hidden={true}
+                    initialValue={true}
+                    options={[
+                      {
+                        label: '是',
+                        value: true,
+                      },
+                      {
+                        label: '否',
+                        value: false,
+                      },
+                    ]}
+                  />,
+                  <ProFormRadio.Group
+                    key="discount"
+                    name="discount"
+                    label="是否竞标/打折"
+                    //hidden={true}
+                    initialValue={true}
                     options={[
                       {
                         label: '是',
@@ -2130,6 +2160,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       },
                     ]}
                   />,
+
                   <ProFormSelect
                     key={'shippingWarehouse' + listMeta.index}
                     placeholder="请选择发货仓库"
@@ -11,6 +11,7 @@ import {
   postServiceInvoiceCancelApply,
   postServiceOrderCancelSend,
   postServiceOrderConfirmInvoice,
+  postServiceOrderDeliverOrders,
   postServiceOrderGetCurrentOptNode,
   postServiceOrderNoNeedSend,
   postServiceOrderOrderCancel,
@@ -1232,6 +1233,15 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               </div>
             )}
+            {/* 确认发票状态 */}
+            {optRecord.deliveryStatusText !== null && (
+              <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
+                <Tag color={'success'} style={{ marginRight: '4px' }}>
+                  {optRecord.deliveryStatusText}
+                </Tag>
+              </div>
+            )}
+
             {/* 后置审核状态 */}
             {optRecord.postAuditStatus !== null ? (
               <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
@@ -2158,6 +2168,25 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             ) : (
               ''
             )}
+            {optRecord.paths?.includes('DELIVER_ORDER') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="确认交期？"
+                text="交期"
+                onConfirm={async () => {
+                  let body = { orderIds: [optRecord.id] };
+                  const data = await postServiceOrderDeliverOrders({
+                    data: body,
+                  });
+                  if (data.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(data.message);
+                    refreshTable();
+                  }
+                }}
+              />
+            ) : (
+              ''
+            )}
           </Flex>
         </Flex>
@@ -4583,6 +4612,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     return toolBtns;
   }
+
   // 监听 params 变化并重新获取数据
   useEffect(() => {
     if (paramsNew) {
@@ -79,6 +79,7 @@ export type ProcureReturnBillDtoStatus =
   | 'WAIT_SEND'
   | 'SENDED'
   | 'WAIT_AUDIT';
+export type SubOrderDeliveryStatus = 'WAIT_DELIVER' | 'DELIVERED';
 export type ProcureBillInfoAuditStatus =
   | 'WAIT_AUDIT'
   | 'AUDIT_PASS'
@@ -87,7 +88,6 @@ export type ProductCollectBillAuditStatus =
   | 'WAIT_AUDIT'
   | 'AUDIT_PASS'
   | 'AUDIT_FAIL';
-export type ProductCollectBillWarehouse = ProcureReturnBillDtoSendStore;
 export interface AdminAuthRoleVO {
   menuIds?: Array<number>;
   /** @format int64 */
@@ -1428,6 +1428,10 @@ export interface CustomerSaveReq {
   taxpayerNo?: string;
 }
+export interface DeliverOrdersDto {
+  orderIds?: Array<number>;
+}
+
 export interface DictionaryQueryVO {
   createByName?: string;
   createByNameLike?: string;
@@ -2702,11 +2706,13 @@ export interface OrderStagesFromDo {
   /** @format date-time */
   modifyTime?: string;
   orderStagesDeviceDoList?: Array<OrderStagesDeviceDo>;
+  payType?: string;
   payWay?: string;
   remark?: string;
   terminal?: string;
   /** @format double */
   totalPrice?: number;
+  userName?: string;
   vendor?: string;
   /** @format int32 */
   version?: number;
@@ -2746,6 +2752,7 @@ export interface OrderStagesSelDo {
   id?: number;
   /** @format int32 */
   pageSize?: number;
+  payType?: string;
   status?: Array<number>;
   statusText?: string;
   terminal?: string;
@@ -3472,6 +3479,12 @@ export interface QueryReportFormsDto {
   maxAccount?: number;
   /**
    * @description
+   *   月份
+   * @format int32
+   */
+  month?: number;
+  /**
+   * @description
    *   所属部门
    */
   productBelongBusiness?: string;
@@ -3485,6 +3498,12 @@ export interface QueryReportFormsDto {
    *   统计方式
    */
   statisticsMethod?: string;
+  /**
+   * @description
+   *   年份
+   * @format int32
+   */
+  year?: number;
 }
 export interface QueryUseOldInvoicingDto {
@@ -3737,6 +3756,7 @@ export interface ResearchGroupListRequest {
 }
 export interface ResearchGroupMemberRequestAddRequest {
+  accounts?: Array<ResearchGroupAccounts>;
   /**
    * @description
    *   审核备注
@@ -3800,6 +3820,7 @@ export interface ResearchGroupMemberRequestAddRequest {
    *   申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
    */
   requestType?: string;
+  requestTypeText?: string;
   updateByName?: string;
   /** @format date-time */
   updateTime?: string;
@@ -3876,6 +3897,7 @@ export interface ResearchGroupMemberRequestsRequest {
    *   申请备注
    */
   requestNotes?: string;
+  requestType?: string;
   /** @format int32 */
   start?: number;
   /** @format int32 */
@@ -3945,6 +3967,7 @@ export interface ResearchGroupRequestsDto {
    *   申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
    */
   requestType?: string;
+  requestTypeText?: string;
   updateByName?: string;
   /** @format date-time */
   updateTime?: string;
@@ -4065,6 +4088,10 @@ export interface SubOrder {
   createTime?: string;
   /** @format date-time */
   deadline?: string;
+  /** @format date-time */
+  deliveryDatetime?: string;
+  deliveryStatus?: SubOrderDeliveryStatus;
+  discount?: boolean;
   ext?: string;
   extendField?: string;
   feedbackRegistrationContent?: string;
@@ -4146,6 +4173,7 @@ export interface SubOrder {
   /** @format date-time */
   productionStartTime?: string;
   productionTimePushStatus?: string;
+  proxy?: boolean;
   purchaser?: string;
   /** @format int32 */
   quantity?: number;
@@ -4153,6 +4181,7 @@ export interface SubOrder {
   reissueNotes?: string;
   /** @format int64 */
   researchGroupId?: number;
+  selfDevelop?: boolean;
   serialNumber?: string;
   shippingWarehouse?: string;
   /** @format date-time */
@@ -4867,7 +4896,7 @@ export interface InvoiceReissueRecord {
    * @description
    *   发票ID列表
    */
-  invoiceIdIn?: Array<string>;
+  invoiceIdIn?: Array<number>;
   invoiceIds?: Array<number>;
   /**
    * @description
@@ -4886,6 +4915,7 @@ export interface InvoiceReissueRecord {
   pageSize?: number;
   passed?: boolean;
   paths?: Array<string>;
+  payee?: string;
   payees?: Array<string>;
   recordIds?: Array<number>;
   reissueStatus?: string;
@@ -4948,6 +4978,7 @@ export interface ProcureBillInfo {
   end?: number;
   /** @format int64 */
   id?: number;
+  idIn?: Array<number>;
   logicDelete?: boolean;
   notes?: string;
   notesLike?: string;
@@ -4955,6 +4986,8 @@ export interface ProcureBillInfo {
   pageSize?: number;
   paths?: Array<string>;
   procureBillDetailList?: Array<ProcureBillDetail>;
+  productIdIn?: Array<number>;
+  productNameLike?: string;
   /** @format int32 */
   start?: number;
   /** @format int32 */
@@ -4965,6 +4998,28 @@ export interface ProcureBillInfo {
   updateTime?: string;
 }
+export interface ProductCollectBillDetail {
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /** @format int64 */
+  id?: number;
+  /** @format int64 */
+  infoId?: number;
+  logicDelete?: boolean;
+  notes?: string;
+  number?: number;
+  paths?: Array<string>;
+  /** @format int64 */
+  productId?: number;
+  productName?: string;
+  productUnitName?: string;
+  productUnitPrice?: number;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 /**
  * @description
  *   礼品申领单
@@ -5006,15 +5061,18 @@ export interface ProductCollectBill {
   createTimeLe?: string;
   /** @format int32 */
   current?: number;
+  details?: Array<ProductCollectBillDetail>;
   /** @format int32 */
   end?: number;
   /** @format int64 */
   id?: number;
+  idIn?: Array<number>;
   logicDelete?: boolean;
   /** @format int32 */
   pageSize?: number;
   passed?: boolean;
   paths?: Array<string>;
+  productIdIn?: Array<number>;
   /**
    * @description
    *   商品名称
@@ -5042,18 +5100,7 @@ export interface ProductCollectBill {
    * @description
    *   申领仓库
    */
-  warehouse?: ProductCollectBillWarehouse;
-  /**
-   * @description
-   *   申领仓库
-   * @format int32
-   */
-  warehouseCode?: number;
-  /**
-   * @description
-   *   申领仓库
-   */
-  warehouseText?: string;
+  warehouse?: string;
 }
 export interface Product {
@@ -50,6 +50,7 @@ import type {
   CustomerDetailRes,
   CustomerListRes,
   CustomerSaveReq,
+  DeliverOrdersDto,
   DictionaryQueryVO,
   DictionaryVO,
   DistrictDo,
@@ -70,6 +71,7 @@ import type {
   MeasureUnitListRes,
   MergeIntegralDto,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -3828,9 +3830,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -3851,9 +3851,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -3877,9 +3877,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3905,9 +3903,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -3932,9 +3930,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -3960,9 +3956,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -3987,9 +3983,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4010,9 +4004,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -4036,9 +4030,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4059,9 +4051,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -4086,9 +4078,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4109,9 +4099,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -4136,9 +4126,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -4159,9 +4147,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -20815,6 +20803,77 @@ export const postServiceOrderDeleteWarningUserWhiteList =
     return request;
   })();
+/** @description request parameter type for postServiceOrderDeliverOrders */
+export interface PostServiceOrderDeliverOrdersOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: DeliverOrdersDto;
+  };
+}
+
+/** @description response type for postServiceOrderDeliverOrders */
+export interface PostServiceOrderDeliverOrdersResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderDeliverOrdersResponseSuccess =
+  PostServiceOrderDeliverOrdersResponse[200];
+/**
+ * @description
+ *   交付订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderDeliverOrders = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/deliverOrders';
+  function request(
+    option: PostServiceOrderDeliverOrdersOption,
+  ): Promise<PostServiceOrderDeliverOrdersResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderDeliverOrdersResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderEditOrder */
 export interface PostServiceOrderEditOrderOption {
   /**