li.shaoyi 2 éve
szülő
commit
3de4721a94
2 módosított fájl, 5 hozzáadás és 5 törlés
  1. 2 2
      src/business/goods/index.ts
  2. 3 3
      src/hooks/datatable/index.ts

+ 2 - 2
src/business/goods/index.ts

@@ -8,6 +8,8 @@ import { loginStore } from '@/stores'
 
 const { userId } = loginStore.$mapGetters()
 
+export type OptionalType<T, K extends keyof T> = Omit<T, K> & { [key in K]: Partial<T[K]> } // 指定某个属性为可选
+
 // 采购列表
 export function useWrstandardList() {
     const { dataList, total, pageIndex, pageSize, pageCount } = useDataTable<Model.THJWrstandardRsp>()
@@ -45,8 +47,6 @@ export function useWrstandardList() {
 
 // 采购详细
 export function useWrstandardDetails(wrstandardid: number) {
-    type OptionalType<T, R extends keyof T> = Omit<T, R> & { [key in R]: Partial<T[R]> } // 指定某个属性为可选
-
     const loading = shallowRef(false)
     const details = shallowRef<OptionalType<Model.THJWrstandardDetailRsp, 'goodsinfo'>>({
         deliverymodes: [],

+ 3 - 3
src/hooks/datatable/index.ts

@@ -54,7 +54,7 @@ export function useDataTable<T>(options: DataTableOptions = {}) {
     }
 }
 
-export function useDataFilter<T extends object>() {
+export function useDataFilter<T>() {
     const filterOptons: FilterOptions<T> = reactive({
         selectList: [],
         inputList: [],
@@ -105,9 +105,9 @@ export function useDataFilter<T extends object>() {
     }
 
     // 获取查询参数,支持多条件查询
-    const getQueryParams = (callback: (params: Partial<T>) => void, clear = false) => {
+    const getQueryParams = (callback: (params: T) => void, clear = false) => {
         clear && clearAll()
-        const params: Partial<T> = {}
+        const params: T = Object.create(null)
 
         filterOptons.selectList.forEach((e) => {
             if (e.selectedValue !== undefined) {