From 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:08 +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/MaterialAddition.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 da56e6a..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()
@@ -295,7 +295,7 @@
})
onMounted(async ()=>{
- await select()
+
if(props.data!=null){
titleUploadData.value.dateOfManufacture=props.data.dateOfManufacture
titleUploadData.value.qualityGuaranteePeriod=props.data.qualityGuaranteePeriod
@@ -306,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