From b85a6fbf48fb3ce159e266db4bb760041b1514d9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 18 十一月 2025 15:06:25 +0800
Subject: [PATCH] 补交
---
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue
index 77cfed8..5b4eba3 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialAddition.vue
@@ -124,7 +124,7 @@
//鍒楁煡璇�
const getStoreWork = () => {
- value.value=t('ingredients.originalFilm')
+ filterDatas.value.type=value.value
request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
if(res.code==200){
gridOption.columns=[]
@@ -142,11 +142,11 @@
gridOption.columns.push(column)
}
- if(value.value==t('ingredients.accessories')){
+ /*if(value.value==t('ingredients.accessories')){
titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[1].operateTypeName
}else{
titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[0].operateTypeName
- }
+ }*/
getStoreWorks()
@@ -180,6 +180,7 @@
}
const update = () => {
+ gridOption.toolbarConfig.buttons[0].disabled = true
let flowData = ref({
title: titleUploadData.value,
materialInventoryId: props.data.id,
@@ -193,10 +194,12 @@
ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path: '/main/ingredientsStock/SelectIngredientsStock', query:{random:Math.random()}})
}else if(res.data==="false1") {
- ElMessage.warning("搴撳瓨瀛樺湪澶氭潯")
+ ElMessage.warning(t('ingredientsStock.msg1'))
}else {
ElMessage.warning(t('basicData.msg.ServerConnectionError'))
}
+ }).finally(()=>{
+ gridOption.toolbarConfig.buttons[0].disabled = false
})
}
@@ -261,7 +264,7 @@
})
}
-
+ gridOption.toolbarConfig.buttons[0].disabled = true
request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {
if(res.code==200 && res.data==="true"){
ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -269,6 +272,8 @@
}else {
ElMessage.warning(t('basicData.msg.ServerConnectionError'))
}
+ }).finally(()=>{
+ gridOption.toolbarConfig.buttons[0].disabled = false
})
}
@@ -290,7 +295,7 @@
})
onMounted(async ()=>{
- await select()
+
if(props.data!=null){
titleUploadData.value.dateOfManufacture=props.data.dateOfManufacture
titleUploadData.value.qualityGuaranteePeriod=props.data.qualityGuaranteePeriod
@@ -301,9 +306,12 @@
titleUploadData.value.materialCode=props.data.materialCode
titleUploadData.value.id=props.data.id
titleUploadData.value.availableQuantity=props.data.availableQuantity
+ titleUploadData.value.inventoryOrganization=props.data.inventoryOrganization
isDisabled=true
}else{
+ await select()
isDisabled=false
+ value.value=t('ingredients.originalFilm')
getStoreWork()
}
--
Gitblit v1.8.0