项目画像，客户画像提示文字修改

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -26,7 +26,11 @@
               <el-descriptions-item label="客户行业">{{ baseInfo.industry.join(',') }}</el-descriptions-item>
               <el-descriptions-item label="客户分类"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.customergrade }}</span></el-descriptions-item>
               <el-descriptions-item label="成交状态"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.tradingstatus }}</span></el-descriptions-item>
-              <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;margin-right: 10px">{{ baseInfo.subdate ? baseInfo.subdate  + '天' : baseInfo.subdate }}</span>
+                <el-tooltip class="item" effect="dark" content="定义：距上次跟进天数；距上次跟进天数=最近一次跟进时间到当前查询时间天数-节假日；若无跟进过，则按照创建时间到当前查询时间天数-节假日；" placement="top">
+                  <i class="el-icon-warning-outline"></i>
+                </el-tooltip>
+              </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="注册地址">{{ `${baseInfo.province}${baseInfo.city}${baseInfo.county}${baseInfo.address}` }} </el-descriptions-item>
             </el-descriptions>
@@ -66,13 +70,13 @@
               <myRadio :value1="param1.content" key1="isAll" @clickBtn="refreshTable('param1','fllow')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :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].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
-                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
+                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
             >
             </myCard>
@@ -86,9 +90,9 @@
               >
               </myTag>
             </div>
-            
+
             <showIsNone title="客户跟进记录明细">
-            <pageTable 
+            <pageTable
               ref="fllow"
               :tablecols="tool.tabelCol($route.name).clueFollow.tablecols"
               :param="param1"
@@ -112,7 +116,7 @@
               <myRadio :value1="param2.content" key1="isAll" @clickBtn="refreshTable('param2','project')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'项目数',value:$refs.project && $refs.project.total,bg:'#F3F9FC',color:'#3874F6'},
@@ -125,7 +129,7 @@
 
 
             <showIsNone title="项目明细">
-            <pageTable 
+            <pageTable
               ref="project"
               :tablecols="tool.tabelCol($route.name).competeProjectsTable.tablecols"
               :param="param2"
@@ -159,7 +163,7 @@
               <myRadio :value1="param3.content" key1="isAll" @clickBtn="refreshTable('param3','baojiadan')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'报价次数',value:$refs.baojiadan && $refs.baojiadan.total,bg:'#F3F9FC',color:'#3874F6'},
@@ -168,7 +172,7 @@
               ]"
             ></myCard>
             <showIsNone title="报价单明细">
-            <pageTable 
+            <pageTable
               ref="baojiadan"
               :tablecols="tool.tabelCol($route.name).quotedPriceTable2.tablecols"
               :param="param3"
@@ -205,7 +209,7 @@
                 <el-option :label="item.remarks" :value="item.value" v-for="(item,index) in contractTypeList" :key="index + 'c'"></el-option>
               </el-select>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'合同总数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].allQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -219,7 +223,7 @@
               ]"
             ></myCard>
             <showIsNone title="合同明细">
-            <pageTable 
+            <pageTable
               ref="hetong"
               :tablecols="tool.tabelCol($route.name).contractTable2.tablecols"
               :param="param4"
@@ -250,7 +254,7 @@
                 <el-option :label="item.value" :value="item.value" v-for="(item,index) in orderTypeList" :key="index + 'd'"></el-option>
               </el-select>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'订单数量',value:$refs.dingdan && $refs.dingdan.list && $refs.dingdan.list[0] && $refs.dingdan.list[0].allOrderQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -263,7 +267,7 @@
               ]"
             ></myCard>
             <showIsNone title="订单明细">
-            <pageTable 
+            <pageTable
               ref="dingdan"
               :tablecols="tool.tabelCol($route.name).orderTable.tablecols"
               :param="param5"
