From bd8f3a15f17facd2f77521da844eaf76dca22bad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 22 三月 2024 10:02:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
index aa39057..108b0d2 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue
@@ -207,12 +207,17 @@
{field: 'remarks', width: '140',title: t('productStock.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
- buttons: [{
+ buttons: [
+ {
+ 'name': t('productStock.return'), status:"info" ,icon: 'vxe-icon-undo',
+ 'code':'return'
+ },
+ {
'name': t('basicData.review'),status: 'primary',
'code':'add'
},
{
- 'name': t('basicData.cancelReview'),status: 'primary',
+ 'name': t('productStock.reverseReviewList'),status: 'primary',
'code':'rework'
},
{
@@ -278,6 +283,10 @@
router.push({path: '/main/productStock/ReworkRecord'});
return
}
+ case 'return': {
+ router.go(-1)
+ break
+ }
case 'cancel': {
const $table = xGrid.value
//gridOptions.columns.unshift(a)
--
Gitblit v1.8.0