Merge branch 'hw' of http://121.41.102.225:8099/Nidong/jiufang

# Conflicts:
#	vue.config.js

src/views/BasicSettings/SuppliersManage/SippliersClassify.vue

@@ -163,8 +163,32 @@ export default {
       }).then((res) => {
         this.treeData[0].sub = res.data
         // this.openChildrenNode(this.treeData)
+      // this.ergodic(this.treeData)
+      this.treeData.forEach(item=>{
+        item.expand=true;
+        if(item.sub.length!=0)
+        item.sub.forEach(_item=>{
+          _item.expand=true;
+          if(_item.sub.length!=0){
+            _item.sub.forEach(__item=>{
+              __item.expand=true
+            })
+          }
+        })
+      })
       }).catch((err) => { });
     },
+  ergodic(row){
+     row.forEach(item=>{
+       if(item.sub.length==0){
+         item.expand = true
+      
+       }else{
+         item.expand = true
+         this.ergodic(item)
+       }
+     })
+  },
     handleSet () {
       this.type = 1
       this.showModal = true

src/views/leadMatch/roomList/edit.vue

@@ -20,7 +20,7 @@
             </Upload> -->
           <div class="inputWrap"  v-if="$route.query.type != 2">
     <button class="inputWrapButton"
-            @click="onClickBtn">图纸导入</button>
+            @click="onClickBtn">导入</button>
     <input type="file"
            multiple
          

src/views/leadMatch/weightMemo/edit.vue

@@ -20,7 +20,7 @@
             </Upload> -->
               <div class="inputWrap"  v-if="$route.query.type != 2">
     <button class="inputWrapButton"
-            @click="onClickBtn">图纸导入</button>
+            @click="onClickBtn">导入</button>
     <input type="file"
            multiple