From c8b45e747713c88447f75f68abeeec0bb9ee5ee9 Mon Sep 17 00:00:00 2001 From: my_ong <429426262@qq.com> Date: Sat, 29 Mar 2025 21:49:22 +0800 Subject: [PATCH] =?UTF-8?q?sparkles:=20:sparkles:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E7=9B=98=E7=82=B9=E6=A0=B7=E5=BC=8F=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api-lock.json | 45 +++++- src/api/material/api.d.ts | 2 +- src/api/material/mods/apply/downloadExcel.ts | 2 +- .../material/mods/apply/getManualCheckData.ts | 21 +++ src/api/material/mods/apply/index.ts | 2 + src/views/stock/component/manual-form.vue | 136 ++++-------------- .../stock/stocktaking/stocktaking-page.vue | 2 +- ....timestamp-1733280057567-72270187d6e8b.mjs | 97 ------------- ....timestamp-1735107646682-da78b7e5d1808.mjs | 93 ------------ ....timestamp-1740899406592-3aedd283ba884.mjs | 93 ------------ 10 files changed, 94 insertions(+), 399 deletions(-) create mode 100644 src/api/material/mods/apply/getManualCheckData.ts delete mode 100644 vite.config.ts.timestamp-1733280057567-72270187d6e8b.mjs delete mode 100644 vite.config.ts.timestamp-1735107646682-da78b7e5d1808.mjs delete mode 100644 vite.config.ts.timestamp-1740899406592-3aedd283ba884.mjs diff --git a/src/api/api-lock.json b/src/api/api-lock.json index f431f95..e5d592b 100644 --- a/src/api/api-lock.json +++ b/src/api/api-lock.json @@ -3655,7 +3655,7 @@ "description": "编码/名称", "required": false, "in": "query", - "name": "code", + "name": "key", "dataType": { "typeArgs": [], "typeName": "string", @@ -3977,6 +3977,48 @@ } ] }, + { + "description": "查询人工盘点选中物料的待核查数据", + "name": "getManualCheckData", + "method": "get", + "path": "/manual/check-data/{applyId}", + "response": { + "typeArgs": [ + { + "typeArgs": [], + "typeName": "Material", + "isDefsType": true, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + ], + "typeName": "Array", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "parameters": [ + { + "description": "申请单ID", + "required": true, + "in": "path", + "name": "applyId", + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + } + ] + }, { "description": "获取人工盘点数据", "name": "getManualStock", @@ -4987,6 +5029,7 @@ "typeProperties": [] }, "name": "assignRule", + "description": "是否需要赋码", "required": false }, { diff --git a/src/api/material/api.d.ts b/src/api/material/api.d.ts index f595660..d0f9ada 100644 --- a/src/api/material/api.d.ts +++ b/src/api/material/api.d.ts @@ -59,7 +59,7 @@ declare namespace material { /** 申请单ID */ applyId?: number - /** assignRule */ + /** 是否需要赋码 */ assignRule?: boolean /** 确认数量 */ diff --git a/src/api/material/mods/apply/downloadExcel.ts b/src/api/material/mods/apply/downloadExcel.ts index bb5d14b..79714f4 100644 --- a/src/api/material/mods/apply/downloadExcel.ts +++ b/src/api/material/mods/apply/downloadExcel.ts @@ -9,7 +9,7 @@ export interface Params { /** 物料类型 */ type?: string /** 编码/名称 */ - code?: string + key?: string } export default async function ( diff --git a/src/api/material/mods/apply/getManualCheckData.ts b/src/api/material/mods/apply/getManualCheckData.ts new file mode 100644 index 0000000..14dc5dc --- /dev/null +++ b/src/api/material/mods/apply/getManualCheckData.ts @@ -0,0 +1,21 @@ +/** + * @desc 查询人工盘点选中物料的待核查数据 + */ +import { defaultSuccess, defaultError, http } from '@/plugins/axios' +import type { AxiosResponse } from 'axios' +export default async function ( + /** 申请单ID */ + applyId: number, + + success: (data: Array) => void = defaultSuccess, + fail: (error: { code: string; error?: string }) => void = defaultError, +): Promise { + return http({ + method: 'get', + url: `/manual/check-data/${applyId}`, + }) + .then((data: AxiosResponse, unknown>) => { + success(data.data) + }) + .catch((error: { code: string; error?: string }) => fail(error)) +} diff --git a/src/api/material/mods/apply/index.ts b/src/api/material/mods/apply/index.ts index fcc47c7..82d2d10 100644 --- a/src/api/material/mods/apply/index.ts +++ b/src/api/material/mods/apply/index.ts @@ -12,6 +12,7 @@ import auditApply from './auditApply' import getComparisonRes from './getComparisonRes' import updateReviewResult from './updateReviewResult' import submitManualStock from './submitManualStock' +import getManualCheckData from './getManualCheckData' import getManualStock from './getManualStock' import saveScanData from './saveScanData' import submitScrapOutReview from './submitScrapOutReview' @@ -30,6 +31,7 @@ export default { getComparisonRes, updateReviewResult, submitManualStock, + getManualCheckData, getManualStock, saveScanData, submitScrapOutReview, diff --git a/src/views/stock/component/manual-form.vue b/src/views/stock/component/manual-form.vue index e51daa8..72557bc 100644 --- a/src/views/stock/component/manual-form.vue +++ b/src/views/stock/component/manual-form.vue @@ -1,33 +1,4 @@