Merge branch 'greenUrgent' into testToMerge

src/HDrpManagement/dataanalysis/index.vue

@@ -287,7 +287,6 @@ export default {
       }
     },
     clickFull(type,time,val){
-      console.log(val,'3333val99999')
       if (type == '新增线索'){
         this.tabName = '线索'
         this.$refs.clue.disabled = true

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -70,7 +70,20 @@
           </div>
           <tableLayout style="margin-top: 10px" :layout="tablecolsFollow" :data="listFollow" :opwidth="200" :custom="true" :height="isFull ?'calc(100vh - 150px)':tableHeight">
             <template v-slot:customcol="scope">
-              <p>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'&#45;&#45;'}}</p>
+              <p v-if="scope.column.columnname === 'followname'">
+              <span v-if="scope.column.data.followname.length > 0">
+                <span v-for="(item,index) in scope.column.data.followname">
+                <span v-if="index === scope.column.data.followname.length -1">
+                  {{$t(item)}}
+                </span>
+                <span v-else>
+                  {{item + ','}}
+                </span>
+              </span>
+              </span>
+                <span v-else>--</span>
+              </p>
+              <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'&#45;&#45;'}}</p>
             </template>
           </tableLayout>
           <div class="container normal-panel" style="text-align:right">

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -611,12 +611,26 @@
                 :custom="true"
               >
                 <template v-slot:custom="scope">
+                  <div v-if="scope.data.columnname === 'followname'">
+                    <span v-if="scope.data.data.followname.length > 0">
+                      <span v-for="(item,index) in scope.data.data.followname">
+                      <span v-if="index === scope.data.data.followname.length -1">
+                        {{$t(item)}}
+                      </span>
+                      <span v-else>
+                        {{item + ','}}
+                      </span>
+                    </span>
+                    </span>
+                    <span v-else>--</span>
+                  </div>
                   <div
                     style="
                       text-wrap: wrap;
                       word-wrap: break-word;
                       white-space: normal;
                     "
+                    v-else
                   >
                     {{ scope.data.data[scope.data.columnname]?$t(scope.data.data[scope.data.columnname]):'--' }}
                   </div>