@@ -302,7 +306,7 @@
               <myRadio :value1="param6.content" key1="isAll" @clickBtn="refreshTable('param6','fuwu')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'服务申请次数',value:$refs.fuwu && $refs.fuwu.list && $refs.fuwu.list[0] && $refs.fuwu.list[0].serviceOrderQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -312,7 +316,7 @@
               ]"
             ></myCard>
             <showIsNone title="服务工单明细">
-            <pageTable 
+            <pageTable
               ref="fuwu"
               :tablecols="tool.tabelCol($route.name).serveOrderTable.tablecols"
               :param="param6"
@@ -340,8 +344,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -358,8 +362,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -384,8 +388,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -398,7 +402,7 @@
           </el-row>
         </div>
       </div>
-      
+
     </div>
   </el-drawer>
 </template>
@@ -425,7 +429,7 @@ export default {
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            "isAll":1, 
+            "isAll":1,
             "sa_customersid":this.$route.query.id
         }
       },
@@ -602,7 +606,7 @@ export default {
 }
 
 /deep/.el-drawer {
-  background:#F5F5F5 !important; 
+  background:#F5F5F5 !important;
 }
 /deep/.el-drawer__header{
   display: none !important;

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -25,7 +25,11 @@
               <el-descriptions-item label="领域"><span style="color:#E85B5B;font-size:16px;font-weight:bold">{{ baseInfo.tradefield }}</span></el-descriptions-item>
               <el-descriptions-item label="预计签约金额(元)"> {{ tool.formatAmount(baseInfo.signamount_due || 0,2,'￥') }}</el-descriptions-item>
               <el-descriptions-item label="项目状态"><span style="color:#3874f6">{{ baseInfo.status }}</span></el-descriptions-item>
-              <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;margin-right: 10px">{{ baseInfo.subdate ? baseInfo.subdate  + '天' : baseInfo.subdate }}</span>
+                <el-tooltip class="item" effect="dark" content="定义：距上次跟进天数；距上次跟进天数=最近一次跟进时间到当前查询时间天数-节假日；若无跟进过，则按照创建时间到当前查询时间天数-节假日；" placement="top">
+                  <i class="el-icon-warning-outline"></i>
+                </el-tooltip>
+              </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 ? baseInfo.scale + baseInfo.unitname : '' }}</el-descriptions-item>
@@ -51,7 +55,7 @@
               <myRadio :value1="param1.content" key1="isAll" @clickBtn="refreshTable('param1','pinggu')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'评估总分值',value:baseInfo.allsumscore,bg:'#F3F9FC',color:'#3874F6'},
@@ -60,7 +64,7 @@
               ]"
             ></myCard>
             <showIsNone title="项目评估记录明细">
-            <pageTable 
+            <pageTable
               ref="pinggu"
               :tablecols="tool.tabelCol($route.name).scoreTable.tablecols"
               :param="param1"
@@ -78,7 +82,7 @@
                   </div>
                 </div>
                 <div v-else>
-                  {{ scope.data.data[scope.data.columnname] }}  
+                  {{ scope.data.data[scope.data.columnname] }}
                 </div>
               </template>
             </pageTable>
@@ -94,17 +98,17 @@
               <myRadio :value1="param2.content" key1="isAll" @clickBtn="refreshTable('param2','fllow')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :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].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
-                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
+                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
             >
             </myCard>
-            
+
             <p style="font-size:14px;font-weight:bold;margin-bottom:10px" v-if="$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followDetail.length">跟进人及次数</p>
             <div style="display:flex">
               <myTag
@@ -115,10 +119,10 @@
               >
               </myTag>
             </div>
-            
+
 
             <showIsNone title="项目跟进记录明细">
-            <pageTable 
+            <pageTable
               ref="fllow"
               :tablecols="tool.tabelCol($route.name).clueFollow.tablecols"
               :param="param2"
@@ -140,14 +144,14 @@
             <div slot="header">
               <span class="myTitle">关联客户</span>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'客户数',value:$refs.kehu && $refs.kehu.total,bg:'#F3F9FC',color:'#3874F6'},
               ]"
             ></myCard>
             <showIsNone title="客户明细">
