From 2343229e4edc41648fcd0589490f5bdf486fe3ae Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 18 十月 2023 20:31:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 9 +++++++--
src/api/data.js | 18 +++++++++++++++---
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/api/data.js b/src/api/data.js
index b826e1e..ccf6bac 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -100,20 +100,28 @@
// 寮哄埗涓嬫灦绛栫暐
const forceRemovalStrategy = [
{
- name: "First In First Out (FIFO)",
+ name: "璇烽�夋嫨",
+ id: 0
+ },
+ {
+ name: "鍏堣繘鍏堝嚭",
id: 1
},
{
- name: "Last In First Out (LIFO)",
+ name: "鍏堣繘鍚庡嚭",
id: 2
},
{
- name: "Closest Location",
+ name: "鏃犺鍒欓殢鏈哄嚭",
id: 3
}
]
//鎴愭湰鏂规硶
const costingMethod = [
+ {
+ name: "璇烽�夋嫨",
+ id: 0
+ },
{
name: "鏍囧噯浠锋牸",
id: 1
@@ -130,6 +138,10 @@
// 搴撳瓨璁′环
const inventoryValuation = [
{
+ name: "璇烽�夋嫨",
+ id: 0
+ },
+ {
name: "鎵嬪姩",
id: 1
},
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index 9de00eb..31356cf 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -88,7 +88,7 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in productCategoryList" :key="item.id" :label="item.name" :value="item.id">
+ <el-option v-for="item in productCategoryListWithDefault" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -195,7 +195,12 @@
}
},
components: {},
- computed: {},
+ computed: {
+ productCategoryListWithDefault(){
+ console.log(this.productCategoryList)
+ return [{id:0,name:'璇烽�夋嫨'},...(this.productCategoryList?? [])]
+ }
+ },
data() {
return {
dialogWidth: "50%",
--
Gitblit v1.8.0