From cfa60fd669fa85429a441cbe69d98cb6181efeb2 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 9 May 2024 15:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/CustomerEdit.vue | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

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 @@
                 <a-input placeholder='所属行业' v-decorator="['sector']" />
               </a-form-item>
             </a-col>
-<!--            <a-col :span='12'>-->
-<!--              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属国家'>-->
-<!--                <a-input placeholder='所属国家' v-decorator="['country']" />-->
-<!--              </a-form-item>-->
-<!--            </a-col>-->
+            <!--            <a-col :span='12'>-->
+            <!--              <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='所属国家'>-->
+            <!--                <a-input placeholder='所属国家' v-decorator="['country']" />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span='12'>
               <a-form-item :labelCol='labelColHalf' :wrapperCol='wrapperColHalf' label='过程管理'>
                 <a-select v-decorator="['process']">
@@ -396,7 +396,7 @@
         :dataSource='deviceData'
       >
          <span slot='floorName' slot-scope='text, record'>
-              {{ record.roomName?record.buildName + record.roomName:record.buildName }}
+              {{ record.roomName ? record.buildName + record.roomName : record.buildName }}
          </span>
       </a-table>
     </a-modal>
@@ -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)