-            <pageTable 
+            <pageTable
               ref="kehu"
               :tablecols="tool.tabelCol($route.name).customerTable2.tablecols"
               :param="param3"
@@ -162,14 +166,14 @@
             <div slot="header">
               <span class="myTitle">竞争对手</span>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'项目竞争对手数',value:$refs.duishou && $refs.duishou.total,bg:'#F3F9FC',color:'#3874F6'},
               ]"
             ></myCard>
             <showIsNone title="竞争对手明细">
-            <pageTable 
+            <pageTable
               ref="duishou"
               :tablecols="tool.tabelCol($route.name).duishouTable.tablecols"
               :param="param4"
@@ -184,7 +188,7 @@
             <div slot="header">
               <span class="myTitle">产品配置</span>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'产品总数',value:$refs.productset && $refs.productset.total,bg:'#F3F9FC',color:'#3874F6'},
@@ -201,7 +205,7 @@
                 <el-table-column
                   prop="itemclassfullname"
                   label="产品类别">
-                  
+
                 </el-table-column>
                 <el-table-column
                   prop="itemclassAmount"
@@ -214,7 +218,7 @@
             </showIsNone>
 
             <showIsNone title="产品配置明细" style="margin-top:10px">
-            <pageTable 
+            <pageTable
               ref="productset"
               :tablecols="tool.tabelCol($route.name).projectSetTable2.tablecols"
               :param="param5"
@@ -238,7 +242,7 @@
             </showIsNone>
           </el-card>
         </div>
-    
+
         <!--报价单-->
         <div class="Mproject" style="margin-top:10px">
           <el-card class="box-card">
@@ -247,7 +251,7 @@
               <myRadio :value1="param6.content" key1="isAll" @clickBtn="refreshTable('param6','baojiadan')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'报价次数',value:$refs.baojiadan && $refs.baojiadan.total,bg:'#F3F9FC',color:'#3874F6'},
@@ -256,7 +260,7 @@
               ]"
             ></myCard>
             <showIsNone title="报价单明细">
-            <pageTable 
+            <pageTable
               ref="baojiadan"
               :tablecols="tool.tabelCol($route.name).quotedPriceTable.tablecols"
               :param="param6"
@@ -293,7 +297,7 @@
                 <el-option :label="item.remarks" :value="item.value" v-for="(item,index) in contractTypeList" :key="index"></el-option>
               </el-select>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'合同总数',value:$refs.hetong && $refs.hetong.list && $refs.hetong.list[0] && $refs.hetong.list[0].allQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -307,7 +311,7 @@
               ]"
             ></myCard>
             <showIsNone title="合同明细">
-            <pageTable 
+            <pageTable
               ref="hetong"
               :tablecols="tool.tabelCol($route.name).contractTable2.tablecols"
               :param="param7"
@@ -334,7 +338,7 @@
               <myRadio :value1="param8.content" key1="isAll" @clickBtn="refreshTable('param8','dingdan')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'订单数量',value:$refs.dingdan && $refs.dingdan.list && $refs.dingdan.list[0] && $refs.dingdan.list[0].allOrderQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -346,7 +350,7 @@
               ]"
             ></myCard>
             <showIsNone title="订单明细">
-            <pageTable 
+            <pageTable
               ref="dingdan"
               :tablecols="tool.tabelCol($route.name).orderTable.tablecols"
               :param="param8"
@@ -385,7 +389,7 @@
               <myRadio :value1="param9.content" key1="isAll" @clickBtn="refreshTable('param9','fuwu')" :btnOptions="[{label:'全部',value:1},{label:'本年',value:0}]">
               </myRadio>
             </div>
-            <myCard 
+            <myCard
               :list="
               [
                 {title:'服务申请次数',value:$refs.fuwu && $refs.fuwu.list && $refs.fuwu.list[0] && $refs.fuwu.list[0].serviceOrderQty,bg:'#F3F9FC',color:'#3874F6'},
@@ -395,7 +399,7 @@
               ]"
             ></myCard>
             <showIsNone title="服务工单明细">
