From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token
---
src/views/warehouseManage/bussinessType/AddBussinessType.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index df2d806..b3d2827 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -280,8 +280,8 @@
page: 0,
pageSize: 0
}).then((res) => {
- if (res.data.code == 200) {
- this.warehouseList = res.data.data ? res.data.data : []
+ if (res.code == 200) {
+ this.warehouseList = res.data ? res.data : []
}
})
},
@@ -294,6 +294,9 @@
this.showButton = false
this.showEdit = false
this.showFooter = true
+ } else if (this.editConfig.title === "缂栬緫") {
+ this.showEdit = false
+ this.showFooter = true
} else {
this.showEdit = true
this.showFooter = false
--
Gitblit v1.8.0