From 41e25469fc3e0048bffdcedf47ac0c65fef3af58 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 13 Aug 2024 17:16:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=EF=BC=8C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E5=88=B0=E5=AF=84=E5=94=AE=E5=BA=93=E6=98=AF=E5=8E=BB?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=9A=84=EF=BC=8C=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=B6=E7=8E=B0=E5=9C=A8=E6=98=AF=E5=B8=A6=E5=87=BA?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=9A=84=EF=BC=8C=E5=AF=BC=E8=87=B4pda?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E8=A3=85=E4=B8=8D=E5=AF=B9=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 82 +++++++++---------- .../customerreturnRequestMain/index.vue | 18 +++- 2 files changed, 58 insertions(+), 42 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 1a697012a..bf1e93890 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -882,47 +882,47 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, - searchCondition: [{ - key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 - message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - isMainValue: true // 表示查询条件是主表的字段的值 - } - ] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, - searchCondition: [{ - key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 - message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 - isMainValue: true // 表示查询条件是主表的字段的值 - } - ] - } - } - }, + // { + // label: '包装号', + // field: 'packingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, + // searchCondition: [{ + // key:'customerCode', // 查询列表中字段 + // value:'customerCode', // 指主表某字段 + // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // isMainValue: true // 表示查询条件是主表的字段的值 + // } + // ] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装号', + // searchField: 'packingNumber', + // searchTitle: '库存余额信息', + // searchAllSchemas: Balance.allSchemas, + // searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, + // searchCondition: [{ + // key:'customerCode', // 查询列表中字段 + // value:'customerCode', // 指主表某字段 + // message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 + // isMainValue: true // 表示查询条件是主表的字段的值 + // } + // ] + // } + // } + // }, // { // label: '器具号', // field: 'containerNumber', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index b46e6663e..a6b1b8c67 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -220,6 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => value = obj.fromLocationCode obj.fromLocationCode = obj.toLocationCode obj.toLocationCode = '' + obj.packingNumber = '' // 包装号所有为空 CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{ if(item.field == 'packingNumber') { item.isInpuFocusShow = false @@ -319,6 +320,7 @@ const isShowMainButton = (row,val) => { } } + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 @@ -336,7 +338,8 @@ const butttondata = (row,$index) => { { label: '生成标签', name: 'ssbq', - hide: isShowMainButton(row, ['3','6']), + // hide: isShowMainButton(row, ['3','6']), + hide: isShowMainButton(row, ['3']), type: 'primary', icon: '', color: '', @@ -407,6 +410,19 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } 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 + } await message.confirm('确认要处理吗？') tableObject.loading = true CustomerreturnRequestMainApi.handle(row.masterId).then(() => {