|
|
@ -322,17 +322,17 @@ const butttondata = (row,$index) => { |
|
|
|
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionreturn-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'])}), // 标签打印 |
|
|
|
] |
|
|
|
} |
|
|
|
|
|
|
@ -465,18 +465,18 @@ 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 |
|
|
|
ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => { |
|
|
|
message.success(t('common.updateSuccess')) |
|
|
|