提交

web-admin/src/api/crm/contract/index.ts

@@ -47,6 +47,9 @@ function mapListQuery(query: ContractQuery = {}): Record<string, any> {
       if (val != null && val !== '') params[key] = String(val)
     }
   )
+  if (query.includeProducts) {
+    params.includeProducts = true
+  }
   return params
 }
 

web-admin/src/api/crm/contract/types.ts

@@ -28,6 +28,8 @@ export interface ContractQuery {
   signDateEnd?: string
   beginTime?: string
   endTime?: string
+  /** 列表是否附带合同产品明细（选择合同弹窗等场景） */
+  includeProducts?: boolean
 }
 
 export interface ContractProductPriceTierForm {
@@ -92,6 +94,10 @@ export interface ContractForm {
   currency?: string
   taxRate?: number
   amountWithTax?: number
+  /** 运费（元），选报价单时可从报价带入 */
+  freight?: number
+  /** 桶押金（元），选报价单时可从报价带入 */
+  barrelDeposit?: number
   signDate?: string
   actualSignDate?: string
   startDate?: string
@@ -152,6 +158,10 @@ export interface ContractVO {
   currency?: string
   taxRate?: number
   amountWithTax?: number
+  /** 运费（元） */
+  freight?: number
+  /** 桶押金（元） */
+  barrelDeposit?: number
   signDate: string
   actualSignDate?: string
   startDate: string
@@ -377,7 +387,18 @@ export interface ApprovalVO {
 /** 报价转合同 — 最小提交体（createFromQuote） */
 export type CreateFromQuoteForm = Pick<
   ContractForm,
-  'contractNo' | 'contractName' | 'customerId' | 'contractType' | 'amount' | 'signDate' | 'startDate' | 'endDate' | 'remark' | 'products'
+  | 'contractNo'
+  | 'contractName'
+  | 'customerId'
+  | 'contractType'
+  | 'amount'
+  | 'freight'
+  | 'barrelDeposit'
+  | 'signDate'
+  | 'startDate'
+  | 'endDate'
+  | 'remark'
+  | 'products'
 >
 
 /** 合同审批人设置 */

web-admin/src/api/crm/quote/types.ts

@@ -91,6 +91,8 @@ export interface QuoteForm {
   paymentTerms?: string
   deliveryTerms?: string
   freight?: number
+  /** 桶押金（元） */
+  barrelDeposit?: number
   attachments?: string
   templateContent?: string
   remark?: string
@@ -140,6 +142,8 @@ export interface QuoteVO {
   paymentTerms?: string
   deliveryTerms?: string
   freight?: number
+  /** 桶押金（元） */
+  barrelDeposit?: number
   attachments?: string
   createTime: string
   updateTime?: string

web-admin/src/api/menuFavorite.ts

@@ -26,3 +26,11 @@ export function fetchRemoveMenuFavorite(path: string) {
     data: { path }
   })
 }
+
+/** 按 paths 完整顺序重排收藏（须与当前收藏集合一致） */
+export function fetchReorderMenuFavorites(paths: string[]) {
+  return request.put<MenuFavoriteItem[]>({
+    url: '/web/admin/menu-favorites/order',
+    data: { paths }
+  })
+}