From 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 11 十一月 2024 16:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue
index 6254ed8..6254603 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue
@@ -24,6 +24,26 @@
router.push({path: '/main/ingredientsStock/ReturnToStorageCreate', query: { returningId: row.returningId }})
break
}
+ case 'delete':{
+ let flowData = ref({
+ returningId:row.returningId,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId
+ })
+ request.post("/materialInventory/deleteReturnToStorage",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('searchOrder.msgDeleteSuccess'))
+ router.push({path:'/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
+ }else{
+ ElMessage.warning(t('basicData.msg.deleteSuccess'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+
+ return
+ }
}
}
@@ -283,7 +303,11 @@
<el-button @click="getTableRow(row,'edit')"
v-if="userStore.user.permissions.indexOf('returnToStorage.edit') > -1"
link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <template #reference>
+ <el-button :disabled="row.reviewedState===1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
</template>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0