diff --git a/src/api/api-lock.json b/src/api/api-lock.json index 00bc8d8..f431f95 100644 --- a/src/api/api-lock.json +++ b/src/api/api-lock.json @@ -3472,25 +3472,10 @@ } }, { - "description": "物料编码", + "description": "编码/名称", "required": false, "in": "query", - "name": "code", - "dataType": { - "typeArgs": [], - "typeName": "string", - "isDefsType": false, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - } - }, - { - "description": "物料名称", - "required": false, - "in": "query", - "name": "name", + "name": "key", "dataType": { "typeArgs": [], "typeName": "string", @@ -3667,7 +3652,7 @@ } }, { - "description": "物料编码", + "description": "编码/名称", "required": false, "in": "query", "name": "code", @@ -3680,21 +3665,6 @@ "enum": [], "typeProperties": [] } - }, - { - "description": "物料名称", - "required": false, - "in": "query", - "name": "name", - "dataType": { - "typeArgs": [], - "typeName": "string", - "isDefsType": false, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - } } ] }, diff --git a/src/api/material/mods/apply/downloadExcel.ts b/src/api/material/mods/apply/downloadExcel.ts index 9492ef1..bb5d14b 100644 --- a/src/api/material/mods/apply/downloadExcel.ts +++ b/src/api/material/mods/apply/downloadExcel.ts @@ -8,10 +8,8 @@ export interface Params { applyType: number /** 物料类型 */ type?: string - /** 物料编码 */ + /** 编码/名称 */ code?: string - /** 物料名称 */ - name?: string } export default async function ( diff --git a/src/api/material/mods/apply/searchPage.ts b/src/api/material/mods/apply/searchPage.ts index 4adf343..41b81e9 100644 --- a/src/api/material/mods/apply/searchPage.ts +++ b/src/api/material/mods/apply/searchPage.ts @@ -1,37 +1,35 @@ /** * @desc 分页查询申请列表 */ -import { defaultSuccess, defaultError, http } from '@/plugins/axios'; -import type { AxiosResponse } from 'axios'; -import type { IPage } from '@/api/api'; +import { defaultSuccess, defaultError, http } from '@/plugins/axios' +import type { AxiosResponse } from 'axios' +import type { IPage } from '@/api/api' export interface Params { - /** 申请类型(1入库 3出库 4盘点) */ - applyType: number; - /** 页码 */ - page?: number; - /** 页面大小 */ - size?: number; - /** 物料类型 */ - type?: string; - /** 物料编码 */ - code?: string; - /** 物料名称 */ - name?: string; + /** 申请类型(1入库 3出库 4盘点) */ + applyType: number + /** 页码 */ + page?: number + /** 页面大小 */ + size?: number + /** 物料类型 */ + type?: string + /** 编码/名称 */ + key?: string } export default async function ( - params: Params, - success: (data: IPage) => void = defaultSuccess, - fail: (error: { code: string; error?: string }) => void = defaultError, + params: Params, + success: (data: IPage) => void = defaultSuccess, + fail: (error: { code: string; error?: string }) => void = defaultError, ): Promise { - return http({ - method: 'get', - url: `/applies`, + return http({ + method: 'get', + url: `/applies`, - params, - }) - .then((data: AxiosResponse, unknown>) => { - success(data.data); - }) - .catch((error: { code: string; error?: string }) => fail(error)); + params, + }) + .then((data: AxiosResponse, unknown>) => { + success(data.data) + }) + .catch((error: { code: string; error?: string }) => fail(error)) } diff --git a/src/views/stock/report/inboundReport-page.vue b/src/views/stock/report/inboundReport-page.vue index d039a4b..602990d 100644 --- a/src/views/stock/report/inboundReport-page.vue +++ b/src/views/stock/report/inboundReport-page.vue @@ -2,15 +2,29 @@