From a2c533ee00e5c80519fdcb05caa05c47d39bf9f6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 22 May 2024 15:09:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countJobMain/index.ts | 10 +++++- .../count/countJobMain/countJobMain.data.ts | 2 +- .../countManage/count/countJobMain/index.vue | 35 ++++++++++++++++++- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 3d9c2a5e8..2f685a8cf 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -89,5 +89,13 @@ export const importTemplate = () => { // 关闭盘点任务主 export const closeCountJobMain = (id: number) => { - return request.download({ url: '/wms/count-job-main/close?id=' + id }) + return request.put({ url: '/wms/count-job-main/close?id=' + id }) } + +// 关闭盘点任务主 +export const handleExportCountJob = async (id: number) => { + let params = { + masterId:id + } + return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) +} \ No newline at end of file diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index 8fb474d8a..d8a07ccd3 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -501,7 +501,7 @@ export const CountJobMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 120, + width: 180, fixed: 'right' }, } diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 8cf17ac71..ba882335d 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -186,7 +186,25 @@ const butttondata = (row,$index) => { } return [ // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:count-job-main:close'}), // 关闭 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'wms:count-job-main:close'}), // 关闭 + { + label: '导出', + name: 'exportCountJob', + hide: isShowMainButton(row,['1','2']), + type: 'success', + color: '', + link: true, //文本展现按钮 + hasPermi: '' // wms:count-job-main:exportCountJob + }, + { + label: '导入', + name: 'importCountJob', + hide: isShowMainButton(row,['1','2']), + type: 'success', + color: '', + link: true, //文本展现按钮 + hasPermi: '' // wms:count-job-main:importCountJob + } // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] @@ -202,6 +220,8 @@ const buttonTableClick = async (val, row) => { handleClose(row.masterId) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') + } else if (val == 'exportCountJob'){// 当前任务导出 + handleExportCountJob(row.masterId,row.number) } } @@ -240,6 +260,19 @@ const handleExport = async () => { } } +/** 单条任务导出 */ +const handleExportCountJob = async (id: number,number: string) => { + try { + await message.exportConfirm() + exportLoading.value = true + const data = await CountJobMainApi.handleExportCountJob(id) + download.excel(data, '盘点任务主'+number+'.xlsx') + } catch { + }finally { + exportLoading.value = false + } +} + // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { From 55f47bd9aab08d9d3affa22fce6210c2680ea42f Mon Sep 17 00:00:00 2001 From: bjang03 Date: Wed, 22 May 2024 15:11:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E7=89=A9=E5=93=81=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=96=87=E5=AD=97=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/basicDataManage/itemManage/itemarea/itemarea.data.ts | 4 ++-- .../itemManage/itemwarehouse/itemwarehouse.data.ts | 2 +- .../saleShipmentMainRecord/saleShipmentMainRecord.data.ts | 2 +- .../packageoverJobMain/packageoverJobMain.data.ts | 4 ++-- .../packageoverRetrospect/packageoverRetrospect.data.ts | 2 +- .../productreceiptAssembleRecordMain.data.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index d20f50532..6aa8e1d5e 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -16,7 +16,7 @@ import { t } from '@/hooks/web/useI18n' export const Itemarea = useCrudSchemas(reactive([ { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -752,4 +752,4 @@ export const ItemareaDetail = useCrudSchemas(reactive([ // 表单校验 export const ItemareaDetailRules = reactive({ -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 99f6c1c5a..1d3aa7d08 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -9,7 +9,7 @@ import { Itempackaging } from '../itempackage/itempackage.data' export const Itemwarehouse = useCrudSchemas(reactive([ { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 1d97d749b..7f958772f 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -201,7 +201,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ isTable:false }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index d9afde219..c8a795eeb 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -545,7 +545,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ }, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', table: { @@ -818,4 +818,4 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ // 表单校验 export const PackageoverJobDetailRules = reactive({ -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts index f43c1f563..4f1f27fb9 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts @@ -56,7 +56,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ }, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index cda78051b..a6a4be2e7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -1028,7 +1028,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive([ isSearch: true, }, { - label: '物品代码', + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true,