From d86ccb2b95f03aaa4e3ef3fdab8f3bda5d965473 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 17 十月 2023 20:38:06 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/productManage/productCategory/AddProductCategoryDialog.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/productManage/productCategory/AddProductCategoryDialog.vue b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
index 841d7b4..e0833be 100644
--- a/src/views/productManage/productCategory/AddProductCategoryDialog.vue
+++ b/src/views/productManage/productCategory/AddProductCategoryDialog.vue
@@ -36,7 +36,6 @@
label-position="right"
label-width="110px"
size="mini"
- style="height: 290px; overflow-x: hidden"
>
<div class="basic-info">
<FormBtnsView :showProduct="true" @productClick="productClick" />
@@ -161,9 +160,9 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
+ <div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
--
Gitblit v1.8.0