-            <pageTable 
+            <pageTable
               ref="fuwu"
               :tablecols="tool.tabelCol($route.name).serveOrderTable.tablecols"
               :param="param9"
@@ -423,8 +427,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -441,8 +445,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -467,8 +471,8 @@
                             <p class="descript">账号：<span>{{ item.accountno }}</span></p>
                           </div>
                           <div>
-                            <p class="descript">部门：<span>{{ item.depname }}</span></p>  
-                            <p class="descript">职位：<span>{{ item.position }}</span></p>  
+                            <p class="descript">部门：<span>{{ item.depname }}</span></p>
+                            <p class="descript">职位：<span>{{ item.position }}</span></p>
                           </div>
                         </div>
                       </div>
@@ -481,7 +485,7 @@
           </el-row>
         </div>
       </div>
-      
+
     </div>
   </el-drawer>
 </template>
@@ -595,7 +599,7 @@ export default {
             "isAll":1,
             "sa_projectid":this.$route.query.id,
             "where": {
-              
+
             }
         }
       },
@@ -679,7 +683,7 @@ export default {
 }
 
 /deep/.el-drawer {
-  background:#F5F5F5 !important; 
+  background:#F5F5F5 !important;
 }
 /deep/.el-drawer__header{
   display: none !important;

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -340,7 +340,7 @@ export default {
           },
           {
             label:'上图员',
-            value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
+            value:this.mainData.uppictured
           },
           {
             label:'负责人',

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -98,6 +98,7 @@ export default {
       mainAreaData:{},
       detailInfo:{},
       recordlist:[],
+      selectList:[],
       isdesc:1,
       value2:'',
       dateParam:{
@@ -215,10 +216,6 @@ export default {
           label:'所属业务员',
           value:this.mainData.enterprisename
         },
-        {
-          label:'上图员',
-          value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
-        },
         {
           label:'负责人',
           value:this.mainData.leader && this.mainData.leader.length > 0 ? this.mainData.leader[0].name : ''
@@ -325,6 +322,10 @@ export default {
             label:'所属业务员',
             value:this.mainData.salename
           },
+          {
+            label:'上图员',
+            value:this.mainData.uppictured
+          },
           {
             label:'负责人',
             value:this.mainData.leader && this.mainData.leader.length > 0 ? this.mainData.leader[0].name : ''

src/HManagement/personalTarget/target/modules/add.vue

@@ -96,13 +96,15 @@ export default {
     tablelayout
   },
   data () {
+    let that = this
     return {
       pickerOptions:{
         disabledDate(time){
-          /*console.log(year.getFullYear(),'267655555555555555555555555')*/
+          /*console.log(that.yearOpens,'已经开启的年份')*/
           return time.getFullYear() < new Date().getFullYear()
         }
       },
+      yearOpens:[],
       dialogTableVisible:false,
       form:{
         "year": '',
@@ -192,6 +194,16 @@ export default {
       console.log(nowDate.getFullYear())
       this.form.year = String(nowDate.getFullYear() + 1)
     },
+    /*已开启年度*/
+    async yearList(){
+      const res = await this.$api.requested({
+        "id": 20230728090204,
+        "content": {
+          "targettype": "人员目标"
+        },
+      })
+      this.yearOpens = res.data
+    },
     /*pickerOptions(){
       // return time.getTime() < Date.now(); //当天不可选
       const time = new Date()
@@ -201,6 +213,7 @@ export default {
   mounted () {
     /*this.listData()*/
     this.yearData()
+    this.yearList()
   },
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['personalTable'].tablecols

src/SManagement/orderclue_detail/index.vue

@@ -313,7 +313,7 @@ export default {
           },
           {
             label:'上图员',
-            value:this.mainData.isuppictured === 1?this.mainData.createBy:"--"
+            value:this.mainData.uppictured
           },
           {
             label:'负责人',