From 3c934b98b4103b0c4f898e2de58f14c158e6a3df Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 1 Feb 2024 10:18:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../putawayRequestMain/putawayRequestMain.data.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index 906c1cd73..edfc5cddc 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -14,9 +14,13 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' -import * as PurchaseMainApi from '@/api/wms/purchaseMain' +import * as PurchaseDetail from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' +import * as PurchaseMain from '@/api/wms/purchaseMain' +import * as PurchaseMainApi from '@/api/wms/purchaseMain' + + import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' @@ -553,8 +557,8 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择订单号', searchField: 'number', searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseMainPage } }, tableForm: { @@ -562,7 +566,7 @@ export const PutawayRequestDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择订单号', searchField: 'number', searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, + searchAllSchemas: PurchaseDetail.allSchemas, searchPage: PurchaseMainApi.getPurchaseMainPage } }, From 89449a5ff2517b2c886281a6a746c234ab335c10 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 1 Feb 2024 13:16:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AE=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 1db740b2a..012f7c534 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -71,6 +71,16 @@ export const getBalanceItemPage = async (params) => { return await request.get({ url: `/wms/balance/pageItems`, params }) } } +// 查询库存余额列表根据业务类型 +export const getBalancePageByBusinessType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/seniorBusinessType', data }) + } else { + return await request.get({ url: `/wms/balance/pageBusinessType`, params }) + } +} // 查询库存余额详情 export const getBalance = async (id: number) => { From 05f6a17eb6afc30e7d04be49bed7b8813d411791 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 1 Feb 2024 15:32:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9/?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveJobMain/index.ts | 68 +++++++++++++++++- src/api/wms/inventorymoveRecordMain/index.ts | 59 ++++++++++++++++ src/api/wms/inventorymoveRequestMain/index.ts | 69 ++++++++++++++++++- .../customerreturnRequestMain.data.ts | 20 +++--- .../customerreturnRequestMain/index.vue | 35 ++++------ .../deliverRequestMain.data.ts | 2 + .../deliver/deliverRequestMain/index.vue | 2 +- .../deliverPlanMain/deliverPlanMain.data.ts | 3 +- .../inventorychangeRequestMain.data.ts | 7 +- .../inventorymoveJobMain/index.vue | 21 +++++- .../inventorymoveRecordMain/index.vue | 21 +++++- .../inventorymoveRequestMain/index.vue | 8 ++- .../inventorymoveRequestMain.data.ts | 7 +- 13 files changed, 272 insertions(+), 50 deletions(-) diff --git a/src/api/wms/inventorymoveJobMain/index.ts b/src/api/wms/inventorymoveJobMain/index.ts index c683800a6..14262e35a 100644 --- a/src/api/wms/inventorymoveJobMain/index.ts +++ b/src/api/wms/inventorymoveJobMain/index.ts @@ -74,9 +74,75 @@ export const deleteInventorymoveJobMain = async (id: number) => { // 导出库存转移任务主 Excel export const exportInventorymoveJobMain = async (params) => { - return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + params.businessType = 'Move' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} + +// 导出合格转隔离任务主 Excel +export const exportOkToHoldJobMain = async (params) => { + params.businessType = 'OkToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} + +// 导出隔离转合格任务主 Excel +export const exportHoldToOkJobMain = async (params) => { + params.businessType = 'HoldToOk' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } } +// 导出隔离转报废任务主 Excel +export const exportHoldToScrapJobMain = async (params) => { + params.businessType = 'HoldToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} + +// 导出合格转报废任务主 Excel +export const exportOkToScrapJobMain = async (params) => { + params.businessType = 'OkToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} + +// 导出报废转隔离任务主 Excel +export const exportScrapToHoldJobMain = async (params) => { + params.businessType = 'ScrapToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-job-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-job-main/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-job-main/get-import-template' }) diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index e6c017f58..bd278e955 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -63,6 +63,65 @@ export const exportInventorymoveRecordMain = async (params) => { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } +// 导出合格转隔离记录主 Excel +export const exportOkToHoldRecordMain = async (params) => { + params.businessType = 'OkToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} + +// 导出隔离转合格记录主 Excel +export const exportHoldToOkRecordMain = async (params) => { + params.businessType = 'HoldToOk' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} + +// 导出隔离转报废记录主 Excel +export const exportHoldToScrapRecordMain = async (params) => { + params.businessType = 'HoldToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} + +// 导出合格转报废记录主 Excel +export const exportOkToScrapRecordMain = async (params) => { + params.businessType = 'OkToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} + +// 导出报废转隔离记录主 Excel +export const exportScrapToHoldRecordMain = async (params) => { + params.businessType = 'ScrapToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-record-main/get-import-template' }) diff --git a/src/api/wms/inventorymoveRequestMain/index.ts b/src/api/wms/inventorymoveRequestMain/index.ts index 94d6d49fe..3844cc96b 100644 --- a/src/api/wms/inventorymoveRequestMain/index.ts +++ b/src/api/wms/inventorymoveRequestMain/index.ts @@ -58,7 +58,74 @@ export const deleteInventorymoveRequestMain = async (id: number) => { // 导出库存转移申请主 Excel export const exportInventorymoveRequestMain = async (params) => { - return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + params.businessType = 'Move' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } +} + +// 导出合格转隔离申请主 Excel +export const exportOkToHoldRequestMain = async (params) => { + params.businessType = 'OkToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } +} + +// 导出隔离转合格申请主 Excel +export const exportHoldToOkRequestMain = async (params) => { + params.businessType = 'HoldToOk' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } +} + +// 导出隔离转报废申请主 Excel +export const exportHoldToScrapRequestMain = async (params) => { + params.businessType = 'HoldToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } +} + +// 导出合格转报废申请主 Excel +export const exportOkToScrapRequestMain = async (params) => { + params.businessType = 'OkToScrap' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } +} + +// 导出报废转隔离申请主 Excel +export const exportScrapToHoldRequestMain = async (params) => { + params.businessType = 'ScrapToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/inventorymove-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/inventorymove-request-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index a6fefd9bd..3f1b2fb54 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -726,10 +726,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchAllSchemas: Balance.allSchemas, searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, searchCondition: [{ - key: 'locationCode', - value: 'CUST', - isMainValue: false - }] + key:'customerCode', // 查询列表中字段 + value:'customerCode', // 指主表某字段 + message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件是主表的字段的值 + } + ] }, form: { // labelMessage: '信息提示说明！！！', @@ -741,10 +743,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchAllSchemas: Balance.allSchemas, searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, searchCondition: [{ - key: 'locationCode', - value: 'CUST', - isMainValue: false - }] + key:'customerCode', // 查询列表中字段 + value:'customerCode', // 指主表某字段 + message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件是主表的字段的值 + } + ] } } }, diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 13f291fa5..08a97b2da 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -54,6 +54,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + :isShowButton = isShowButton /> @@ -98,6 +99,8 @@ const customerCode = ref() routeName.value = route.name const tableColumns = ref(CustomerreturnRequestMain.allSchemas.tableColumns) +const isShowButton = ref(true) + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -106,25 +109,6 @@ const updataTableColumns = (val) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { - if(formField == 'customerCode'){ - customerCode.value = val[0]['code'] - } - CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item => { - if(item.field == 'packingNumber') { - item.tableForm.searchCondition = [ - { - key: 'customerCode', - value: customerCode.value , - isMainValue: false - }] - item.form.componentProps.searchCondition = [ - { - key: 'customerCode', - value: customerCode.value , - isMainValue: false - }] - } - }) CustomerreturnRequestMain.allSchemas.formSchema.forEach(item => { if(item.field == 'deliverRecordNumber') { if(customerCode.value != null){ @@ -153,13 +137,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row[formField] = val[0][searchField] } } else { - console.log(11111111) const setV = {} if(formField == 'deliverRecordNumber') { setV['deliverRecordNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] setV['customerCode'] = val[0]['customerCode'] setV['customerDockCode'] = val[0]['customerDockCode'] + if(setV['deliverRecordNumber'] != null){ + isShowButton.value = false + } // 获取子表数据 DeliverRecordDetailApi.getDeliverRecordDetailPage({masterId:val[0]['id']}) .then(res => { @@ -168,8 +154,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => value = obj.fromLocationCode obj.fromLocationCode = obj.toLocationCode obj.toLocationCode = value + CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{ + if(item.field == 'packingNumber') { + item.isInpuFocusShow = false + item.tableForm.isInpuFocusShow = false + item.tableForm.disabled = true + } + }) }) - console.log(555,res) if (res) tableData.value = res.list }).catch(err => { console.log(err) @@ -476,7 +468,6 @@ const submitForm = async (formType, data) => { if(obj.qty == 0){ message.error(`数量不能为0!`) flag.value = true - return; } }) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 28eb2652e..126ffed7a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -862,6 +862,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ tableForm: { disabled: true }, + isForm: false, }, { label: '已收货数量', @@ -873,6 +874,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ tableForm: { disabled: true }, + isForm: false, }, { label: '创建时间', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index d812509ca..ca1dd7479 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -191,7 +191,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} if(formField == 'itemCode') { - setV['itemCode'] = val[0]['code'] + setV['itemCode'] = val[0]['itemCode'] setV['uom'] = val[0]['customerUom'] }else { setV[formField] = val[0][searchField] diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 577da3ab7..66d00ce2c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -223,7 +223,8 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TRUE' + activeValue: 'TRUE', + disabled: true } } }, diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 14eac07e3..a2a0a4edd 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -930,14 +930,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InventorymoveJobMainApi.exportInventorymoveJobMain(tableObject.params) - download.excel(data, importFileName.value + '.xlsx') + if(routeName.value == 'OktoholdJobMain'){ + const data = await InventorymoveJobMainApi.exportOkToHoldJobMain(tableObject.params) + download.excel(data, '合格转隔离任务主.xlsx') + }else if ( routeName.value == 'HoldtookJobMain') { + const data = await InventorymoveJobMainApi.exportHoldToOkJobMain(tableObject.params) + download.excel(data, '隔离转合格任务主.xlsx') + }else if ( routeName.value == 'HoldtoscrapJobMain') { + const data = await InventorymoveJobMainApi.exportHoldToScrapJobMain(tableObject.params) + download.excel(data, '隔离转报废任务主.xlsx') + }else if ( routeName.value == 'OktoscrapJobtMain') { + const data = await InventorymoveJobMainApi.exportOkToScrapJobMain(tableObject.params) + download.excel(data, '合格转报废任务主.xlsx') + }else if ( routeName.value == 'ScraptoholdJobMain') { + const data = await InventorymoveJobMainApi.exportScrapToHoldJobMain(tableObject.params) + download.excel(data, '报废转隔离任务主.xlsx') + }else{ + const data = await InventorymoveJobMainApi.exportInventorymoveJobMain(tableObject.params) + download.excel(data, '库存转移任务主.xlsx') + } } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 1a2e8e167..ec381e60a 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -202,8 +202,25 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params) - download.excel(data, importFileName.value + '.xlsx') + if(routeName.value == 'OktoholdRecordMain'){ + const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) + download.excel(data, '合格转隔离记录主.xlsx') + }else if ( routeName.value == 'HoldtookRecordMain') { + const data = await InventorymoveRecordMainApi.exportHoldToOkRecordMain(tableObject.params) + download.excel(data, '隔离转合格记录主.xlsx') + }else if ( routeName.value == 'HoldtoscrapRecordMain') { + const data = await InventorymoveRecordMainApi.exportHoldToScrapRecordMain(tableObject.params) + download.excel(data, '隔离转报废记录主.xlsx') + }else if ( routeName.value == 'OktoscrapRecordtMain') { + const data = await InventorymoveRecordMainApi.exportOkToScrapRecordMain(tableObject.params) + download.excel(data, '合格转报废记录主.xlsx') + }else if ( routeName.value == 'ScraptoholdRecordMain') { + const data = await InventorymoveRecordMainApi.exportScrapToHoldRecordMain(tableObject.params) + download.excel(data, '报废转隔离记录主.xlsx') + }else{ + const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params) + download.excel(data, '库存转移记录主.xlsx') + } } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index b69e86e70..752514056 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -516,21 +516,25 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) if(routeName.value == 'OktoholdRequestMain'){ + const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) download.excel(data, '合格转隔离申请主.xlsx') }else if ( routeName.value == 'HoldtookRequestMain') { + const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) download.excel(data, '隔离转合格申请主.xlsx') }else if ( routeName.value == 'HoldtoscrapRequestMain') { + const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) download.excel(data, '隔离转报废申请主.xlsx') }else if ( routeName.value == 'OktoscrapRequestMain') { + const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) download.excel(data, '合格转报废申请主.xlsx') }else if ( routeName.value == 'ScraptoholdRequestMain') { + const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params) download.excel(data, '报废转隔离申请主.xlsx') }else{ + const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) download.excel(data, '库存转移申请主.xlsx') } - } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index b90304246..be483329e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -871,11 +871,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( //表单校验 export const InventorymoveRequestDetailRules = reactive({ - fromPackingNumber: [ - { required: true, message: '请选择从包装号', trigger: 'change' } - ], - fromBatch: [ - { required: true, message: '请输入从批次', trigger: 'blur' } + itemCode: [ + { required: true, message: '请点击从包装号选择物料代码', trigger: 'change' } ], fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } From cd59e68528e233030312ceb6f98f16c13ce15355 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 1 Feb 2024 16:30:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productdismantle/productdismantleRequestMain/index.vue | 2 +- .../productrepair/productrepairRequestMain/index.vue | 2 +- .../productscrap/productscrapRequestMain/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index af46695f5..d89f6c137 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -211,7 +211,7 @@ const buttonOperationClick = async (row, label, index)=> { // } // }) item.rowId = index - if(tableData.value[index].childList) { + if(tableData.value[index].childList.length > 0) { tableData.value[index].childList.forEach(itemChild => { if (itemChild.itemCode == item.itemCode) { item.qty = itemChild.qty diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 26cf1d36d..f000fa58f 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -206,7 +206,7 @@ const buttonOperationClick = async (row, label, index)=> { await getDetailListBom() detatableDataBom.tableList.map(item => { item.rowId = index - if(tableData.value[index].childList) { + if(tableData.value[index].childList > 0) { tableData.value[index].childList.forEach(itemChild => { if (itemChild.itemCode == item.itemCode) { item.qty = itemChild.qty diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 0b984a703..c51b1a8f2 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -209,7 +209,7 @@ const buttonOperationClick = async (row, label, index)=> { await getDetailListBom() detatableDataBom.tableList.forEach(item => { item.rowId = index - if(tableData.value[index].childList) { + if(tableData.value[index].childList.length > 0) { tableData.value[index].childList.forEach(itemChild => { if (itemChild.itemCode == item.itemCode) { item.qty = itemChild.qty