From 83ad52c793a7aa114b2b758047296d2eec613e72 Mon Sep 17 00:00:00 2001 From: my_ong <429426262@qq.com> Date: Sat, 7 Dec 2024 11:57:20 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E5=AE=8C=E5=96=84=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=82=E4=B9=8B=E5=89=8D=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api-lock.json | 576 ++++++++++++++---- src/api/material/api.d.ts | 66 +- src/api/material/mods/apply/index.ts | 6 +- src/api/material/mods/apply/saveApply.ts | 2 +- .../material/mods/apply/searchAuditPage.ts | 37 ++ src/api/material/mods/apply/searchPage.ts | 37 ++ src/views/stock/component/applyConfirm.vue | 1 + src/views/stock/report/inboundReport-page.vue | 48 +- .../stock/report/outboundReport-page.vue | 42 +- .../stock/report/stocktakingReport-page.vue | 126 ++-- .../stock/stocktaking/stocktaking-page.vue | 166 +++-- 11 files changed, 764 insertions(+), 343 deletions(-) create mode 100644 src/api/material/mods/apply/searchAuditPage.ts create mode 100644 src/api/material/mods/apply/searchPage.ts diff --git a/src/api/api-lock.json b/src/api/api-lock.json index f5f99a3..5aa7359 100644 --- a/src/api/api-lock.json +++ b/src/api/api-lock.json @@ -3360,13 +3360,13 @@ "name": "apply", "interfaces": [ { - "description": "分页查询申请单列表", - "name": "applies", + "description": "分页查询申请列表", + "name": "searchPage", "method": "get", - "path": "/apply", + "path": "/applies", "response": { "typeArgs": [], - "typeName": "IPageApplyForm", + "typeName": "IPageApplyDTO", "isDefsType": true, "templateIndex": -1, "compileTemplateKeyword": "#/definitions/", @@ -3405,10 +3405,10 @@ } }, { - "description": "类型", + "description": "申请类型(1入库 3出库 4盘点)", "required": true, "in": "query", - "name": "type", + "name": "applyType", "dataType": { "typeArgs": [], "typeName": "number", @@ -3420,10 +3420,40 @@ } }, { - "description": "搜索关键词", + "description": "物料类型", "required": false, "in": "query", - "name": "key", + "name": "type", + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + }, + { + "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", "dataType": { "typeArgs": [], "typeName": "string", @@ -3437,7 +3467,7 @@ ] }, { - "description": "提交申请单", + "description": "提交出入库申请单", "name": "saveApply", "method": "put", "path": "/apply", @@ -3498,6 +3528,121 @@ } } ] + }, + { + "description": "分页查询盘点列表", + "name": "searchAuditPage", + "method": "get", + "path": "/audit-applies", + "response": { + "typeArgs": [], + "typeName": "IPageApplyForm", + "isDefsType": true, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "parameters": [ + { + "description": "页码", + "required": false, + "in": "query", + "name": "page", + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + }, + { + "description": "页面大小", + "required": false, + "in": "query", + "name": "size", + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + }, + { + "description": "盘点类型", + "required": false, + "in": "query", + "name": "auditType", + "dataType": { + "typeArgs": [], + "typeName": "", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [ + "'ALL'", + "'PARTIAL'" + ], + "typeProperties": [] + } + }, + { + "description": "盘点人", + "required": false, + "in": "query", + "name": "taker", + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + }, + { + "description": "创建日期", + "required": false, + "in": "query", + "name": "createDate", + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + }, + { + "description": "审核状态", + "required": false, + "in": "query", + "name": "reviewResult", + "dataType": { + "typeArgs": [], + "typeName": "", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [ + "'PASS'", + "'UN_PASS'", + "'WAIT'", + "'REJECT'" + ], + "typeProperties": [] + } + } + ] } ] }, @@ -3708,6 +3853,157 @@ ], "name": "material", "baseClasses": [ + { + "name": "ApplyDTO", + "templateArgs": [], + "properties": [ + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "applicant", + "description": "申请人", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "applyDate", + "description": "申请日期", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "applyNum", + "description": "申请数量", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [ + "'PURCHASE_RECEIPT'", + "'RETURN_RECEIPT'", + "'LOAN_OUT'", + "'AUDIT'" + ], + "typeProperties": [] + }, + "name": "applyType", + "description": "申请类型", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "code", + "description": "物料编码", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "confirmNum", + "description": "确认数量", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "name", + "description": "物料名称", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "remark", + "description": "备注", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "spec", + "description": "物料规格", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "type", + "description": "物料类型", + "required": false + } + ] + }, { "description": "申请单明细", "name": "ApplyDetail", @@ -3727,6 +4023,22 @@ "description": "申请单ID", "required": false }, + { + "dataType": { + "typeArgs": [], + "typeName": "", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [ + "'LOW_VALUE'", + "'HIGH_VALUE'" + ], + "typeProperties": [] + }, + "name": "assignRule", + "required": false + }, { "dataType": { "typeArgs": [], @@ -3874,19 +4186,6 @@ "description": "盘点类型（1: 全盘 2: 部分盘点）", "required": false }, - { - "dataType": { - "typeArgs": [], - "typeName": "Codebook", - "isDefsType": true, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "auditTypeInfo", - "required": false - }, { "dataType": { "typeArgs": [], @@ -3930,20 +4229,7 @@ "typeProperties": [] }, "name": "handle", - "description": "处理方式(0-无需处理 1-忽略并修改库存 2-补充库存 3-其他)", - "required": false - }, - { - "dataType": { - "typeArgs": [], - "typeName": "Codebook", - "isDefsType": true, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "handleInfo", + "description": "处理方式(1-无需处理 2-忽略并修改库存 3-补充库存 4-其他)", "required": false }, { @@ -3987,6 +4273,53 @@ "description": "结果(系统自动生成)", "required": false }, + { + "dataType": { + "typeArgs": [], + "typeName": "", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [ + "'PASS'", + "'UN_PASS'", + "'WAIT'", + "'REJECT'" + ], + "typeProperties": [] + }, + "name": "reviewResult", + "description": "审核结果(1-通过 2-不通过 3-待审核 4-退回重新盘点)", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "reviewer", + "description": "盘点审核人", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "string", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "taker", + "description": "盘点人", + "required": false + }, { "dataType": { "typeArgs": [], @@ -4006,19 +4339,6 @@ "description": "类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请）", "required": false }, - { - "dataType": { - "typeArgs": [], - "typeName": "Codebook", - "isDefsType": true, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "typeInfo", - "required": false - }, { "dataType": { "typeArgs": [], @@ -4102,55 +4422,6 @@ } ] }, - { - "description": "枚举码本", - "name": "Codebook", - "templateArgs": [], - "properties": [ - { - "dataType": { - "typeArgs": [], - "typeName": "string", - "isDefsType": false, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "code", - "description": "码本编码", - "required": true - }, - { - "dataType": { - "typeArgs": [], - "typeName": "string", - "isDefsType": false, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "description", - "description": "码本名称", - "required": true - }, - { - "dataType": { - "typeArgs": [], - "typeName": "string", - "isDefsType": false, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "name", - "description": "码本值", - "required": true - } - ] - }, { "description": "全局错误", "name": "GlobalError", @@ -4186,6 +4457,87 @@ } ] }, + { + "name": "IPageApplyDTO", + "templateArgs": [], + "properties": [ + { + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "current", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "pages", + "required": false + }, + { + "dataType": { + "typeArgs": [ + { + "typeArgs": [], + "typeName": "ApplyDTO", + "isDefsType": true, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + ], + "typeName": "Array", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "records", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "size", + "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "total", + "required": false + } + ] + }, { "name": "IPageApplyForm", "templateArgs": [], @@ -4367,20 +4719,7 @@ "typeProperties": [] }, "name": "assignRule", - "description": "赋码规则(0-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码）", - "required": false - }, - { - "dataType": { - "typeArgs": [], - "typeName": "Codebook", - "isDefsType": true, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "assignRuleInfo", + "description": "赋码规则(2-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码）", "required": false }, { @@ -4599,19 +4938,6 @@ "description": "状态", "required": false }, - { - "dataType": { - "typeArgs": [], - "typeName": "Codebook", - "isDefsType": true, - "templateIndex": -1, - "compileTemplateKeyword": "#/definitions/", - "enum": [], - "typeProperties": [] - }, - "name": "statusInfo", - "required": false - }, { "dataType": { "typeArgs": [], diff --git a/src/api/material/api.d.ts b/src/api/material/api.d.ts index 78d2a22..fc4646e 100644 --- a/src/api/material/api.d.ts +++ b/src/api/material/api.d.ts @@ -1,4 +1,39 @@ declare namespace material { + /** + * ApplyDTO + */ + export interface ApplyDTO { + /** 申请人 */ + applicant?: string; + + /** 申请日期 */ + applyDate?: string; + + /** 申请数量 */ + applyNum?: string; + + /** 申请类型 */ + applyType?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'; + + /** 物料编码 */ + code?: string; + + /** 确认数量 */ + confirmNum?: string; + + /** 物料名称 */ + name?: string; + + /** 备注 */ + remark?: string; + + /** 物料规格 */ + spec?: string; + + /** 物料类型 */ + type?: string; + } + /** * 申请单明细 */ @@ -6,6 +41,9 @@ declare namespace material { /** 申请单ID */ applyId?: number; + /** assignRule */ + assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'; + /** 确认数量 */ confirmQuantity?: number; @@ -41,21 +79,15 @@ declare namespace material { /** 盘点类型（1: 全盘 2: 部分盘点） */ auditType?: 'ALL' | 'PARTIAL'; - /** auditTypeInfo */ - auditTypeInfo?: material.Codebook; - /** createdTime */ createdTime?: string; /** 异常原因 */ exception?: string; - /** 处理方式(0-无需处理 1-忽略并修改库存 2-补充库存 3-其他) */ + /** 处理方式(1-无需处理 2-忽略并修改库存 3-补充库存 4-其他) */ handle?: 'NO_ACTION' | 'IGNORE_AND_SAVE' | 'REPLENISH' | 'OTHER'; - /** handleInfo */ - handleInfo?: material.Codebook; - /** id */ id?: number; @@ -65,12 +97,18 @@ declare namespace material { /** 结果(系统自动生成) */ result?: string; + /** 审核结果(1-通过 2-不通过 3-待审核 4-退回重新盘点) */ + reviewResult?: 'PASS' | 'UN_PASS' | 'WAIT' | 'REJECT'; + + /** 盘点审核人 */ + reviewer?: string; + + /** 盘点人 */ + taker?: string; + /** 类型（1: 采购入库申请 2: 归还入库申请 3: 出库外借申请 4: 盘点申请） */ type?: 'PURCHASE_RECEIPT' | 'RETURN_RECEIPT' | 'LOAN_OUT' | 'AUDIT'; - /** typeInfo */ - typeInfo?: material.Codebook; - /** updatedTime */ updatedTime?: string; } @@ -93,12 +131,9 @@ declare namespace material { * 物料信息 */ export interface Material { - /** 赋码规则(0-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码） */ + /** 赋码规则(2-低值易耗品（不参与赋码） 1-高价值工具类（参与唯一赋码） */ assignRule?: 'LOW_VALUE' | 'HIGH_VALUE'; - /** assignRuleInfo */ - assignRuleInfo?: material.Codebook; - /** 编码 */ code?: string; @@ -149,9 +184,6 @@ declare namespace material { /** 状态 */ status?: 'IN' | 'OUT' | 'OFF'; - /** statusInfo */ - statusInfo?: material.Codebook; - /** updatedTime */ updatedTime?: string; } diff --git a/src/api/material/mods/apply/index.ts b/src/api/material/mods/apply/index.ts index 2f80ace..a1cb017 100644 --- a/src/api/material/mods/apply/index.ts +++ b/src/api/material/mods/apply/index.ts @@ -2,12 +2,14 @@ * @description 入库/出库 申请单管理 * */ -import applies from './applies'; +import searchPage from './searchPage'; import saveApply from './saveApply'; import detail from './detail'; +import searchAuditPage from './searchAuditPage'; export default { - applies, + searchPage, saveApply, detail, + searchAuditPage, }; diff --git a/src/api/material/mods/apply/saveApply.ts b/src/api/material/mods/apply/saveApply.ts index 61a741e..dee4cd1 100644 --- a/src/api/material/mods/apply/saveApply.ts +++ b/src/api/material/mods/apply/saveApply.ts @@ -1,5 +1,5 @@ /** - * @desc 提交申请单 + * @desc 提交出入库申请单 */ import { defaultSuccess, defaultError, http } from '@/plugins/axios'; import type { AxiosResponse } from 'axios'; diff --git a/src/api/material/mods/apply/searchAuditPage.ts b/src/api/material/mods/apply/searchAuditPage.ts new file mode 100644 index 0000000..6c6cd0c --- /dev/null +++ b/src/api/material/mods/apply/searchAuditPage.ts @@ -0,0 +1,37 @@ +/** + * @desc 分页查询盘点列表 + */ +import { defaultSuccess, defaultError, http } from '@/plugins/axios'; +import type { AxiosResponse } from 'axios'; +import type { IPage } from '@/api/api'; +export interface Params { + /** 页码 */ + page?: number; + /** 页面大小 */ + size?: number; + /** 盘点类型 */ + auditType?: 'ALL' | 'PARTIAL'; + /** 盘点人 */ + taker?: string; + /** 创建日期 */ + createDate?: string; + /** 审核状态 */ + reviewResult?: 'PASS' | 'UN_PASS' | 'WAIT' | 'REJECT'; +} + +export default async function ( + params: Params, + success: (data: IPage) => void = defaultSuccess, + fail: (error: { code: string; error?: string }) => void = defaultError, +): Promise { + return http({ + method: 'get', + url: `/audit-applies`, + + params, + }) + .then((data: AxiosResponse, unknown>) => { + success(data.data); + }) + .catch((error: { code: string; error?: string }) => fail(error)); +} diff --git a/src/api/material/mods/apply/searchPage.ts b/src/api/material/mods/apply/searchPage.ts new file mode 100644 index 0000000..4adf343 --- /dev/null +++ b/src/api/material/mods/apply/searchPage.ts @@ -0,0 +1,37 @@ +/** + * @desc 分页查询申请列表 + */ +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; +} + +export default async function ( + params: Params, + success: (data: IPage) => void = defaultSuccess, + fail: (error: { code: string; error?: string }) => void = defaultError, +): Promise { + return http({ + method: 'get', + url: `/applies`, + + params, + }) + .then((data: AxiosResponse, unknown>) => { + success(data.data); + }) + .catch((error: { code: string; error?: string }) => fail(error)); +} diff --git a/src/views/stock/component/applyConfirm.vue b/src/views/stock/component/applyConfirm.vue index 3c93c63..039175d 100644 --- a/src/views/stock/component/applyConfirm.vue +++ b/src/views/stock/component/applyConfirm.vue @@ -57,6 +57,7 @@ return $table.getTableData().fullData.map((row) => { return { materialId: row.id, + assignRule: row.assignRule, quantity: row.applyNum, confirmQuantity: row.scanNum, exceptionRemark: row.remark, diff --git a/src/views/stock/report/inboundReport-page.vue b/src/views/stock/report/inboundReport-page.vue index d7f348a..b6391e4 100644 --- a/src/views/stock/report/inboundReport-page.vue +++ b/src/views/stock/report/inboundReport-page.vue @@ -25,27 +25,25 @@ import api from '@/api' import { IPage } from '@/api/api' - - - - const searchKey = ref('') -const pagedata = ref>() +const pagedata = ref>() const loading = ref(false) - - // 加载数据的方法 const loadData = async (page = 1, size = 10) => { loading.value = true - api.materialApi.apply.applies( - //1: 采购入库 2: 归还入库 3: 出库外借 - { type: 1, page: page || pagedata.value?.current, size: size || pagedata.value?.size, key: searchKey.value }, - (data) => { - loading.value = false - pagedata.value = data - }, - ) + api.materialApi.apply.searchPage( + { + page: page, + size: size, + applyType: 1, + type:searchKey.value, + code: searchKey.value, + name: searchKey.value + },(data)=>{ + pagedata.value = data + loading.value = false + }) } //初始加载 loadData() @@ -53,8 +51,12 @@ loadData() //表格列 const columns = [ { - title: '类型', - dataIndex: 'type', + title: '物料名称', + dataIndex: 'name', + }, + { + title: '物料编码', + dataIndex: 'code', }, { title: '申请人', @@ -65,16 +67,16 @@ const columns = [ dataIndex: 'applyDate', }, { - title: '是否确认', - dataIndex: 'isConfirm', + title: '申请数量', + dataIndex: 'applyNum', }, { - title: '创建人', - dataIndex: 'createdBy', + title: '确认数量', + dataIndex: 'confirmNum', }, { - title: '创建时间', - dataIndex: 'createdTime', + title: '备注', + dataIndex: 'remark', } ] diff --git a/src/views/stock/report/outboundReport-page.vue b/src/views/stock/report/outboundReport-page.vue index 0eddbb6..e5f0369 100644 --- a/src/views/stock/report/outboundReport-page.vue +++ b/src/views/stock/report/outboundReport-page.vue @@ -26,20 +26,24 @@ import api from '@/api' import { IPage } from '@/api/api' const searchKey = ref('') -const pagedata = ref>() +const pagedata = ref>() const loading = ref(false) // 加载数据的方法 const loadData = async (page = 1, size = 10) => { loading.value = true - api.materialApi.apply.applies( - //1: 采购入库 2: 归还入库 3: 出库外借 - { type: 3, page: page || pagedata.value?.current, size: size || pagedata.value?.size, key: searchKey.value }, - (data) => { - loading.value = false - pagedata.value = data - }, - ) + api.materialApi.apply.searchPage( + { + page: page, + size: size, + applyType: 3, + type:searchKey.value, + code: searchKey.value, + name: searchKey.value + },(data)=>{ + pagedata.value = data + loading.value = false + }) } //初始加载 loadData() @@ -47,8 +51,12 @@ loadData() //表格列 const columns = [ { - title: '类型', - dataIndex: 'type', + title: '物料名称', + dataIndex: 'name', + }, + { + title: '物料编码', + dataIndex: 'code', }, { title: '申请人', @@ -59,16 +67,16 @@ const columns = [ dataIndex: 'applyDate', }, { - title: '是否确认', - dataIndex: 'isConfirm', + title: '申请数量', + dataIndex: 'applyNum', }, { - title: '创建人', - dataIndex: 'createdBy', + title: '确认数量', + dataIndex: 'confirmNum', }, { - title: '创建时间', - dataIndex: 'createdTime', + title: '备注', + dataIndex: 'remark', } ] diff --git a/src/views/stock/report/stocktakingReport-page.vue b/src/views/stock/report/stocktakingReport-page.vue index 7a692a1..7a34c95 100644 --- a/src/views/stock/report/stocktakingReport-page.vue +++ b/src/views/stock/report/stocktakingReport-page.vue @@ -1,22 +1,22 @@ \ No newline at end of file + diff --git a/src/views/stock/stocktaking/stocktaking-page.vue b/src/views/stock/stocktaking/stocktaking-page.vue index dd7c6a1..ca7b6f3 100644 --- a/src/views/stock/stocktaking/stocktaking-page.vue +++ b/src/views/stock/stocktaking/stocktaking-page.vue @@ -1,30 +1,30 @@ \ No newline at end of file +