Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/projectChange/modules/detail.vue

@@ -19,8 +19,8 @@
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
       <div class="inline-16">
-        <PortraitDetail ref="PortraitDetail" v-if="Object.keys(mainData).length >= 3" :data="mainData"></PortraitDetail>
-        <el-button type="primary" size="mini" @click="$refs.PortraitDetail.dialogFormVisible=true">360°画像</el-button>
+        <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData"></PortraitDetail>
+        <el-button type="primary" size="mini" @click="portraitShowFun">360°画像</el-button>
       </div>
       <!-- <mindmap ref="mindmap" class="inline-16" :id="this.$route.query.id" name="project"></mindmap> -->
       <putPeople style=" display: inline-block !important;" @putSuccess="putSuccess" v-if="flagTag !== ''" :isbpm="isbpm" :rowData="mainData" :flagTag="flagTag" :disabled="mainData.disabled" @onClose="onSuccess"/>
@@ -167,6 +167,7 @@ export default {
       unselectColor:{
         background: '#EEEEEE'
       },
+      PortraitShow:false
     }
   },
   watch:{
@@ -230,6 +231,12 @@ export default {
       /*this.queryMainData(this.$route.query.id)*/
       this.$store.dispatch('changeDetailDrawer',false)
     },
+    portraitShowFun () {
+      this.PortraitShow = true
+      this.$nextTick(() => {
+        this.$refs.PortraitDetail.dialogFormVisible=true
+      })
+    },
     async queryMainData (id) {
       this.totalPrice = 0
       const res = await this.$api.requested({

src/HManagement/marketing2/saler/area/detail/index.vue

@@ -17,8 +17,8 @@
       </div>
       <div slot="customOperation" >
         <div class="inline-16">
-          <PortraitDetail ref="PortraitDetail" v-if="Object.keys(mainData).length" :data="mainData"></PortraitDetail>
-          <el-button type="primary" size="mini" @click="$refs.PortraitDetail.dialogFormVisible=true">360°画像</el-button>
+          <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData"></PortraitDetail>
+          <el-button type="primary" size="mini" @click="portraitShowFun">360°画像</el-button>
         </div>
         <!-- <mindmap class="inline-16" ref="mindmap" :id="mainData.hrid" name="saler"></mindmap> -->
         <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete')" type="primary" size="mini" @click="deleteSaler">删 除</el-button>
@@ -48,7 +48,8 @@ export default {
   data () {
     return {
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      PortraitShow:false
     }
   },
   methods:{
@@ -91,6 +92,12 @@ export default {
       this.changeDataStructure()
 
     },
+    portraitShowFun () {
+      this.PortraitShow = true
+      this.$nextTick(() => {
+        this.$refs.PortraitDetail.dialogFormVisible=true
+      })
+    },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.$router.replace({path:'/saler_detail',query:{id:id,rowindex:rowindex,portrait:''}})

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -20,7 +20,7 @@
       </div>
       <div slot="customOperation" >
         <!-- 此区域提供了自定义操作按钮 -->
-        <el-button class="inline-16" type="primary" size="mini" @click="$refs.PortraitDetail.dialogFormVisible=true">360°画像</el-button>
+        <el-button class="inline-16" type="primary" size="mini" @click="portraitShowFun">360°画像</el-button>
         <!-- <mindmap class="inline-16" ref="mindmap" :id="this.$route.query.id" name="custom"></mindmap> -->
         <statusChange class="inline-16" v-if="tool.checkAuth($route.name,'statusChange')" :disabled="mainData.disabled" :id="mainData.sa_customersid"  @statusChangeSuccess="statusChangeSuccess"></statusChange>
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.sourcepoolname === ''" :disabled="mainData.disabled" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
@@ -60,7 +60,7 @@
         <followLeads :data="mainData"  v-if="flag"></followLeads>
       </div>
     </basicDetails>
-    <PortraitDetail ref="PortraitDetail" v-if="Object.keys(mainData).length >= 2" :data="mainData"></PortraitDetail>
+    <PortraitDetail ref="PortraitDetail" v-if="PortraitShow" :data="mainData"></PortraitDetail>
   </div>
 </template>
 
@@ -108,7 +108,8 @@ export default {
       users:[],
       flag:false,
       disabled:false,
-      tagFlag:false
+      tagFlag:false,
+      PortraitShow:false
     }
   },
   components:{
@@ -233,6 +234,12 @@ export default {
     show(){
       this.visible = false
     },
+    portraitShowFun () {
+      this.PortraitShow = true
+      this.$nextTick(() => {
+        this.$refs.PortraitDetail.dialogFormVisible=true
+      })
+    },
     changeDataStructure() {
       let that = this
       this.mainAreaData = [