feat: 添加订单商品信息字体大小调整

曾国涛
1 parent 0460bf4a
Showing 3 changed files with 505 additions and 949 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/services/definition.ts
@@ -1528,7 +1528,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       optionItemRender(item) {
                         if (item.type === 'add') {
                           return (
-                            <div title={item.name + '（新增商品信息）'}>
+                            <div
+                              style={{ fontSize: '11px' }}
+                              title={item.name + '（新增商品信息）'}
+                            >
                               <span style={{ color: '#333333' }}>
                                 {item.label}
                               </span>
@@ -1539,6 +1542,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                         }
                         return (
                           <div
+                            style={{ fontSize: '11px' }}
                             title={
                               item.label +
                               ' | ' +
@@ -1232,6 +1232,39 @@ const OrderPage = () =&gt; {
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
+            {optRecord.subPath?.includes('postAudit') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  createOptObject(optRecord.id, record.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+                }}
+              >
+                后置审核
+              </Button>
+            ) : (
+              ''
+            )}
+            {/* 加急审核 */}
+            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  console.log('here');
+                  setCurrentMainId(record.id);
+                  setCurretnOptSubId(optRecord.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                }}
+              >
+                加急审核
+              </Button>
+            ) : (
+              ''
+            )}
             {optRecord.subPath?.includes('salesConfirm') && (
               <ButtonConfirm
                 className="p-0"
@@ -1351,41 +1384,6 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {/* 加急审核 */}
-            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  console.log('here');
-                  setCurrentMainId(record.id);
-                  setCurretnOptSubId(optRecord.id);
-                  setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
-                }}
-              >
-                加急审核
-              </Button>
-            ) : (
-              ''
-            )}
-
-            {optRecord.subPath?.includes('postAudit') ? (
-              <Button
-                className="p-0"
-                type="link"
-                onClick={() => {
-                  createOptObject(optRecord.id, record.id);
-                  setCheckVisible(true);
-                  setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
-                }}
-              >
-                后置审核
-              </Button>
-            ) : (
-              ''
-            )}
-
             {optRecord.subPath?.includes('modifiedAuditRequest') ? (
               <Button
                 className="p-0"
@@ -2545,6 +2543,37 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space wrap>
+                  {record.mainPath?.includes('postAudit') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setCurrentMainId(record.id);
+                        setCurretnOptSubId(null);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
+                      }}
+                    >
+                      后置审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+                      }}
+                    >
+                      加急审核
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('salesConfirm') && (
                     <ButtonConfirm
                       className="p-0"
@@ -2607,22 +2636,6 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
-                    <Button
-                      className="p-0"
-                      type="link"
-                      onClick={() => {
-                        createOptObject(null, record.id);
-                        setCheckVisible(true);
-                        setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
-                      }}
-                    >
-                      加急审核
-                    </Button>
-                  ) : (
-                    ''
-                  )}
-
                   {record.mainPath?.includes('auditPaymentReceipt') ? (
                     <Button
                       className="p-0"
@@ -2705,22 +2718,6 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
-                  {record.mainPath?.includes('postAudit') ? (
-                    <Button
-                      className="p-0"
-                      type="link"
-                      onClick={() => {
-                        setCurrentMainId(record.id);
-                        setCurretnOptSubId(null);
-                        setCheckVisible(true);
-                        setOrderCheckType(CHECK_TYPE.WAITING_FOR_POST_AUDIT);
-                      }}
-                    >
-                      后置审核
-                    </Button>
-                  ) : (
-                    ''
-                  )}
                   {record.mainPath?.includes('procureOrder') ? (
                     <ButtonConfirm
@@ -86,6 +86,8 @@ export interface AdminAuthUserVO {
 export interface AdminDeptQueryVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -95,6 +97,8 @@ export interface AdminDeptQueryVO {
   /** @format int64 */
   pid?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -109,6 +113,8 @@ export interface AdminDeptVO {
 export interface AdminJobQueryVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -118,6 +124,8 @@ export interface AdminJobQueryVO {
   /** @format int32 */
   sort?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -136,6 +144,8 @@ export interface AdminMenuQueryVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   hidden?: number;
   icon?: string;
   /** @format int64 */
@@ -151,6 +161,8 @@ export interface AdminMenuQueryVO {
   /** @format int64 */
   pid?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   /** @format int32 */
   type?: number;
@@ -181,6 +193,8 @@ export interface AdminRoleQueryVO {
   /** @format int32 */
   current?: number;
   dataScope?: string;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -192,6 +206,8 @@ export interface AdminRoleQueryVO {
   permission?: string;
   remark?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -209,22 +225,30 @@ export interface AdminUserLoginByPhoneVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   phone?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
 export interface AdminUserLoginByPwdVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   imgCaptchaCode?: string;
   imgCaptchaUuid?: string;
   /** @format int32 */
   pageSize?: number;
   password?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -234,11 +258,15 @@ export interface AdminUserModifyPwdVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   password?: string;
   phone?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -246,8 +274,12 @@ export interface AdminUserPasswordRecoverEmailVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -256,6 +288,8 @@ export interface AdminUserQueryVO {
   /** @format int32 */
   current?: number;
   email?: string;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -266,6 +300,8 @@ export interface AdminUserQueryVO {
   phone?: string;
   sex?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   userName?: string;
   workerType?: string;
@@ -276,6 +312,8 @@ export interface AdminUserRegisterVO {
   /** @format int32 */
   current?: number;
   email?: string;
+  /** @format int32 */
+  end?: number;
   isAgreeAgreement?: boolean;
   /** @format int32 */
   pageSize?: number;
@@ -285,6 +323,8 @@ export interface AdminUserRegisterVO {
   safeQuestion?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -480,8 +520,12 @@ export interface ApiOrderCustomersRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -528,221 +572,6 @@ export interface ApiQueryOrderStatusCountsRequest {
   uid?: number;
 }
-export interface ApplyInvoiceDto {
-  /**
-   * @description
-   *   备注
-   */
-  applyInvoicingNotes?: string;
-  /**
-   * @description
-   *   开票备注
-   */
-  comment?: string;
-  /**
-   * @description
-   *   联系人
-   */
-  contacts?: string;
-  /**
-   * @description
-   *   开票内容
-   */
-  content?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  failureReason?: string;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   发票地址
-   */
-  invoiceAddress?: string;
-  /**
-   * @description
-   *   发票明细
-   */
-  invoiceDetails?: Array<InvoiceDetail>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   开票人
-   */
-  invoicingPerson?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTime?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingTypeText?: string;
-  /** @format date */
-  invoicingdate?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   是否加急文本
-   */
-  isUrgentText?: string;
-  logicDelete?: boolean;
-  /**
-   * @description
-   *   买方注册地址
-   */
-  partyAAddress?: string;
-  /**
-   * @description
-   *   买方开户行账号
-   */
-  partyABankAccount?: string;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyAName?: string;
-  /**
-   * @description
-   *   买方开户行
-   */
-  partyAOpenBank?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumber?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   抬头类型
-   */
-  partyAType?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方注册地址
-   */
-  partyBAddress?: string;
-  /**
-   * @description
-   *   卖方开户行账号
-   */
-  partyBBankAccount?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   卖方开户行
-   */
-  partyBOpenBank?: string;
-  /**
-   * @description
-   *   卖方电话号码
-   */
-  partyBPhoneNumber?: string;
-  /**
-   * @description
-   *   卖方税号
-   */
-  partyBTaxid?: string;
-  /**
-   * @description
-   *   发票金额
-   * @format double
-   */
-  price?: number;
-  /**
-   * @description
-   *   接收邮箱地址
-   */
-  receiveEmail?: string;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodes?: Array<string>;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodesText?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  statusText?: string;
-  /**
-   * @description
-   *   子订单id
-   */
-  subOrderIds?: Array<number>;
-  /**
-   * @description
-   *   关联订单
-   */
-  subOrders?: Array<SubOrder>;
-  /** @format double */
-  totalPrice?: number;
-  totalPriceText?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   开票类型文本
-   */
-  typeText?: string;
-  /**
-   * @description
-   *   用户id
-   */
-  uid?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-}
-
 export interface AuditDto {
   /**
    * @description
@@ -767,11 +596,15 @@ export interface AuditDto {
 export interface AuditVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   status?: number;
   /** @format int32 */
   total?: number;
@@ -841,16 +674,32 @@ export interface CancelSendOrderDto {
 export interface CaptchaMessageVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   imgCaptchaCode?: string;
   imgCaptchaUuid?: string;
   /** @format int32 */
   pageSize?: number;
   phone?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   type?: string;
 }
+export interface CommonAuditRequest {
+  extend?: any;
+  /**
+   * @description
+   *   id集合
+   */
+  ids?: Array<string>;
+  notes?: string;
+  pass?: boolean;
+  type?: string;
+}
+
 export interface Contactperson {
   birthday?: string;
   contactAddress?: string;
@@ -1038,6 +887,8 @@ export interface DictionaryQueryVO {
   dictCode?: string;
   dictName?: string;
   dictValue?: string;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1047,6 +898,8 @@ export interface DictionaryQueryVO {
   /** @format int32 */
   sort?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -1061,6 +914,13 @@ export interface DictionaryVO {
   sort?: number;
 }
+export interface DistrictDo {
+  /** @format int32 */
+  level?: number;
+  /** @format int32 */
+  pid?: number;
+}
+
 export interface Entry {
   bankAccount?: string;
   bankName?: string;
@@ -1177,391 +1037,18 @@ export interface InvoiceDto {
   status?: string;
 }
-export interface InvoiceRecordDto {
-  applyInvoicingNotes?: string;
+export interface InvoiceRecordQueryRequest {
+  /** @format date */
+  createTimeGe?: string;
+  /** @format date */
+  createTimeLe?: string;
+  /** @format int32 */
+  pageNumber?: number;
+  /** @format int32 */
+  pageSize?: number;
   /**
    * @description
-   *   开票备注
-   */
-  comment?: string;
-  /**
-   * @description
-   *   联系人
-   */
-  contacts?: string;
-  /**
-   * @description
-   *   开票内容
-   */
-  content?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  failureReason?: string;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   发票地址
-   */
-  invoiceAddress?: string;
-  /**
-   * @description
-   *   发票明细
-   */
-  invoiceDetails?: Array<InvoiceDetail>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   开票人
-   */
-  invoicingPerson?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTime?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   开具类型
-   */
-  invoicingTypeText?: string;
-  /** @format date */
-  invoicingdate?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   是否加急文本
-   */
-  isUrgentText?: string;
-  logicDelete?: boolean;
-  /**
-   * @description
-   *   买方注册地址
-   */
-  partyAAddress?: string;
-  /**
-   * @description
-   *   买方开户行账号
-   */
-  partyABankAccount?: string;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyAName?: string;
-  /**
-   * @description
-   *   买方开户行
-   */
-  partyAOpenBank?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumber?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   抬头类型
-   */
-  partyAType?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方注册地址
-   */
-  partyBAddress?: string;
-  /**
-   * @description
-   *   卖方开户行账号
-   */
-  partyBBankAccount?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   卖方开户行
-   */
-  partyBOpenBank?: string;
-  /**
-   * @description
-   *   卖方电话号码
-   */
-  partyBPhoneNumber?: string;
-  /**
-   * @description
-   *   卖方税号
-   */
-  partyBTaxid?: string;
-  /**
-   * @description
-   *   发票金额
-   * @format double
-   */
-  price?: number;
-  /**
-   * @description
-   *   接收邮箱地址
-   */
-  receiveEmail?: string;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodes?: Array<string>;
-  /**
-   * @description
-   *   订单来源
-   */
-  salesCodesText?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   开票状态
-   */
-  statusText?: string;
-  /**
-   * @description
-   *   子订单id
-   */
-  subOrderIds?: Array<number>;
-  /**
-   * @description
-   *   关联订单
-   */
-  subOrders?: Array<SubOrder>;
-  /** @format double */
-  totalPrice?: number;
-  totalPriceText?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   开票类型文本
-   */
-  typeText?: string;
-  /**
-   * @description
-   *   用户id
-   */
-  uid?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-}
-
-export interface InvoiceRecordQueryRequest {
-  /**
-   * @description
-   *   联系人
-   */
-  contactsLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   IdIn
-   */
-  idIn?: Array<number>;
-  /**
-   * @description
-   *   关联发票id
-   */
-  invoiceId?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumber?: string;
-  /**
-   * @description
-   *   发票号码
-   */
-  invoiceNumberLike?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeGe?: string;
-  /**
-   * @description
-   *   开票时间
-   * @format date-time
-   */
-  invoicingTimeLe?: string;
-  /**
-   * @description
-   *   开票类型
-   */
-  invoicingType?: string;
-  /**
-   * @description
-   *   是否加急
-   */
-  isUrgent?: boolean;
-  /**
-   * @description
-   *   订单号
-   * @format int64
-   */
-  mainOrderId?: number;
-  /**
-   * @description
-   *   主订单idIn
-   */
-  mainOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   订单号
-   */
-  mainOrderIdLike?: string;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildDetails?: boolean;
-  /**
-   * @description
-   *   是否需要构建发票明细
-   */
-  needBuildSubOrders?: boolean;
-  /** @format int32 */
-  pageSize?: number;
-  /**
-   * @description
-   *   买方名称
-   */
-  partyANameLike?: string;
-  /**
-   * @description
-   *   买方电话号码
-   */
-  partyAPhoneNumberLike?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxid?: string;
-  /**
-   * @description
-   *   买方税号
-   */
-  partyATaxidLike?: string;
-  partyB?: string;
-  /**
-   * @description
-   *   卖方名称
-   */
-  partyBName?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCode?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCodeLike?: string;
-  /** @format int32 */
-  start?: number;
-  /**
-   * @description
-   *   发票状态
-   */
-  status?: string;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIn?: Array<string>;
-  /**
-   * @description
-   *   状态非空
-   */
-  statusIsNotNull?: boolean;
-  /**
-   * @description
-   *   状态为空
-   */
-  statusIsNull?: boolean;
-  /**
-   * @description
-   *   子订单
-   * @format int64
-   */
-  subOrderId?: number;
-  /**
-   * @description
-   *   子订单idIn
-   */
-  subOrderIdIn?: Array<number>;
-  /**
-   * @description
-   *   子订单
-   */
-  subOrderIdLike?: string;
-  /** @format int32 */
-  total?: number;
-  /**
-   * @description
-   *   开票类型
-   */
-  type?: string;
-  /**
-   * @description
-   *   用户id
+   *   用户id
    */
   uid?: string;
 }
@@ -1581,14 +1068,10 @@ export interface ItemSaItem {
 export interface MainOrderqueryRequest {
   afterInvoicingStatusIsNull?: boolean;
-  /** @format date */
-  createDateGe?: string;
-  /** @format date */
-  createDateLe?: string;
   /** @format date-time */
-  createTimeGe?: string;
+  invoicingTimeGe?: string;
   /** @format date-time */
-  createTimeLe?: string;
+  invoicingTimeLe?: string;
   orderStatusNotIn?: Array<string>;
   /** @format int32 */
   pageNumber?: number;
@@ -1730,10 +1213,14 @@ export interface MeasureUnitListResRow {
 export interface MessageQueryDTO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   isReaded?: string;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   username?: string;
 }
@@ -1769,6 +1256,8 @@ export interface OrderAuditLogQueryVO {
   applyId?: number;
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1778,6 +1267,8 @@ export interface OrderAuditLogQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -1812,6 +1303,8 @@ export interface OrderBaseInfoQueryVO {
   customerCode?: string;
   customerPo?: string;
   customerStyle?: string;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1833,6 +1326,8 @@ export interface OrderBaseInfoQueryVO {
   productionDepartmentConsignTime?: string;
   projectNo?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -1893,6 +1388,8 @@ export interface OrderFieldLockApplyQueryVO {
   auditUserId?: number;
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   fields?: string;
   /** @format int64 */
   id?: number;
@@ -1902,6 +1399,8 @@ export interface OrderFieldLockApplyQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   status?: number;
   statusList?: Array<number>;
   /** @format int32 */
@@ -1950,6 +1449,8 @@ export interface OrderInspectionStageVO {
 export interface OrderOptLogQueryVO {
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1958,6 +1459,8 @@ export interface OrderOptLogQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
 }
@@ -2263,6 +1766,8 @@ export interface QueryBankStatementDto {
   collectionDatetimeEnd?: string;
   /** @format int32 */
   current?: number;
+  /** @format int32 */
+  end?: number;
   /** @format int64 */
   id?: number;
   /** @format int32 */
@@ -2284,6 +1789,8 @@ export interface QueryBankStatementDto {
   remark?: string;
   remarkNote?: string;
   serialNumber?: string;
+  /** @format int32 */
+  start?: number;
   status?: string;
   /** @format int32 */
   total?: number;
@@ -2329,240 +1836,368 @@ export interface QueryInvoiceDetailDto {
   invoiceId?: number;
 }
-export interface QueryInvoiceProjectDto {
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  nameLike?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
+export interface QueryMainOrderDto {
+  /**
+   * @description
+   *   收货人姓名
+   */
+  customerName?: string;
 }
-export interface QueryInvoiceRecordDto {
+export interface QueryReportFormsDto {
   /**
    * @description
-   *   联系人
+   *   是否包含实验设备事业部
    */
-  contactsLike?: string;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
+  includeExperimentalEquipment?: boolean;
   /**
    * @description
-   *   id
+   *   最大金额
+   * @example
+   *   2343
+   */
+  maxAccount?: number;
+  /**
+   * @description
+   *   所属部门
+   */
+  productBelongBusiness?: string;
+  /**
+   * @description
+   *   销售代表
+   */
+  salesCode?: Array<string>;
+  /**
+   * @description
+   *   统计方式
+   */
+  statisticsMethod?: string;
+}
+
+export interface ReissueInvoiceDto {
+  /** @format int64 */
+  invoiceId?: number;
+  notes?: string;
+  purchaser?: string;
+}
+
+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
-   *   IdIn
+   *   课题组名称
    */
-  idIn?: Array<number>;
+  group?: string;
   /**
    * @description
-   *   关联发票id
+   *   课题组负责人
    */
-  invoiceId?: string;
+  leader?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
+}
+
+export interface ResearchGroupDeleteRequest {
   /**
    * @description
-   *   发票号码
+   *   主键id
    */
-  invoiceNumber?: string;
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupDetailRequest {
   /**
    * @description
-   *   发票号码
+   *   主键id
+   * @format int64
    */
-  invoiceNumberLike?: string;
+  id?: number;
+}
+
+export interface ResearchGroupEditRequest {
   /**
    * @description
-   *   开票时间
-   * @format date-time
+   *   课题组预存账号
    */
-  invoicingTimeGe?: string;
+  accounts?: Array<ResearchGroupAccountEditRequest>;
   /**
    * @description
-   *   开票时间
-   * @format date-time
+   *   课题组名称
    */
-  invoicingTimeLe?: string;
+  group?: string;
+  /**
+   * @description
+   *   主键id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   课题组负责人
+   */
+  leader?: string;
+  /**
+   * @description
+   *   课题组成员集合
+   */
+  members?: Array<ResearchGroupMemberEditRequest>;
+}
+
+export interface ResearchGroupListRequest {
   /**
    * @description
-   *   开票类型
+   *   预存账号手机号
    */
-  invoicingType?: string;
+  accountPhone?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
   /**
    * @description
-   *   是否加急
+   *   课题组名称
    */
-  isUrgent?: boolean;
+  groupName?: string;
   /**
    * @description
-   *   订单号
-   * @format int64
+   *   课题组负责人
    */
-  mainOrderId?: number;
+  leaderName?: string;
   /**
    * @description
-   *   主订单idIn
+   *   课题组成员名称
    */
-  mainOrderIdIn?: Array<number>;
+  memberName?: string;
   /**
    * @description
-   *   订单号
+   *   课题组成员手机号
    */
-  mainOrderIdLike?: string;
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+}
+
+export interface ResearchGroupMemberAddRequest {
   /**
    * @description
-   *   是否需要构建发票明细
+   *   课题组ID
+   * @format int64
    */
-  needBuildDetails?: boolean;
+  groupId?: number;
   /**
    * @description
-   *   是否需要构建发票明细
+   *   成员名称
    */
-  needBuildSubOrders?: boolean;
-  /** @format int32 */
-  pageSize?: number;
+  memberName?: string;
   /**
    * @description
-   *   买方名称
+   *   成员手机号
    */
-  partyANameLike?: string;
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberEditRequest {
   /**
    * @description
-   *   买方电话号码
+   *   课题组ID
+   * @format int64
    */
-  partyAPhoneNumberLike?: string;
+  groupId?: number;
   /**
    * @description
-   *   买方税号
+   *   主键id
+   * @format int64
    */
-  partyATaxid?: string;
+  id?: number;
   /**
    * @description
-   *   买方税号
+   *   成员名称
    */
-  partyATaxidLike?: string;
-  partyB?: string;
+  memberName?: string;
   /**
    * @description
-   *   卖方名称
+   *   成员手机号
    */
-  partyBName?: string;
+  memberPhone?: string;
+}
+
+export interface ResearchGroupMemberRequestAddRequest {
   /**
    * @description
-   *   销售代表
+   *   课题组ID
+   * @format int64
    */
-  salesCode?: string;
+  groupId?: number;
   /**
    * @description
-   *   销售代表
+   *   课题组名称
    */
-  salesCodeLike?: string;
-  /** @format int32 */
-  start?: number;
+  groupName?: string;
+  members?: Array<ResearchGroupMemberAddRequest>;
   /**
    * @description
-   *   发票状态
+   *   申请备注
    */
-  status?: string;
+  requestNotes?: string;
+}
+
+export interface ResearchGroupMemberRequestDeleteRequest {
   /**
    * @description
-   *   状态非空
+   *   主键id
    */
-  statusIn?: Array<string>;
+  ids?: Array<number>;
+}
+
+export interface ResearchGroupMemberRequestDetailRequest {
   /**
    * @description
-   *   状态非空
+   *   主键id
+   * @format int64
    */
-  statusIsNotNull?: boolean;
+  id?: number;
+}
+
+export interface ResearchGroupMemberRequestEditRequest {
   /**
    * @description
-   *   状态为空
+   *   课题组ID
+   * @format int64
    */
-  statusIsNull?: boolean;
+  groupId?: number;
   /**
    * @description
-   *   子订单
-   * @format int64
+   *   课题组名称
    */
-  subOrderId?: number;
+  groupName?: string;
   /**
    * @description
-   *   子订单idIn
+   *   主键id
+   * @format int64
    */
-  subOrderIdIn?: Array<number>;
+  id?: number;
   /**
    * @description
-   *   子订单
+   *   成员名称
    */
-  subOrderIdLike?: string;
-  /** @format int32 */
-  total?: number;
+  memberName?: string;
   /**
    * @description
-   *   开票类型
+   *   成员手机号
    */
-  type?: string;
+  memberPhone?: string;
   /**
    * @description
-   *   用户id
+   *   申请备注
    */
-  uid?: string;
+  requestNotes?: string;
 }
-export interface QueryMainOrderDto {
+export interface ResearchGroupMemberRequestsRequest {
   /**
    * @description
-   *   收货人姓名
+   *   审核备注
    */
-  customerName?: string;
-}
-
-export interface QueryReportFormsDto {
+  auditNotes?: string;
   /**
    * @description
-   *   是否包含实验设备事业部
+   *   审核状态
    */
-  includeExperimentalEquipment?: boolean;
+  auditStatus?: string;
   /**
    * @description
-   *   最大金额
-   * @example
-   *   2343
+   *   创建人
    */
-  maxAccount?: number;
+  createByName?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
   /**
    * @description
-   *   所属部门
+   *   课题组名称
    */
-  productBelongBusiness?: string;
+  groupName?: string;
   /**
    * @description
-   *   销售代表
+   *   成员名称
    */
-  salesCode?: string;
+  memberName?: string;
   /**
    * @description
-   *   统计方式
+   *   成员手机号
    */
-  statisticsMethod?: string;
-}
-
-export interface ReissueInvoiceDto {
-  /** @format int64 */
-  invoiceId?: number;
-  notes?: string;
+  memberPhone?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   申请备注
+   */
+  requestNotes?: string;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
 }
 export interface ResetPwdVO {
@@ -2604,134 +2239,14 @@ export interface ShippingWarehouseChangeDto {
   shippingWarehouse?: string;
 }
-export interface SubOrder {
-  afterInvoicingStatus?: string;
-  /** @format date-time */
-  afterInvoicingStatusUpdateTime?: string;
-  afterSalesAnnex?: string;
-  afterSalesNotes?: string;
-  afterSalesPlan?: string;
-  annex?: string;
-  applyInvoicingAnnex?: string;
-  applyInvoicingNotes?: string;
-  /** @format date-time */
-  applyTime?: string;
-  /** @format int32 */
-  attrId?: number;
-  checkNotes?: string;
-  /** @format date-time */
-  collectMoneyTime?: string;
-  confirmDeliverNotes?: string;
-  confirmReissueNotes?: string;
-  createByName?: string;
-  /** @format date-time */
-  createTime?: string;
-  /** @format date-time */
-  deadline?: string;
-  ext?: string;
-  extendField?: string;
-  /** @format date-time */
-  financialReceiptIssuanceTime?: string;
-  fullPaymentStatus?: string;
-  /** @format double */
-  goodsVolume?: number;
-  /** @format double */
-  goodsWeight?: number;
-  /** @format int64 */
-  id?: number;
-  image?: string;
-  invoiceApplyUsername?: string;
-  invoiceInformation?: string;
-  /** @format int64 */
-  invoiceRecordId?: number;
-  invoicingCheckAnnex?: string;
-  invoicingNotes?: string;
-  invoicingStatus?: string;
-  /** @format date-time */
-  invoicingTime?: string;
-  invoicingUrgentCause?: string;
-  isUrgent?: boolean;
-  kingdeeErrorMessage?: string;
-  logicDelete?: boolean;
-  logisticsMethod?: string;
-  logisticsNotes?: string;
-  /** @format int64 */
-  mainOrderAmountProportion?: number;
-  /** @format int64 */
-  mainOrderId?: number;
-  materialId?: string;
-  modified?: boolean;
-  modifiedAuditNotes?: string;
-  modifiedAuditStatus?: string;
-  modifiedOptFlag?: string;
-  nextOrderStatus?: string;
-  notes?: string;
-  orderStatus?: string;
-  orderStatusBeforeModify?: string;
-  /** @format date-time */
-  orderStatusUpdateTime?: string;
-  /** @format int32 */
-  packageNumber?: number;
-  parameters?: string;
-  paymentChannel?: string;
-  paymentMethod?: string;
-  paymentReceiptAnnex?: string;
-  paymentReceiptNotes?: string;
-  paymentReceiptStatus?: string;
-  paymentStatus?: string;
-  paymentTransactionId?: string;
-  postAuditNotes?: string;
-  postAuditStatus?: string;
-  /** @format date-time */
-  postAuditStatusUpdateTime?: string;
-  preAfterInvoicingStatus?: string;
-  procureConvertNotes?: string;
-  procureNotes?: string;
-  /** @format date-time */
-  procureOrderDatetime?: string;
-  procureOrderStatus?: string;
-  productBelongBusiness?: string;
-  productCode?: string;
-  /** @format int32 */
-  productId?: number;
-  productName?: string;
-  /** @format int64 */
-  productPrice?: number;
-  /** @format date-time */
-  productionEndTime?: string;
-  /** @format date-time */
-  productionStartTime?: string;
-  productionTimePushStatus?: string;
-  /** @format int32 */
-  quantity?: number;
-  receivingCompany?: string;
-  reissueNotes?: string;
-  serialNumber?: string;
-  shippingWarehouse?: string;
-  /** @format int64 */
-  subOrderPayment?: number;
-  supplierName?: string;
-  supplierNotes?: string;
-  /** @format int64 */
-  totalPayment?: number;
-  /** @format int32 */
-  uid?: number;
-  unit?: string;
-  unitId?: string;
-  updateByName?: string;
-  /** @format date-time */
-  updateTime?: string;
-  urgentInvoiceAuditNotes?: string;
-  /** @format int32 */
-  version?: number;
-}
-
 export interface SysLogQueryVO {
   address?: string;
   browser?: string;
   /** @format int32 */
   current?: number;
   description?: string;
+  /** @format int32 */
+  end?: number;
   exceptionDetail?: string;
   /** @format int64 */
   id?: number;
@@ -2742,6 +2257,8 @@ export interface SysLogQueryVO {
   pageSize?: number;
   params?: string;
   requestIp?: string;
+  /** @format int32 */
+  start?: number;
   /** @format int64 */
   time?: number;
   /** @format int32 */
@@ -2905,8 +2422,12 @@ export interface UserCenterInfoRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2926,6 +2447,8 @@ export interface UserDetailRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
+  end?: number;
+  /** @format int32 */
   pageSize?: number;
   /**
    * @description
@@ -2933,6 +2456,8 @@ export interface UserDetailRequest {
    */
   phone?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2949,6 +2474,8 @@ export interface UserListRequest {
    *   创建日期开始时间
    */
   dateLimit?: string;
+  /** @format int32 */
+  end?: number;
   /**
    * @description
    *   单位
@@ -2973,10 +2500,23 @@ export interface UserListRequest {
   phone?: string;
   /**
    * @description
+   *   phones
+   */
+  phones?: Array<string>;
+  /**
+   * @description
+   *   内部订单系统课题组id
+   * @format int64
+   */
+  researchGroupId?: number;
+  /**
+   * @description
    *   salesCode
    */
   salesCode?: string;
   /** @format int32 */
+  start?: number;
+  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2986,11 +2526,23 @@ export interface UserListRequest {
   uid?: number;
   /**
    * @description
+   *   ids
+   */
+  uids?: Array<number>;
+  /**
+   * @description
    *   用户名
    */
   username?: string;
 }
+export interface UserNowMoneyCheckRequest {
+  phone?: string;
+  subPrice?: number;
+  /** @format int64 */
+  uid?: number;
+}
+
 export interface View {
   contentType?: string;
 }
@@ -3039,44 +2591,6 @@ export interface TsgFile {
   writable?: boolean;
 }
-export interface InvoiceDetail {
-  /** @format int64 */
-  id?: number;
-  /**
-   * @description
-   *   发票id
-   * @format int64
-   */
-  invoiceRecordId?: number;
-  /**
-   * @description
-   *   单价
-   * @format double
-   */
-  price?: number;
-  projectName?: string;
-  /** @format double */
-  quantity?: number;
-  /**
-   * @description
-   *   型号
-   */
-  specification?: string;
-  /** @format int64 */
-  subOrderId?: number;
-  /** @format double */
-  taxPrice?: number;
-  /** @format double */
-  taxRate?: number;
-  /**
-   * @description
-   *   总价
-   * @format double
-   */
-  totalPrice?: number;
-  unit?: string;
-}
-
 export interface SalesRechargePrepaymentAuditRequest {
   /**
    * @description
@@ -3093,6 +2607,11 @@ export interface SalesRechargePrepaymentAuditRequest {
    *   是否通过
    */
   pass?: boolean;
+  /**
+   * @description
+   *   手机号
+   */
+  phone?: string;
 }
 export interface SalesRechargePrepaymentCreateRequest {
@@ -3198,6 +2717,8 @@ export interface SalesRechargePrepaymentRequest {
    * @format int32
    */
   enableFlag?: number;
+  /** @format int32 */
+  end?: number;
   /**
    * @description
    *   id
@@ -3242,6 +2763,8 @@ export interface SalesRechargePrepaymentRequest {
    *   销售代表
    */
   salesCode?: string;
+  /** @format int32 */
+  start?: number;
   /**
    * @description
    *   状态
@@ -3420,6 +2943,38 @@ export interface TsgURL {
   userInfo?: string;
 }
+/**
+ * @description
+ *   保存用户地址请求对象
+ */
+export interface UserAddressSaveRequest {
+  /**
+   * @description
+   *   联系电话
+   */
+  customerContactNumber: string;
+  /**
+   * @description
+   *   客户姓名
+   */
+  customerName: string;
+  /**
+   * @description
+   *   收货地址
+   */
+  customerShippingAddress?: string;
+  /**
+   * @description
+   *   客户单位
+   */
+  institution?: string;
+  /**
+   * @description
+   *   课题组老师
+   */
+  institutionContactName?: string;
+}
+
 export interface UploadPaymentReceiptDTO {
   /**
    * @description