diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index eea3589..592c49d 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -123,11 +123,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -396,7 +396,7 @@
:dataSource='deviceData'
>
- {{ record.roomName?record.buildName + record.roomName:record.buildName }}
+ {{ record.roomName ? record.buildName + record.roomName : record.buildName }}
@@ -586,7 +586,7 @@ export default {
roomList: [], //房间
tenantEnable: false,
parkEnable: false,
- mdl: {},
+ mdl: {}
}
},
@@ -615,7 +615,7 @@ export default {
// 查询地区
this.getTenantData()
// 获取用户详细信息
- this.getUserDetail();
+ this.getUserDetail()
},
methods: {
@@ -727,11 +727,18 @@ export default {
this.form.setFieldsValue({
roomIds: [] // 所属房间
})
+ //
+ let type = 0
+ // 河南建安
+ const { customerId } = this.$route.query
+ if (customerId == 83) {
+ type = null
+ }
// 查询房间
getRoomListByBuildIdsRq({
'ids': ids,
'buildingDetailIds': buildingDetailIds,
- 'type': 0
+ 'type': type
}).then((res) => {
this.roomList = res.data
})
@@ -781,7 +788,6 @@ export default {
},
-
customRequest(file) {
// file 是上传的文件 其内容会在放在下面截图中
// 后端需要接受的参数是 formData数据,
@@ -790,7 +796,7 @@ export default {
const formData = new FormData()
formData.append('file', file.file)
console.log(file)
- importData(formData,customerId).then(res => {
+ importData(formData, customerId).then(res => {
if (res.code == 0) {
// 调用组件内方法, 设置为成功状态
file.onSuccess(res, file.file)