From f73080c69548aba58d6a58e7e049d8eb79f9f7ed Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 19 十月 2023 17:25:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
---
src/views/productManage/product/AddProductDialog.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 27f441a..a1d1117 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '浜у搧'"
+ :title="modalTitle + '浜у搧'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "浜у搧" }}</span>
+ <span>{{ modalTitle + "浜у搧" }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -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"
@@ -474,13 +474,27 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit:false
}
}
}
},
components: {},
- computed: {},
+ computed: {
+ 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 '鏂板缓'
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
@@ -494,6 +508,7 @@
memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
+ { name: "璇烽�夋嫨", id: 0 },
{ name: "鑳芥秷鑰�", id: 1 },
{ name: "鏈嶅姟", id: 2 },
{ name: "鍙簱瀛樹骇鍝�", id: 3 }
@@ -538,6 +553,9 @@
this.setTableForm()
this.setBottonView()
this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ if (this.editConfig.autoEdit){
+ this.editClick()
+ }
},
methods: {
// 鑾峰彇浜у搧绫诲埆
--
Gitblit v1.8.0