Hwt 2 роки тому
батько
коміт
e5a2117886

+ 28 - 12
operationSupport/src/components/common/buildingTree.vue

@@ -87,18 +87,34 @@ export default {
       });
     },
     getOrgTreeList () {
-      this.$http
-        .get('/czc-community/assets/tree/community/find', { buildingType: this.buildingType })
-        .then(({ status, data, msg }) => {
-          if (status === 0 && data) {
-            this.organList = data;
-            this.dimension(data);
-            this.$nextTick().then(() => {
-              const firstNode = document.querySelector('.el-tree-node');
-              firstNode.click();
-            });
-          }
-        });
+      if (this.buildingType == '5') {
+        this.$http
+          .get('/czc-community/assets/tree/community/find')
+          .then(({ status, data, msg }) => {
+            if (status === 0 && data) {
+              this.organList = data;
+              this.dimension(data);
+              this.$nextTick().then(() => {
+                const firstNode = document.querySelector('.el-tree-node');
+                firstNode.click();
+              });
+            }
+          });
+      } else {
+        this.$http
+          .get('/czc-community/assets/tree/community/find', { buildingType: this.buildingType })
+          .then(({ status, data, msg }) => {
+            if (status === 0 && data) {
+              this.organList = data;
+              this.dimension(data);
+              this.$nextTick().then(() => {
+                const firstNode = document.querySelector('.el-tree-node');
+                firstNode.click();
+              });
+            }
+          });
+      }
+
     },
     filterNode (value, data) {
       if (!value) return true;

+ 1 - 0
operationSupport/src/views/assetManagement/housingManagement/index.vue

@@ -52,6 +52,7 @@
                 class="device-search-dropdown"
               >
                 <el-dropdown-item command="add">单个添加</el-dropdown-item>
+
                 <el-dropdown-item command="batchAdd">
                   <div class="upload_div">
                     <xk-upload

+ 1 - 1
operationSupport/src/views/buildingManagement/index.vue

@@ -41,7 +41,6 @@
             class="device-search-dropdown"
           >
             <el-dropdown-item command="add">单个添加</el-dropdown-item>
-            <el-dropdown-item command="addTemplate">下载模板</el-dropdown-item>
             <el-dropdown-item command="batchAdd">
               <!-- 批量添加 -->
               <div class="upload_div">
@@ -54,6 +53,7 @@
                 </xk-upload>
               </div>
             </el-dropdown-item>
+            <el-dropdown-item command="addTemplate">下载模板</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <!-- <el-tooltip

+ 4 - 3
operationSupport/src/views/businessManagement/InvestmentResources/stepPage/add.vue

@@ -349,8 +349,8 @@ export default {
         this.$http.get('/czc-community/assets/house/find/' + value[value.length - 1]).then(({ status, data, msg }) => {
           if (status == 0) {
             this.formData.residentId = data.residentId;
-            this.rentSaleType = data.salesType == 1 ? '可租可售' : data.salesType == 2 ? '只租' : '只售';
-            this.houseType = data.buildingType == 1 ? '住宅' : '商用';
+            this.rentSaleType = data.salesType == 1 ? '可租可售' : data.salesType == 2 ? '只租' : data.salesType == 3 ? '只售' : '-';
+            this.houseType = data.buildingType == 1 ? '住宅' : data.buildingType == 2 ? '商用' : '-';
             this.floor = data.floorNumber;
             this.orientation = data.orientationOfRoom == 1 ? '东' : data.orientationOfRoom == 2 ? '南' : data.orientationOfRoom == 3 ? '西' : data.orientationOfRoom == 4 ? '北' : data.orientationOfRoom == 5 ? '东南' : data.orientationOfRoom == 6 ? '西南' : data.orientationOfRoom == 7 ? '西北' : data.orientationOfRoom == 8 ? '东北' : '-';
             if (data.housingType != null) {
@@ -375,7 +375,8 @@ export default {
     },
     // 获取招租房屋
     getOrgTreeList () {
-      this.$http.get('/czc-community/assets/tree/community/find', { buildingType: 1 }).then(({ status, data, msg }) => {
+      // { buildingType: 1 }
+      this.$http.get('/czc-community/assets/tree/community/find').then(({ status, data, msg }) => {
         if (status == 0) {
           this.informTypes = data;
         }