Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

zhangyanpeng

2020-02-11 355d7d39a67bc1fc27ed1e391799ff7fcc3b2aa7

 src/components/popup/portion/substep.vue

@@ -1199,6 +1199,7 @@
    data() {
      return {
            showData: {},
            finish: false,
            hideData: {
               'title': false,
               'scheme': false,
@@ -1450,7 +1451,6 @@
           let url = "/api/sysRoleMapping/detail";
           this.$axios.get(url)
           .then(data_ => {
             console.log(data_);
             let list = data_.data.data;
             let parId = "";
             let obj = {};
@@ -1478,17 +1478,16 @@
                     obj[id].children = [list[i]];
                 }
             }
				
             me.options_users = result;
         
           }).catch(error =>{
               console.log(error);
           })
         },
         
         getDetailed() {
            let url = "/api/detail/parent/" + this.xmId;
            this.$axios.get(url).then(data_ => {
              console.log(data_);
               this.defaultCheckedKeys = [];
               this.showData = {};
               let details_ = data_.data.data;
@@ -1509,8 +1508,8 @@
                  }
                  
               }
               this.finish = true;
            }).catch(error =>{
                console.log(error);
            })
            
         },