From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index f0410a8..a6e59a3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -69,7 +69,6 @@
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -150,6 +149,10 @@
{
'name': t('basicData.delete'),status: 'primary',
'code':'delete'
+ },
+ {
+ 'name': t('basicData.cancelReview'),status: 'primary',
+ 'code':'cancelReview'
}
],
/*import: false,
@@ -230,7 +233,34 @@
}else{
ElMessage.warning(t('basicData.msg.deleteFail'))
- router.push("/login")
+ }
+ })
+ }
+ return
+
+ }
+ case 'cancelReview': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+
+ userId:userid,
+ userName:username,
+ patchLog:selectRecords
+
+ })
+ request.post("/Replenish/updateCancelReview",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
+ router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.cancelReviewFailWork'))
}
})
}
@@ -314,10 +344,10 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
- :checkbox-config="checkBoxConfig"
+
>
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- :checkbox-config="checkBoxConfig" @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
--
Gitblit v1.8.0