From eba3314826d53ff0f7e5679d185baaff84e50354 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 04 十二月 2025 10:07:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
index bb05d4c..eb3cdc0 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue
@@ -27,6 +27,9 @@
{ label: t('ingredientsStock.materialReturnType'),
value: "returningType",
},
+ { label: t('productStock.inventoryArea'),
+ value: "region",
+ },
/*{ label: t('ingredients.originalFilm'),
value: "originalFilm",
},
@@ -62,6 +65,9 @@
}
else if(basic.value.operateType[0]==='returningType'){
basic.value.type=t('ingredientsStock.materialReturnType')
+ }
+ else if(basic.value.operateType[0]==='region'){
+ basic.value.type=t('productStock.inventoryArea')
}
/*else if(basic.value.operateType[0]==='originalFilm'){
basic.value.type=t('ingredients.originalFilm')
@@ -115,7 +121,7 @@
<template>
<div>
<el-row>
- <el-col :span="4">{{$t('orderBasicData.basicType')}}:</el-col>
+ <el-col :span="4">{{$t('orderBasicData.page.searchOrderBasicData')}}:</el-col>
<el-col :span="12">
<el-cascader
v-model="basic.operateType"
--
Gitblit v1.8.0