From 16bb9b494c653992afe8b27632de1ea7ff66db11 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 7 Aug 2024 10:54:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?QMS=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/inspectionJob/inspectionJobMain/index.ts | 8 ++++++-- .../qms/inspectionRecord/inspectionRecordMain/index.ts | 9 +++++++++ src/api/qms/inspectionRequest/index.ts | 7 ++++++- src/api/qms/inspectionScheme/index.ts | 7 ++++++- src/api/qms/inspectionTemplate/index.ts | 7 ++++++- src/views/qms/inspectionJob/index.vue | 1 + src/views/qms/inspectionRecord/index.vue | 4 ++-- src/views/qms/inspectionRecordFirst/index.vue | 5 +++-- src/views/qms/inspectionRequest/index.vue | 2 +- 9 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts index 3346beae4..9b3f59c7e 100644 --- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts +++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts @@ -57,11 +57,15 @@ export const releaseInspectionJobMain = async (id) => { } // 导出检验申请 Excel export const exportInspectionJobMain = async (params) => { - return await request.download({ url: `/qms/inspection-job-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspection-job-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspection-job-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/qms/inspection-job-main/get-import-template' }) } - \ No newline at end of file diff --git a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts index 67ca4a31f..81ffa403e 100644 --- a/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts +++ b/src/api/qms/inspectionRecord/inspectionRecordMain/index.ts @@ -68,6 +68,15 @@ export const exportInspectionRecordMain = async (params) => { } } +export const exportFirstInspectionRecordMain = async (params) => { + if (params.isSearch) { + const data = { ...params } + return await request.downloadPost({ url: `/qms/inspection-record-main/export-excel-first-senior`, data }) + } else { + return await request.download({ url: `/qms/inspection-record-main/export-excel-first`, params }) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/qms/inspection-record-main/get-import-template' }) diff --git a/src/api/qms/inspectionRequest/index.ts b/src/api/qms/inspectionRequest/index.ts index 5aaf60961..b3033bc32 100644 --- a/src/api/qms/inspectionRequest/index.ts +++ b/src/api/qms/inspectionRequest/index.ts @@ -50,7 +50,12 @@ export const deleteInspectionMain = async (id: number) => { // 导出检验申请 Excel export const exportInspectionMain = async (params) => { - return await request.download({ url: `/qms/inspection-request-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspection-request-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspection-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/qms/inspectionScheme/index.ts b/src/api/qms/inspectionScheme/index.ts index 53c305c2a..42a82a5fd 100644 --- a/src/api/qms/inspectionScheme/index.ts +++ b/src/api/qms/inspectionScheme/index.ts @@ -33,7 +33,12 @@ export const disableInspectionScheme = async (id: number) => { // 导出检验阶段 Excel export const exportInspectionScheme = async (params) => { - return await request.download({ url: `/qms/inspection-scheme/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspection-scheme/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspection-scheme/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/qms/inspectionTemplate/index.ts b/src/api/qms/inspectionTemplate/index.ts index 577fadd6f..048c705a1 100644 --- a/src/api/qms/inspectionTemplate/index.ts +++ b/src/api/qms/inspectionTemplate/index.ts @@ -38,7 +38,12 @@ export const disableInspectionTemplate = async (id: number) => { // 导出检验模版 Excel export const exportInspectionTemplate = async (params) => { - return await request.download({ url: `/qms/programme-template/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/programme-template/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/programme-template/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index df041bc5b..915a4382c 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -180,6 +180,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ + defaultButtons.defaultExportBtn(null), defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 5499b9b39..5d45a6515 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -163,7 +163,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 let HeadButttondata = [ - // defaultButtons.defaultExportBtn(null), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -343,7 +343,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) - download.excel(data, '备件申领记录主.xlsx') + download.excel(data, '检验记录.xlsx') } catch { } finally { exportLoading.value = false diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index df2442aed..2ed3dbac1 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -67,6 +67,7 @@ import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeat import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' + import {exportFirstInspectionRecordMain} from "@/api/qms/inspectionRecord/inspectionRecordMain"; // 采购订单 defineOptions({ name: 'InspectionRecordMain' }) @@ -207,7 +208,7 @@ const handleMainExport = async (row: any) => { // 发起导出 exportLoading.value = true tableObject.params.number = row.number - const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) + const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params) download.excel(data, '首件检验记录.xlsx') } catch { } finally { @@ -223,7 +224,7 @@ const handleMainExport = async (row: any) => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InspectionRecordMainApi.exportInspectionRecordMain(tableObject.params) + const data = await InspectionRecordMainApi.exportFirstInspectionRecordMain(tableObject.params) download.excel(data, '首件检验记录.xlsx') } catch { } finally { diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index 6e1351e10..c77f6e3ec 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -148,7 +148,7 @@ const { getList, setSearchParams } = tableMethods const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: 'qms:inspection-request-main:create' }), // 新增 // defaultButtons.defaultImportBtn({ hasPermi: 'wms:inspectionMain:import' }), // 导入 - // defaultButtons.defaultExportBtn({ hasPermi: 'wms:inspectionMain:export' }), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 From a715689c4575db6ed54055b182460e3d55485d6e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 7 Aug 2024 11:16:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRequestMain/index.vue | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 945297a7d..1f1d10ecc 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -160,6 +160,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['itemCode'] = item['itemCode'] newRow['locationCode'] = item['locationCode'] newRow['uom'] = item['uom'] + newRow['originFrozen'] = newRow['frozen']=='TRUE'?true:false //记录原始数据用于判断 tableData.value.push(newRow) }) } else { @@ -445,11 +446,25 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus) + if(tableData.value.find(item=>!item.toInventoryStatus)){ + message.warning('请选择到库存状态') + return + } + if(tableData.value.find(item=>!item.toQty||item.toQty==0)){ + message.warning('请填写到数量') + return + } + if(tableData.value.find(item=>!item.toExpireDate)){ + message.warning('请选择到过期日期') + return + } + + let findInventoryStatus = tableData.value.find(item=>item.fromInventoryStatus&&item.toInventoryStatus&&item.fromInventoryStatus==item.toInventoryStatus&&item.fromQty&&item.toQty&&item.fromQty==item.toQty&&item.fromExpireDate&&item.toExpireDate&&item.fromExpireDate==item.toExpireDate&&item.originFrozen==item.frozen) if(findInventoryStatus){ - message.warning('从库存状态和到库存状态不能相同') + message.warning('您未修改数据') return } + data.subList = tableData.value // 拼接子表数据参数 const duplicateItems = tableData.value.filter((item, index) => { return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index; From 962b866aeb4a3d2435daa3fa01c988acd6965559 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 7 Aug 2024 11:35:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?QMS=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/inspectionQ1/index.ts | 9 +++++++-- src/api/qms/inspectionQ2/index.ts | 7 ++++++- src/api/qms/inspectionQ3/index.ts | 7 ++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/api/qms/inspectionQ1/index.ts b/src/api/qms/inspectionQ1/index.ts index aba6db8e8..9072dcd4e 100644 --- a/src/api/qms/inspectionQ1/index.ts +++ b/src/api/qms/inspectionQ1/index.ts @@ -58,7 +58,12 @@ export const deleteQ1 = async (id: number) => { // 导出Q1通知单 Excel export const exportQ1 = async (params) => { - return await request.download({ url: `/qms/inspectionQ1/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspectionQ1/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspectionQ1/export-excel`, params }) + } } // 下载用户导入模板 @@ -69,4 +74,4 @@ export const importTemplate = () => { // 完成 export const finishQ1 = async (id: number) => { return await request.get({ url: `/qms/inspectionQ1/finish?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts index 36c186445..7b4ea2ef6 100644 --- a/src/api/qms/inspectionQ2/index.ts +++ b/src/api/qms/inspectionQ2/index.ts @@ -59,7 +59,12 @@ export const deleteQ2 = async (id: number) => { // 导出Q2通知单 Excel export const exportQ2 = async (params) => { - return await request.download({ url: `/qms/inspectionQ2/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspectionQ2/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspectionQ2/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/qms/inspectionQ3/index.ts b/src/api/qms/inspectionQ3/index.ts index a8e1d81b2..7f140cb52 100644 --- a/src/api/qms/inspectionQ3/index.ts +++ b/src/api/qms/inspectionQ3/index.ts @@ -59,7 +59,12 @@ export const deleteQ3 = async (id: number) => { // 导出Q3通知单 Excel export const exportQ3 = async (params) => { - return await request.download({ url: `/qms/inspectionQ3/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/qms/inspectionQ3/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/qms/inspectionQ3/export-excel`, params }) + } } // 下载用户导入模板