From ae760880186edef869f91e3ee97dee5788aab464 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 19 十月 2023 17:53:53 +0800
Subject: [PATCH] bug修复（5316 5317）
---
src/views/productManage/product/AddProductDialog.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 8622c9d..fe22e0f 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -165,7 +165,7 @@
:disabled="!showFooter"
>
<el-option
- v-for="item in productCategoryOptions"
+ v-for="item in productCategoryListWithDefault"
:key="item.id"
:label="item.name"
:value="item.id"
@@ -475,20 +475,23 @@
visible: false,
title: "鏂板缓",
infomation: {},
- autoEdit:false
+ autoEdit: false
}
}
}
},
components: {},
computed: {
- modalTitle(){
- if (this.editConfig.title === '缂栬緫' && this.editConfig.autoEdit){
- return '缂栬緫'
- }else if (this.editConfig.title === '缂栬緫') {
- return !this.showEdit ? '缂栬緫' : '鏌ョ湅'
- }else {
- return '鏂板缓'
+ productCategoryListWithDefault() {
+ return [{ id: 0, name: "璇烽�夋嫨" }, ...(this.productCategoryOptions ?? [])]
+ },
+ modalTitle() {
+ if (this.editConfig.title === "缂栬緫" && this.editConfig.autoEdit) {
+ return "缂栬緫"
+ } else if (this.editConfig.title === "缂栬緫") {
+ return !this.showEdit ? "缂栬緫" : "鏌ョ湅"
+ } else {
+ return "鏂板缓"
}
}
},
@@ -499,12 +502,13 @@
rules: {
name: [{ required: true, message: "璇疯緭鍏ヤ骇鍝佸悕绉�", trigger: "blur" }],
model: [{ required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" }],
- salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
+ // salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
},
memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
+ { name: "璇烽�夋嫨", id: 0 },
{ name: "鑳芥秷鑰�", id: 1 },
{ name: "鏈嶅姟", id: 2 },
{ name: "鍙簱瀛樹骇鍝�", id: 3 }
@@ -549,7 +553,7 @@
this.setTableForm()
this.setBottonView()
this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
- if (this.editConfig.autoEdit){
+ if (this.editConfig.autoEdit) {
this.editClick()
}
},
@@ -745,7 +749,7 @@
}
},
// 鍦ㄥ簱鐐瑰嚮
- inLibraryClick(){
+ inLibraryClick() {
if (this.editConfig.title !== "鏂板缓") {
console.log(this.editConfig.infomation)
this.$router.push({
--
Gitblit v1.8.0