2023-10-31

src/HDrpManagement/customerData/components/pageTable.vue

@@ -1,8 +1,8 @@
 
 <template>
-  <div>
+  <div style="width:100%">
     <div>
-      <tableLayout height="356px" :layout="tablecols" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
+      <tableLayout height="356px" :layout="tablecols" v-bind="$attrs" :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>
@@ -55,8 +55,13 @@ export default {
     }
   },
   methods:{
-    async listData(){
-      const res = await this.$api.requested(this.param)
+    async listData(init){
+      if(init) this.$emit('handleParam',this.param)
+      let param = JSON.parse(JSON.stringify(this.param))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      const res = await this.$api.requested(param)
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total
@@ -74,7 +79,7 @@ export default {
     },
   },
   created() {
-    this.listData()
+    this.listData(true)
   }
 }
 

src/HDrpManagement/customerData/index.vue

@@ -3,7 +3,7 @@
   <normalLayout>
     <template #refresh>
       <div style="margin-right:15px">
-        <el-button style="font-size:14px !important" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">返回顶部</el-button>
+        <el-button style="font-size:14px !important;color: #999999" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">返回顶部</el-button>
       </div>
       <!-- <i class="el-icon-refresh-right" @click="refresh" v-loading.fullscreen.lock="fullscreenLoading"></i> -->
     </template>
@@ -36,7 +36,7 @@
                     <p>
                       成交客户数
                       <el-tooltip class="item" effect="dark" content="成交客户：已成交状态的客户数量" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -45,7 +45,7 @@
                     <p>
                       参与项目客户数
                       <el-tooltip class="item" effect="dark" content="参与项目客户数：参与有下订单的项目的关联客户数" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -56,19 +56,19 @@
                     <p>
                       {{ item.value}}
                       <el-tooltip class="item" effect="dark" content="无分类客户数：统计没有客户分类信息的客户数量" placement="top" v-if="item.value == '无分类客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="A核心客户：客户分类为A核心客户的数量" placement="top" v-else-if="item.value == 'A核心客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="B重要客户：客户分类为B重要客户的数量" placement="top" v-else-if="item.value == 'B重要客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="C普通客户：客户分类为C普通客户的数量" placement="top" v-else-if="item.value == 'C普通客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="D一般客户：客户分类为D一般客户的数量" placement="top" v-else-if="item.value == 'D一般客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -89,8 +89,8 @@
                       size="small" 
                       v-model="chartParam1.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {chartParam1.content.type=1;chartParam1.content.dataid=$event[$event.length - 1];chartParam1.content.username='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.username='';chart1Fun()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
+                      @change="$event => {if($event.length) {chartParam1.content.type=1;chartParam1.content.username='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.username='';chart1Fun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -133,8 +133,8 @@
                       size="small" 
                       v-model="typeTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.dataid=$event[$event.length - 1];typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -204,8 +204,8 @@
                       size="small" 
                       v-model="gradTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.dataid=$event[$event.length - 1];gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -272,8 +272,8 @@
                       size="small" 
                       v-model="contactTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.dataid=$event[$event.length - 1];contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -339,8 +339,8 @@
                       size="small" 
                       v-model="projectTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.dataid=$event[$event.length - 1];projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -406,8 +406,8 @@
                       size="small" 
                       v-model="fllowTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -473,8 +473,8 @@
                       size="small" 
                       v-model="chartParam2.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {chartParam2.content.type=1;chartParam2.content.dataid=$event[$event.length - 1];chartParam2.content.username='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.username='';chart2Fun()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {chartParam2.content.type=1;chartParam2.content.username='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.username='';chart2Fun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -517,8 +517,8 @@
                       size="small" 
                       v-model="unfllowTableParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
+                      @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -623,8 +623,8 @@
                       size="small" 
                       v-model="projectParam.content.dataid" 
                       :options="deplist" 
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
-                      @change="$event => {if($event.length) {projectParam.content.type=1;projectParam.content.dataid=$event[$event.length - 1];projectParam.content.username='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.username='';chart3Fun()}}"></el-cascader>
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
+                      @change="$event => {if($event.length) {projectParam.content.type=1;projectParam.content.username='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.username='';chart3Fun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -668,6 +668,7 @@ import { DualAxes,Pie,measureTextWidth,Column,Line  } from '@antv/g2plot'
 import pageTable from './components/pageTable.vue'
 import borderTemp from '@/HDrpManagement/dataanalysis/components/border.vue'
 export default {
+  name:'customerData',
   components:{borderTemp,pageTable},
   data () {
     return {
@@ -942,8 +943,11 @@ export default {
     },
     //12月新增初始化
     async chart1Fun (init) {
-      console.log(this.chartParam1);
-      let res = await this.$api.requested(this.chartParam1)
+      let param = JSON.parse(JSON.stringify(this.chartParam1))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.uvBillData = res.data.histogram
       res.data.lineChart.forEach(item => item[`同比增长率(%)`] = item.value)
       this.transformData = res.data.lineChart
@@ -973,7 +977,11 @@ export default {
     },
     //12月跟进初始化
     async chart2Fun (init) {
-      let res = await this.$api.requested(this.chartParam2)
+      let param = JSON.parse(JSON.stringify(this.chartParam2))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       console.log(res.data,'近12月跟进');
       this.chartMapData = res.data
       this.chartMapData.tbzzl.forEach(item => item.key = '同比增长率(%)')
@@ -1259,7 +1267,11 @@ export default {
     },
     //客户跟进情况图初始化
     async customerFllowInit (init) {
-      let res = await this.$api.requested(this.fllowMapParam)
+      let param = JSON.parse(JSON.stringify(this.fllowMapParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.customerFllowData.map = res.data
       console.log(this.customerFllowData,'关联项目数据');
       if (init) {
@@ -1370,7 +1382,11 @@ export default {
     },
     //客户报价情况图初始化
     async chart3Fun (init) {
-      let res = await this.$api.requested(this.projectParam)
+      let param = JSON.parse(JSON.stringify(this.projectParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       console.log(res.data,'近12月报价');
       this.projectMapData = res.data
       if (init) {

src/HDrpManagement/projectData/components/pageTable.vue

@@ -57,7 +57,11 @@ export default {
   methods:{
     async listData(init){
       if(init) this.$emit('handleParam',this.param)
-      const res = await this.$api.requested(this.param)
+      let param = JSON.parse(JSON.stringify(this.param))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      const res = await this.$api.requested(param)
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total

src/HDrpManagement/projectData/index.vue

@@ -3,7 +3,7 @@
   <normalLayout>
     <template #refresh>
       <div style="margin-right:15px">
-        <el-button style="font-size:14px !important" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">返回顶部</el-button>
+        <el-button style="font-size:14px !important;color: #999999" type="text" size="small" @click="$refs.scroll.wrap.scrollTop=0">返回顶部</el-button>
       </div>
       <!-- <i class="el-icon-refresh-right" @click="refresh" v-loading.fullscreen.lock="fullscreenLoading"></i> -->
     </template>
@@ -35,10 +35,10 @@
                   </div>
                   <div class="data-item">
                     <p>{{ tool.formatAmount(dataAll.reportProject)}}</p>
-                    <p>
+                    <p >
                       报备项目数
                       <el-tooltip class="item" effect="dark" content="报备项目数:统计已报备的项目数量" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -47,7 +47,7 @@
                     <p>
                       进行中项目数
                       <el-tooltip class="item" effect="dark" content="参与项目客户数:参与有下订单的项目的关联客户数" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -56,7 +56,7 @@
                     <p>
                       项目成交数
                       <el-tooltip class="item" effect="dark" content="项目成交数:统计有关联审核过的订单的项目数量" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -65,7 +65,7 @@
                     <p>
                       项目成交率
                       <el-tooltip class="item" effect="dark" content="项目成交率=有关联审核订单的项目数÷项目总数×100%" placement="top">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -76,19 +76,19 @@
                     <p>
                       {{ item.value }}
                       <el-tooltip class="item" effect="dark" content="无分类客户数:统计没有客户分类信息的客户数量" placement="top" v-if="item.value == '无分类客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="A核心客户:客户分类为A核心客户的数量" placement="top" v-else-if="item.value == 'A核心客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="B重要客户:客户分类为B重要客户的数量" placement="top" v-else-if="item.value == 'B重要客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="C普通客户:客户分类为C普通客户的数量" placement="top" v-else-if="item.value == 'C普通客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                       <el-tooltip class="item" effect="dark" content="D一般客户：客户分类为D一般客户的数量" placement="top" v-else-if="item.value == 'D一般客户'">
-                        <i class="el-icon-warning-outline"></i>
+                        <img style="vertical-align: middle" src="@/assets/icons/prompt_icon.svg" alt="">
                       </el-tooltip>
                     </p>
                   </div>
@@ -109,7 +109,7 @@
                       v-model="typeTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.dataid=$event[$event.length - 1];typeTableParam.content.username='';$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.typeTable.listData();typeInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.username='';$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.typeTable.listData();typeInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -186,7 +186,7 @@
                       v-model="gradTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.dataid=$event[$event.length - 1];gradTableParam.content.username='';$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.gradTable.listData();gradInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.username='';$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.gradTable.listData();gradInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -260,7 +260,7 @@
                       v-model="scoreTableParam1.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {scoreMapParam1.content.type=1;scoreMapParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.type=1;scoreTableParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {scoreMapParam1.content.type=1;scoreMapParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.type=1;scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -348,7 +348,7 @@
                       v-model="addParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {addParam.content.type=1;addParam.content.dataid=$event[$event.length - 1];addParam.content.username='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.username='';addFun()}}"></el-cascader>
+                      @change="$event => {if($event.length) {addParam.content.type=1;addParam.content.username='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.username='';addFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -392,7 +392,7 @@
                       v-model="baobeiParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {baobeiParam.content.type=1;baobeiParam.content.dataid=$event[$event.length - 1];baobeiParam.content.username='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.username='';baobeiFun()}}"></el-cascader>
+                      @change="$event => {if($event.length) {baobeiParam.content.type=1;baobeiParam.content.username='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.username='';baobeiFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -436,7 +436,7 @@
                       v-model="baojiaParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {baojiaParam.content.type=1;baojiaParam.content.dataid=$event[$event.length - 1];baojiaParam.content.username='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.username='';baojiaFun()}}"></el-cascader>
+                      @change="$event => {if($event.length) {baojiaParam.content.type=1;baojiaParam.content.username='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.username='';baojiaFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -480,7 +480,7 @@
                       v-model="fllowParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {fllowParam.content.type=1;fllowParam.content.dataid=$event[$event.length - 1];fllowParam.content.username='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.username='';fllowFun()}}"></el-cascader>
+                      @change="$event => {if($event.length) {fllowParam.content.type=1;fllowParam.content.username='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.username='';fllowFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -524,7 +524,7 @@
                       v-model="fllowTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -598,7 +598,7 @@
                       v-model="contactTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.dataid=$event[$event.length - 1];contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -672,7 +672,7 @@
                       v-model="customerTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {customerMapParam.content.type=1;customerMapParam.content.dataid=$event[$event.length - 1];customerTableParam.content.type=1;customerTableParam.content.dataid=$event[$event.length - 1];customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {customerMapParam.content.type=1;customerMapParam.content.dataid=$event[$event.length - 1];customerTableParam.content.type=1;customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -746,7 +746,7 @@
                       v-model="scoreTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {scoreMapParam.content.type=1;scoreMapParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.type=1;scoreTableParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {scoreMapParam.content.type=1;scoreMapParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.type=1;scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -820,7 +820,7 @@
                       v-model="unfllowTableParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
+                      @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
@@ -946,7 +946,7 @@
                       v-model="dateParam.content.dataid"
                       :options="deplist"
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
-                      @change="$event => {if($event.length) {[$event.length - 1];dateParam.content.type=1;dateParam.content.dataid=$event[$event.length - 1];dateParam.content.username='';getDate()} else {dateParam.content.dataid='';dateParam.content.type='';dateParam.content.username='';getDate()}}"></el-cascader>
+                      @change="$event => {if($event.length) {[$event.length - 1];dateParam.content.type=1;dateParam.content.username='';getDate()} else {dateParam.content.dataid='';dateParam.content.type='';dateParam.content.username='';getDate()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label">项目类型:</label>
@@ -1038,6 +1038,7 @@ import selectProject from './components/selectProject.vue'
 import borderTemp from '@/HDrpManagement/dataanalysis/components/border.vue'
 import FullScroll from '@/components/fullScroll/index.vue'
 export default {
+  name:'projectData',
   components:{borderTemp,pageTable,selectProject,FullScroll},
   data () {
     return {
@@ -1342,7 +1343,7 @@ export default {
         "id": 20231023092304,
         "content": {
           "type": 1,
-          "dataid": 59,
+          "dataid": [54,59],
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "begnode":"",//开始节点
           "endnode":"",//结束节点
@@ -1568,7 +1569,11 @@ export default {
     },
     //12月新增初始化
     async addFun (init) {
-      let res = await this.$api.requested(this.addParam)
+      let param = JSON.parse(JSON.stringify(this.addParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.addData.arr1 = res.data.histogram
       res.data.lineChart.forEach(item => item[`同比增长率(%)`] = item.value)
       this.addData.arr2 = res.data.lineChart
@@ -1598,7 +1603,11 @@ export default {
     },
     //12月报备初始化
     async baobeiFun (init) {
-      let res = await this.$api.requested(this.baobeiParam)
+      let param = JSON.parse(JSON.stringify(this.baobeiParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.baobeiData.arr1 = res.data.histogram
       res.data.lineChart.forEach(item => item[`同比增长率(%)`] = item.value)
       this.baobeiData.arr2 = res.data.lineChart
@@ -1628,7 +1637,11 @@ export default {
     },
     //12月跟进初始化
     async fllowFun (init) {
-      let res = await this.$api.requested(this.fllowParam)
+      let param = JSON.parse(JSON.stringify(this.fllowParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.fllowData = res.data
       this.fllowData.tbzzl.forEach(item => item.key = '同比增长率(%)')
       console.log(res.data,'跟进数据');
@@ -1657,7 +1670,11 @@ export default {
     },
     //12月报价初始化
     async baojiaFun (init) {
-      let res = await this.$api.requested(this.baojiaParam)
+      let param = JSON.parse(JSON.stringify(this.baojiaParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.baojiaData = res.data
       console.log(res.data,'报价数据');
       if (init) {
@@ -1919,7 +1936,11 @@ export default {
     },
     async getDate (init) {
       if(init === true) this.dateParam.content.where.projecttype = this.projectType.length ? this.projectType[0].value : ''
-      let res = await this.$api.requested(this.dateParam)
+      let param = JSON.parse(JSON.stringify(this.dateParam))
+      if (param.content.dataid instanceof Array) {
+        param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
+      }
+      let res = await this.$api.requested(param)
       this.dateList = res.data
       console.log(this.dateList,'周期数据');
     },