Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/competitor/detail/index.vue

@@ -13,7 +13,7 @@
         column="4"
         :tabs="['详细信息','参与竞争项目','联系人','地址管理']"
         @pageChange="pageChange"
-        @onEditSuccess="queryMainData($route.query.id);$refs.detailed.basicData()">
+        @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
         <!-- 使用此插槽可不传[tags] -->
         <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
@@ -24,7 +24,7 @@
         <toVoid :id="$route.query.id" class="inline-16"></toVoid>
       </div>
       <div slot="slot0" >
-        <detailed ref="detailed" v-if="flag"></detailed>
+        <detailed ref="detailed" v-if="mainData" :basic="mainData"></detailed>
       </div>
       <div slot="slot1" class=" normal-panel">
         <compete_projects :data="mainData" v-if="flag"></compete_projects>

src/HDrpManagement/competitor/detail/modules/detailedData.vue

@@ -26,6 +26,7 @@
 <script>
 export default {
   name: "detailedData",
+  props:['basic'],
   data(){
     return {
       basic:[],
@@ -34,7 +35,7 @@ export default {
     }
   },
   mounted() {
-    this.basicData(this.data)
+    // this.basicData(this.data)
    /* this.systemData(this.data)*/
   },
   methods:{