From 33946a5da98b765742967960e5d8da70888e3e03 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 6 Aug 2024 13:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 48 +++++++------- .../productionscrapRequestMain.data.ts | 66 ++++++++++++++++--- 2 files changed, 82 insertions(+), 32 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 0ca2ebe15..c3496eea1 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -341,17 +341,17 @@ const butttondata = (row,$index) => { defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除 // 创建标签 - { - label: '创建标签', - name: 'cjbq', - hide: isShowMainButton(row,['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true, // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 + // { + // label: '创建标签', + // name: 'cjbq', + // hide: isShowMainButton(row,['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true, // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 ] } @@ -483,19 +483,19 @@ const buttonTableClick = async (val, row) => { }) } else if (val == 'mainHandle') { // 处理 - // 判断 是否已创建标签 - let isCreateLabel = false - await PackageApi.getPackagePage({ - requestNumber: row.number - }).then(res => { - if (res) { - if (res.list.length > 0) isCreateLabel = true - } - }) - if (!isCreateLabel) { - message.warning('请先创建标签') - return - } + // // 判断 是否已创建标签 + // let isCreateLabel = false + // await PackageApi.getPackagePage({ + // requestNumber: row.number + // }).then(res => { + // if (res) { + // if (res.list.length > 0) isCreateLabel = true + // } + // }) + // if (!isCreateLabel) { + // message.warning('请先创建标签') + // return + // } tableObject.loading = true ProductionscrapRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 5f5c3248e..5acd62749 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -26,6 +26,9 @@ import { TableColumn } from '@/types/table' import * as InspectionQ3Api from '@/api/qms/inspectionQ3' import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +// import * as LocationApi from '@/api/wms/location' +// import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -697,6 +700,53 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive