Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -138,6 +138,9 @@
                 <div v-else-if="scope.data.columnname == 'signamount_due'">
                   {{scope.data.data.signamount_due && tool.formatAmount(scope.data.data.signamount_due || 0,2,'￥')  }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'scale'">
+                  {{scope.data.data.scale ? scope.data.data.scale + scope.data.data.unitname : '' }}
+                </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}
                 </div>

src/HDrpManagement/projectPortrait/index.vue

@@ -137,6 +137,9 @@
         <div v-else-if="scope.data.column.columnname === 'industry'">
           <el-tag v-for="(item,index) in scope.data.column.data.industry" size="mini" style="margin-right:10px" :key="index">{{ item }}</el-tag>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'scale'">
+          {{scope.data.column.data.scale ? scope.data.column.data.scale + scope.data.column.data.unitname : '' }}
+        </div>
         <div v-else-if="scope.data.column.columnname === 'grade'">
           {{ grade(scope.data.column.data.grade) }}
         </div>

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -28,7 +28,7 @@
               <el-descriptions-item label="未跟进天数"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.subdate ? baseInfo.subdate  + '天' : baseInfo.subdate }}</span></el-descriptions-item>
               <el-descriptions-item label="项目等级"><span style="color:#E85B5B;font-size:16px;font-weight:bold"> {{ baseInfo.grade }}</span></el-descriptions-item>
               <el-descriptions-item label="品牌"> {{ baseInfo.brandname }}</el-descriptions-item>
-              <el-descriptions-item label="项目规模"> {{ baseInfo.scale }}</el-descriptions-item>
+              <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="负责人"> {{ baseInfo.team.length && baseInfo.team.filter(item =>item.isleader == 1)[0].name }}</el-descriptions-item>
               <el-descriptions-item label="项目阶段"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.stagecount }}</span></el-descriptions-item>

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -141,7 +141,7 @@
               [
                 {title:'线索数',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].orderclueSize,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'新增线索数',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].insertOrderclue,bg:'#E8F7EC',color:'#78B32B'},
-                {title:'线索转化率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].ordercluezhl,bg:'#F9F2E5',color:'#FF7603'},
+                {title:'线索转化率',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].ordercluezhl,bg:'#F9F2E5',color:'#FF7603'},
                 {title:'跟进次数',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate,bg:'#F3F9FC',color:'#3874F6'},
                 // {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'平均跟进天数，跟进频率=（总跟进天数-节假日）÷总跟进次数',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
@@ -274,6 +274,9 @@
                 <div v-else-if="scope.data.columnname == 'signamount_due'">
                   {{scope.data.data.signamount_due && tool.formatAmount(scope.data.data.signamount_due || 0,2,'￥')  }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'scale'">
+                  {{scope.data.data.scalc ? scope.data.data.scale + scope.data.data.unitname : '' }}
+                </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}
                 </div>