From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/operation/components/deviceEdit.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/operation/components/deviceEdit.vue b/admin/src/views/operation/components/deviceEdit.vue
index 1b125ed..f727966 100644
--- a/admin/src/views/operation/components/deviceEdit.vue
+++ b/admin/src/views/operation/components/deviceEdit.vue
@@ -197,7 +197,7 @@
floorId: '',
roomId: '',
- supplier: [],
+ supplier: '',
buyDate: '',
content: '',
supplierLinker: '',
@@ -228,7 +228,6 @@
created() {
this.initData()
this.getProjectLists()
- console.log(this.userInfo)
},
methods: {
getHouseVal(e) {
@@ -326,13 +325,17 @@
detailById(id).then(res => {
this.param = res
this.param.rooms = [res.projectId, res.buildingId, res.floorId, res.roomId]
- this.param.multifileList = res.multifileList.map(item => {
- return {
- ...item,
- createUserName: item.userName,
- createTime: item.createDate
- }
- })
+ console.log(this.param.rooms)
+ if (res.multifileList && res.multifileList.length > 0) {
+ this.param.multifileList = res.multifileList.map(item => {
+ return {
+ ...item,
+ createUserName: item.userName,
+ createTime: item.createDate
+ }
+ })
+ }
+ this.changeProject()
this.getHouseTree()
const cateId = this.param.cateId || ''
setTimeout(() => {
--
Gitblit v1.9.3