Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -70,7 +70,7 @@
               :list="
               [
                 {title:'跟进次数',value:$refs.fllow && $refs.fllow.total,bg:'#F3F9FC',color:'#3874F6'},
-                {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name,bg:'#E8F7EC',color:'#78B32B'},
+                {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name || '--',bg:'#E8F7EC',color:'#78B32B'},
                 {title:'最近跟进时间',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
                 {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"

src/HDrpManagement/customerPortrait/modules/pageTable.vue

@@ -2,7 +2,18 @@
 <template>
   <div>
     <div>
-      <tableLayout :layout="tablecols" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation">
+      <tableLayout :layout="tablecols" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
+        <template v-slot:header="data">
+          <div v-if="data.data.label == '综合折扣'" style="display:flex;align-items:center">
+            <span>{{ data.data.label }}</span>
+            <el-tooltip class="item" effect="dark" content="综合折扣=（产品明细平均折扣+产品类别平均折扣）÷2×100%" placement="top">
+              <i class="el-icon-warning-outline" style="margin-left:10px;cursor: pointer;"></i>
+            </el-tooltip>
+          </div>
+          <div v-else>
+            <span>{{ data.data.label }}</span>
+          </div>
+        </template>
         <template v-slot:customcol="scope">
           <slot v-if="custom" name="custom" :data="scope.column"></slot>
           <div v-else>

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -31,7 +31,7 @@
               <el-descriptions-item label="项目规模"> {{ baseInfo.scale ? baseInfo.scale + baseInfo.unitname : '' }}</el-descriptions-item>
               <el-descriptions-item label="预计签约时间"> {{ baseInfo.signdate_due }}</el-descriptions-item>
               <el-descriptions-item label="负责人"> <span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.team.length && baseInfo.team.filter(item =>item.isleader == 1)[0].name }}</span></el-descriptions-item>
-              <el-descriptions-item label="项目阶段"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.stagecount }}</span></el-descriptions-item>
+              <el-descriptions-item label="项目阶段"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.stagename }}</span></el-descriptions-item>
               <el-descriptions-item label="项目评估总分"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.allsumscore }}</span> </el-descriptions-item>
               <el-descriptions-item label="项目地址">
                 <div style="max-width:500px">
@@ -98,7 +98,7 @@
               :list="
               [
                 {title:'跟进次数',value:$refs.fllow && $refs.fllow.total,bg:'#F3F9FC',color:'#3874F6'},
-                {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name,bg:'#E8F7EC',color:'#78B32B'},
+                {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name || '--',bg:'#E8F7EC',color:'#78B32B'},
                 {title:'最近跟进时间',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
                 {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"

src/components/dynamic-table/index.vue

@@ -8,6 +8,9 @@
           width="35" fixed v-if="checkbox">
       </el-table-column>
       <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+        <template v-slot:header="{ column,$index }" v-if="customHeader"> 
+          <slot name="header" :data="column"></slot>
+        </template>
         <template slot-scope="scope">
           <div class="table-panel">
             <!-- 自定义表格显示内容 -->
@@ -32,7 +35,7 @@ export default {
     custom:是否启用自定义结构;
     opwidth:操作列宽度
   */
-  props:['layout','data','custom','height','fixedName','width','checkbox','redirect'],
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','customHeader'],
   data () {
     return {
       list:[],