feat: update 指标修改

zhongnanhuang
1 parent b9d40c58
Showing 4 changed files with 184 additions and 38 deletions
src/pages/Order/components/FinancialEditDrawer.tsx
src/pages/OrderReport/components/OrderStatisticCard.tsx
src/services/definition.ts
src/services/request.ts
@@ -8,10 +8,15 @@ export default ({ subOrders, setVisible, onClose }) =&gt; {
   const subOrderIds = subOrders?.map((subOrder) => {
     return subOrder?.id;
   });
-  const [form] = Form.useForm<{ collectMoneyTime: string; subIds: [] }>();
+  const [form] = Form.useForm<{
+    collectMoneyTime: string;
+    subIds: [];
+    financialReceiptIssuanceTime: string;
+  }>();
   return (
     <DrawerForm<{
       collectMoneyTime: string;
+      financialReceiptIssuanceTime: string;
       subIds: [];
     }>
       open
@@ -35,6 +40,9 @@ export default ({ subOrders, setVisible, onClose }) =&gt; {
           data: {
             subIds: subOrderIds,
             collectMoneyTime: form.getFieldValue('collectMoneyTime'),
+            financialReceiptIssuanceTime: form.getFieldValue(
+              'financialReceiptIssuanceTime',
+            ),
           },
         });
         if (res.result === RESPONSE_CODE.SUCCESS) {
@@ -47,10 +55,18 @@ export default ({ subOrders, setVisible, onClose }) =&gt; {
       }}
     >
       <ProFormDatePicker
+        key="financialReceiptIssuanceTime"
+        width="lg"
+        name="financialReceiptIssuanceTime"
+        rules={[{ required: true, message: '收据时间必填' }]}
+        label="开收据时间"
+      />
+      <ProFormDatePicker
         key="collectMoneyTime"
         width="lg"
         name="collectMoneyTime"
         label="收款时间"
+        rules={[{ required: true, message: '收款时间必填' }]}
       />
     </DrawerForm>
   );
 import { RESPONSE_CODE } from '@/constants/enum';
 import { postServiceOrderUpdateReportFormsTarget } from '@/services';
 import Icon, { EditTwoTone } from '@ant-design/icons';
-import { ModalForm, ProCard, ProFormDigit } from '@ant-design/pro-components';
+import {
+  ModalForm,
+  ProCard,
+  ProFormDatePicker,
+  ProFormDigit,
+} from '@ant-design/pro-components';
 import { Flex, Form, message } from 'antd';
 import { useState } from 'react';
  
@@ -11,6 +16,7 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
     statisticsMethod: string;
     target: number;
     daysOfMonth: number;
+    month: string;
   }>();
   const [targetValue, setTargetValue] = useState(0);
  
@@ -103,12 +109,12 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
       <Flex vertical>
         <Flex>
           <Flex align="center">
-            <span className="text-base pr-1">{unit}</span>
+            <span className="pr-1 text-base">{unit}</span>
             <div style={{ width: 'max-content', display: 'flex' }}>
               <span className="text-2xl">
                 {content}
                 {editable ? (
-                  <span className="text-xs pl-1">
+                  <span className="pl-1 text-xs">
                     {statisticsMethod === 'YEAR_STATISTICS' ? '每年' : '每月'}
                   </span>
                 ) : (
@@ -140,7 +146,7 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
                 ) : (
                   <span className="text-2xl">
                     {content}
-                    {editable ? <span className="text-xs px-1">每月</span> : ''}
+                    {editable ? <span className="px-1 text-xs">每月</span> : ''}
                   </span>
                 )
               ) : (
@@ -150,7 +156,7 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
               {!editable ? (
                 <span className="text-2xl">
                   {content}
-                  {editable ? <span className="text-xs pl-1">每月</span> : ''}
+                  {editable ? <span className="pl-1 text-xs">每月</span> : ''}
                 </span>
               ) : (
                 ''
@@ -265,6 +271,7 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
         statisticsMethod: string;
         target: number;
         daysOfMonth: number;
+        month: string;
       }>
         title="编辑指标"
         width={500}
@@ -296,6 +303,17 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
           placeholder="请输入指标"
           rules={[{ required: true, message: '指标必填' }]}
         />
+        <ProFormDatePicker
+          width="md"
+          name="month"
+          fieldProps={{
+            picker: 'month',
+            format: 'YYYY-MM',
+          }}
+          label="日期"
+          placeholder="请输入日期"
+          rules={[{ required: true, message: '日期必填' }]}
+        />
  
         {statisticsMethod === 'MONTH_STATISTICS' ? (
           <ProFormDigit
@@ -300,6 +300,7 @@ export interface AdminUserVO {
   id?: number;
   isAdmin?: boolean;
   nickName?: string;
+  parentName?: string;
   password?: string;
   phone?: string;
   /** @format date-time */
@@ -894,16 +895,6 @@ export interface View {
   contentType?: string;
 }
  
-export interface YearMonth {
-  leapYear?: boolean;
-  /** @format int32 */
-  month?: number;
-  /** @format int32 */
-  monthValue?: number;
-  /** @format int32 */
-  year?: number;
-}
-
 export interface Dto {
   /**
    * @description
@@ -26,7 +26,6 @@ import type {
   DictionaryQueryVO,
   DictionaryVO,
   Dto,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -229,7 +228,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -250,9 +251,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -276,7 +277,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -302,9 +305,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -329,7 +332,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -355,9 +360,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -382,7 +387,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -403,9 +410,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -429,7 +436,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -450,9 +459,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -477,7 +486,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -498,9 +509,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -525,7 +536,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -546,9 +559,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -7063,6 +7076,60 @@ export const postServiceOrderQueryAfterSalesInfoSnapshot =
     return request;
   })();
  
+/** @description response type for postServiceOrderQueryAnnualTarget */
+export interface PostServiceOrderQueryAnnualTargetResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderQueryAnnualTargetResponseSuccess =
+  PostServiceOrderQueryAnnualTargetResponse[200];
+/**
+ * @description
+ *   查询年度指标
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderQueryAnnualTarget = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/queryAnnualTarget';
+  function request(): Promise<PostServiceOrderQueryAnnualTargetResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceOrderQueryAnnualTargetResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderQueryCustomerInformation */
 export interface PostServiceOrderQueryCustomerInformationOption {
   /**
@@ -7758,6 +7825,60 @@ export const postServiceOrderSupplierSendOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postServiceOrderTest */
+export interface PostServiceOrderTestResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderTestResponseSuccess =
+  PostServiceOrderTestResponse[200];
+/**
+ * @description
+ *   测试
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderTest = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/test';
+  function request(): Promise<PostServiceOrderTestResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceOrderTestResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderUpdateAnnex */
 export interface PostServiceOrderUpdateAnnexOption {
   /**