瀏覽代碼

数据总览部门查询调整

qymljy 1 周之前
父節點
當前提交
69029833eb

+ 23 - 13
src/HDrpManagement/contactData/components/depStatus.vue

@@ -110,43 +110,53 @@ export default {
     },
     /*选择部门*/
     selectDep(val) {
-      console.log(val,'val2222')
       if (val.length === 0){
         const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
-        console.log(JSON.parse(sessionStorage.getItem('active_account')).userid)
         this.person = JSON.parse(window.sessionStorage.getItem('active_account')).name
         this.$emit(`depData`,userid,'0')
       }else {
         this.person = ''
         this.departmentid = val[val.length -1]
-        this.$emit(`depData`,this.departmentid,'1',this.isleave)
+
       }
+      this.personData(this.departmentid,'部门')
     },
     /*选择人员*/
     selectPerson(val){
-      this.depment = ''
-      this.departmentid = ''
-      this.dataid = val
-      this.$emit(`personData`,val,'0',this.isleave)
+      let type = 0
+      if (val || this.depment){
+        type = val?0:1
+        this.dataid = val?val:this.depment
+      }else {
+        type = 1
+        this.dataid = -1
+      }
+      this.$emit(`personData`,this.dataid,type,this.isleave,'人员',this.depment)
     },
     /*选择在职状态*/
     leaveChange(){
       this.person = ''
-      const type = this.depment?'1':'0'
-      const dataid = type == 0?-1:this.departmentid
-      this.$emit(`leaveData`,dataid,type,this.isleave,'状态')
-      this.personData()
+      const dataid = this.depment?this.depment:-1
+      // this.$emit(`leaveData`,dataid,type,this.isleave,'状态')
+      this.personData(dataid,'状态')
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid,state){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.isleave
+          isleave:this.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)
       this.personnelList = res.data.hr
+      if (state == '状态'){
+        this.$emit(`leaveData`,depid,'1',this.isleave,state,this.personnelList)
+      }else {
+        this.$emit(`depData`,depid,'1',this.isleave,state,this.personnelList)
+      }
+
     },
   },
   mounted() {

+ 33 - 24
src/HDrpManagement/contactData/index.vue

@@ -495,8 +495,8 @@ export default {
       this.queryMainData(this.paramMain.content.dataid,data)
     },
     /*选择部门*/
-    depData(id,type,isleave,state){
-      this.otherModel(id,type,isleave,state)
+    depData(id,type,isleave,state,personNew){
+      this.otherModel(id,type,isleave,state,personNew)
     },
     /*其他页面首次调用*/
     otherMethod(dataid){
@@ -516,70 +516,79 @@ export default {
       this.$refs.statisticsOfFollowRef.listData(dataid,0,1,null,true)
       this.$refs.statisticsOfUnFollowRef.listData(dataid,0,1,null,true)
     },
+
     /*其他页面再次调用*/
-    otherModel(dataid,type,isleave,state){
+    otherModel(dataid,type,isleave,state,listNew){
       this.paramMain.content.type = type
       this.paramMain.content.where.isleave = isleave
       this.paramMain.content.dataid = dataid
-      this.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.depment = type == 0 ? '' : dataid
+      this.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.depment = state == '人员' ? listNew : dataid
       this.isleave = isleave
       this.queryMainData(dataid,this.dateType)
 
       /*联系人销售贡献度排行*/
-      this.$refs.salesContributionRef.$refs.depStatusProRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.salesContributionRef.$refs.depStatusCusRef.person = state == '状态' ? '' : type == 0 ? dataid : ''
-      this.$refs.salesContributionRef.$refs.depStatusCusRef.depment = type == 0 ? '' : dataid
-      this.$refs.salesContributionRef.$refs.depStatusProRef.depment = type == 0 ? '' : dataid
+      this.$refs.salesContributionRef.$refs.depStatusProRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.salesContributionRef.$refs.depStatusCusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.salesContributionRef.$refs.depStatusCusRef.depment = state == '人员' ? listNew : dataid
+      this.$refs.salesContributionRef.$refs.depStatusProRef.depment = state == '人员' ? listNew : dataid
       this.$refs.salesContributionRef.$refs.depStatusProRef.isleave = isleave
-
+      this.$refs.salesContributionRef.$refs.depStatusCusRef.personnelList = state == '状态' || state == '部门' ? listNew : this.$refs.salesContributionRef.$refs.depStatusCusRef.personnelList
       this.$refs.salesContributionRef.$refs.depStatusCusRef.isleave = isleave
+      this.$refs.salesContributionRef.$refs.depStatusProRef.personnelList = state == '状态' || state == '部门' ? listNew : this.$refs.salesContributionRef.$refs.depStatusProRef.personnelList
       this.$refs.salesContributionRef.listData(dataid,type,isleave,state)
 
       /*近12月联系人新增分析*/
-      this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.contactsAddAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.contactsAddAnalysisRef.listData(dataid,type,1,state,null)
 
       /*联系人关联线索情况统计*/
-      this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfCluesRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfCluesRef.paramTable.content.pageNumber = 1
       this.$refs.statisticsOfCluesRef.listData(dataid,type,1,state,null)
 
       /*联系人关联客户情况统计*/
-      this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfCustomerRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfCustomerRef.paramTable.content.pageNumber = 1
       this.$refs.statisticsOfCustomerRef.listData(dataid,type,1,state,null)
 
       /*联系人关联项目情况统计*/
-      this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfProjectRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfProjectRef.paramTable.content.pageNumber = 1
       this.$refs.statisticsOfProjectRef.listData(dataid,type,1,state,null)
 
       /*联系人跟进情况统计*/
-      this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfFollowRef.paramTable.content.pageNumber = 1
       this.$refs.statisticsOfFollowRef.listData(dataid,type,1,state,null)
 
       /*近12月联系人跟进分析*/
-      this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.contactsFollowAnalysisRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.contactsFollowAnalysisRef.listData(dataid,type,1,state,null)
 
       /*联系人未跟进天数分析*/
-      this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' ? '' : type == 0  ? dataid : ''
-      this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = type == 0 ? '' : dataid
+      this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.person = state == '状态' || state == '部门' ? '' :  dataid
+      this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.depment = state == '人员' ? listNew : dataid
       this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.isleave = isleave
+      this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList = state == '状态' || state == '部门' ? listNew :  this.$refs.statisticsOfUnFollowRef.$refs.dataTemPlateRef.$refs.depStatusRef.personnelList
       this.$refs.statisticsOfUnFollowRef.paramTable.content.pageNumber = 1
       this.$refs.statisticsOfUnFollowRef.listData(dataid,type,1,state,null)
     },

+ 3 - 2
src/HDrpManagement/customerData/components/pageTable.vue

@@ -66,8 +66,9 @@ export default {
     async listData(init,state){
       if(init) this.$emit('handleParam',this.param)
       let param = JSON.parse(JSON.stringify(this.param))
-      if (state == '状态'){
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '状态'){
+        param.content.type = 1
+        param.content.dataid = param.content.depname[param.content.depname.length -1]?param.content.depname[param.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]

+ 178 - 116
src/HDrpManagement/customerData/index.vue

@@ -126,16 +126,17 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="chartParam1.content.dataid"
+                        v-model="chartParam1.content.depname"
                         :options="deplist"
                         :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>
+                        @change="$event => {if($event.length) {chartParam1.content.type=1;chartParam1.content.username='';chart1Fun(null,'部门')} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.username='';chart1Fun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="chartParam1.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="chartParam1.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {chartParam1.content.type=0;chartParam1.content.dataid=$event;chartParam1.content.depname='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.depname='';chart1Fun()}}"
+                        @change="$event => {if($event) {chartParam1.content.type=0;chartParam1.content.dataid=$event;chart1Fun()}
+                        else {chartParam1.content.dataid=chartParam1.content.depname[chartParam1.content.depname.length - 1 ];chartParam1.content.type=1;chart1Fun()}}"
                         >
                         <el-option
                             v-for="item in chartParam1Salesman"
@@ -186,16 +187,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="typeTableParam.content.dataid"
+                        v-model="typeTableParam.content.depname"
                         :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.username='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()}}"></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='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData(null,'部门');customerTypeInit(null,'部门')}
+                        else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData(null,'部门');customerTypeInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="typeTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="typeTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()}}"
+                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()} else
+                      {typeMapParam.content.type=1;typeMapParam.content.dataid=typeTableParam.content.depname[typeTableParam.content.depname.length-1];typeTableParam.content.dataid=typeTableParam.content.depname[typeTableParam.content.depname.length-1];typeTableParam.content.type=1;typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()}}"
                       >
                         <el-option
                             v-for="item in typeMapParamSalesman"
@@ -451,16 +454,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="contactTableParam.content.dataid"
+                        v-model="contactTableParam.content.depname"
                         :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.username='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}}"></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='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData(null,'部门');customerContactInit(null,'部门')}
+                        else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData(null,'部门');customerContactInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="contactTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="contactTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}}"
+                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}
+                      else {contactMapParam.content.type=1;contactMapParam.content.dataid=contactTableParam.content.depname[contactTableParam.content.depname.length-1];contactTableParam.content.dataid=contactTableParam.content.depname[contactTableParam.content.depname.length-1];contactTableParam.content.type=1;contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}}"
                       >
                         <el-option
                             v-for="item in contactMapParamSalesman"
@@ -582,16 +587,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="projectTableParam.content.dataid"
+                        v-model="projectTableParam.content.depname"
                         :options="deplist"
                         :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='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"></el-cascader>
+                        @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData(null,'部门');customerProjectInit(null,'部门')}
+                        else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData(null,'部门');customerProjectInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="projectTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="projectTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {projectMapParam.content.type=0;projectMapParam.content.dataid=$event;projectTableParam.content.type=0;projectTableParam.content.dataid=$event;projectTableParam.content.depname='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.depname='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"
+                      @change="$event => {if($event) {projectMapParam.content.type=0;projectMapParam.content.dataid=$event;projectTableParam.content.type=0;projectTableParam.content.dataid=$event;projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}
+                      else {projectMapParam.content.type=1;projectMapParam.content.dataid=projectTableParam.content.depname[projectTableParam.content.depname.length -1];projectTableParam.content.dataid=projectTableParam.content.depname[projectTableParam.content.depname.length -1];projectTableParam.content.type=1;projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"
                       >
                         <el-option
                             v-for="item in projectMapParamSalesman"
@@ -713,16 +720,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="fllowTableParam.content.dataid"
+                        v-model="fllowTableParam.content.depname"
                         :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.username='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()}}"></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='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData(null,'部门');customerFllowInit(null,'部门')}
+                        else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData(null,'部门');customerFllowInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="fllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="fllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()}}"
+                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()} else
+                      {fllowMapParam.content.type=1;fllowMapParam.content.dataid=fllowTableParam.content.depname[fllowTableParam.content.depname.length -1];fllowTableParam.content.dataid=fllowTableParam.content.depname[fllowTableParam.content.depname.length -1];fllowTableParam.content.type=1;fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()}}"
                       >
                         <el-option
                             v-for="item in fllowMapParamSalesman"
@@ -844,16 +853,16 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="chartParam2.content.dataid"
+                        v-model="chartParam2.content.depname"
                         :options="deplist"
                         :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>
+                        @change="$event => {if($event.length) {chartParam2.content.type=1;chartParam2.content.username='';chart2Fun(null,'部门')} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.username='';chart2Fun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
-                      <el-select v-model="chartParam2.content.username" filterable :placeholder="$t('请选择')" size="small"
+                      <el-select v-model="chartParam2.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {chartParam2.content.type=0;chartParam2.content.dataid=$event;chartParam2.content.depname='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.depname='';chart2Fun()}}"
+                        @change="$event => {if($event) {chartParam2.content.type=0;chartParam2.content.dataid=$event;chart2Fun()} else {chartParam2.content.dataid=chartParam2.content.depname[chartParam2.content.depname.length -1];chartParam2.content.type=1;chart2Fun()}}"
                         >
                         <el-option
                             v-for="item in chartParam2Salesman"
@@ -904,16 +913,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="unfllowTableParam.content.dataid"
+                        v-model="unfllowTableParam.content.depname"
                         :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.username='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';unfllowTableParam.content.pageNumber = 1;$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='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData(null,'部门');customerUnfllowInit(null,'部门')} else
+                        {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData(null,'部门');customerUnfllowInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="unfllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
+                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else
+                      {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=unfllowTableParam.content.depname[unfllowTableParam.content.depname.length -1];unfllowTableParam.content.dataid=unfllowTableParam.content.depname[unfllowTableParam.content.depname.length -1];unfllowTableParam.content.type=1;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
                       >
                         <el-option
                             v-for="item in unfllowMapParamSalesman"
@@ -1052,16 +1063,16 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="projectParam.content.dataid"
+                        v-model="projectParam.content.depname"
                         :options="deplist"
                         :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>
+                        @change="$event => {if($event.length) {projectParam.content.type=1;projectParam.content.username='';chart3Fun(null,'部门')} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.username='';chart3Fun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="projectParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                        @change="$event => {if($event) {projectParam.content.type=0;projectParam.content.dataid=$event;projectParam.content.depname='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.depname='';chart3Fun()}}"
+                        @change="$event => {if($event) {projectParam.content.type=0;projectParam.content.dataid=$event;chart3Fun()} else {projectParam.content.dataid=projectParam.content.depname[projectParam.content.depname.length -1];projectParam.content.type=1;chart3Fun()}}"
                         >
                         <el-option
                             v-for="item in projectParamSalesman"
@@ -1640,14 +1651,16 @@ export default {
     //12月新增初始化
     async chart1Fun (init,state) {
       let param = JSON.parse(JSON.stringify(this.chartParam1))
-      if (state == '状态'){
-        this.personData('chartParam1Salesman',this.chartParam1.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('chartParam1Salesman',this.chartParam1.content.where.isleave,this.chartParam1.content.depname[this.chartParam1.content.depname.length-1])
         this.chartParam1.content.username = ''
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+        param.content.type = 1
+        param.content.dataid = this.chartParam1.content.depname[this.chartParam1.content.depname.length-1]?this.chartParam1.content.depname[this.chartParam1.content.depname.length-1]:-1
       }
       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*/
       let lastYear = []
@@ -1727,10 +1740,11 @@ export default {
     //12月跟进初始化
     async chart2Fun (init,state) {
       let param = JSON.parse(JSON.stringify(this.chartParam2))
-      if (state == '状态'){
-        this.personData('chartParam2Salesman',this.chartParam2.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('chartParam2Salesman',this.chartParam2.content.where.isleave,this.chartParam2.content.depname[this.chartParam2.content.depname.length -1])
         this.chartParam2.content.username = ''
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+        param.content.type = 1
+        param.content.dataid = this.chartParam2.content.depname[this.chartParam2.content.depname.length -1]?this.chartParam2.content.depname[this.chartParam2.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -1813,10 +1827,11 @@ export default {
     },
     //客户类型图初始化
     async customerTypeInit (init,state) {
-      if (state == '状态'){
-        this.personData('typeMapParamSalesman',this.typeMapParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('typeMapParamSalesman',this.typeMapParam.content.where.isleave,this.typeTableParam.content.depname[this.typeTableParam.content.depname.length-1])
         this.typeMapParam.content.username = ''
-        this.typeMapParam.content.dataid = this.typeMapParam.content.type == 0 || this.typeMapParam.content.type == ''  ? -1:this.typeMapParam.content.dataid
+        this.typeMapParam.content.type = 1
+        this.typeMapParam.content.dataid = this.typeTableParam.content.depname[this.typeTableParam.content.depname.length-1]
       }
       let res = await this.$api.requested(this.typeMapParam)
       this.customerTypeData.map = res.data
@@ -1967,10 +1982,11 @@ export default {
     },
     //客户联系人图初始化
     async customerContactInit (init,state) {
-      if (state == '状态'){
-        this.personData('contactMapParamSalesman',this.contactMapParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('contactMapParamSalesman',this.contactMapParam.content.where.isleave,this.contactTableParam.content.depname[this.contactTableParam.content.depname.length-1])
         this.contactMapParam.content.username = ''
-        this.contactMapParam.content.dataid = this.contactMapParam.content.type == 0 || this.contactMapParam.content.type == ''  ? -1:this.contactMapParam.content.dataid
+        this.contactMapParam.content.type = 1
+        this.contactMapParam.content.dataid = this.contactTableParam.content.depname[this.contactTableParam.content.depname.length-1]?this.contactTableParam.content.depname[this.contactTableParam.content.depname.length-1]:-1
       }
       let res = await this.$api.requested(this.contactMapParam)
       this.customerContactData.map = res.data
@@ -2046,10 +2062,11 @@ export default {
     },
     //客户关联项目图初始化
     async customerProjectInit (init,state) {
-      if (state == '状态'){
-        this.personData('projectMapParamSalesman',this.projectMapParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('projectMapParamSalesman',this.projectMapParam.content.where.isleave,this.projectTableParam.content.depname[this.projectTableParam.content.depname.length -1])
         this.projectMapParam.content.username = ''
-        this.projectMapParam.content.dataid = this.projectMapParam.content.type == 0 || this.projectMapParam.content.type == ''  ? -1:this.projectMapParam.content.dataid
+        this.projectMapParam.content.type = 1
+        this.projectMapParam.content.dataid = this.projectTableParam.content.depname[this.projectTableParam.content.depname.length -1]?this.projectTableParam.content.depname[this.projectTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.projectMapParam)
       this.customerProjectData.map = res.data
@@ -2126,10 +2143,11 @@ export default {
     //客户跟进情况图初始化
     async customerFllowInit (init,state) {
       let param = JSON.parse(JSON.stringify(this.fllowMapParam))
-      if (state == '状态'){
-        this.personData('fllowMapParamSalesman',this.fllowMapParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('fllowMapParamSalesman',this.fllowMapParam.content.where.isleave,this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1])
         this.fllowMapParam.content.username = ''
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+        param.content.type = 1
+        param.content.dataid = this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1]?this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2207,10 +2225,11 @@ export default {
     },
     //客户未跟进情况图初始化
     async customerUnfllowInit (init,state) {
-      if (state == '状态'){
-        this.personData('unfllowMapParamSalesman',this.unfllowMapParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('unfllowMapParamSalesman',this.unfllowMapParam.content.where.isleave,this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1])
         this.unfllowMapParam.content.username = ''
-        this.unfllowMapParam.content.dataid = this.unfllowMapParam.content.type == 0 || this.unfllowMapParam.content.type == ''  ? -1:this.unfllowMapParam.content.dataid
+        this.unfllowMapParam.content.type = 1
+        this.unfllowMapParam.content.dataid = this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1]?this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1]:-1
       }
       this.unfllowMapParam.content.date = new Date().getTime()
       let res = await this.$api.requested(this.unfllowMapParam)
@@ -2271,10 +2290,11 @@ export default {
     //客户报价情况图初始化
     async chart3Fun (init,state) {
       let param = JSON.parse(JSON.stringify(this.projectParam))
-      if (state == '状态'){
-        this.personData('projectParamSalesman',this.projectParam.content.where.isleave)
+      if (state == '状态' || state == '部门'){
+        this.personData('projectParamSalesman',this.projectParam.content.where.isleave,this.projectParam.content.depname[this.projectParam.content.depname.length -1])
         this.projectParam.content.username = ''
-        param.content.dataid =param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+        param.content.type = -1
+        param.content.dataid =this.projectParam.content.depname[this.projectParam.content.depname.length -1]?this.projectParam.content.depname[this.projectParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2381,7 +2401,8 @@ export default {
     },
     selectDep (val) {
       this.person = ''
-      let id = val[val.length - 1]
+      let id = val[val.length - 1]?val[val.length - 1]:-1
+      this.personDataAll(id)
       if (val.length) {
         /*数据总览*/
         this.dataAllParam.content.dataid = id
@@ -2393,66 +2414,80 @@ export default {
         this.chartParam1.content.dataid = id
         this.chartParam1.content.type = 1
         this.chartParam1.content.username = ''
-        this.chartParam1.content.depname = ''
+        this.chartParam1.content.depname = val
         this.chart1Fun()
 
         this.chartParam2.content.dataid = id
         this.chartParam2.content.type = 1
         this.chartParam2.content.username = ''
+        this.chartParam2.content.depname = val
         this.chart2Fun()
 
         this.projectParam.content.dataid = id
         this.projectParam.content.type = 1
         this.projectParam.content.username = ''
+        this.projectParam.content.depname = val
         this.chart3Fun()
 
         this.typeMapParam.content.dataid = id
         this.typeMapParam.content.type = 1
-        this.customerTypeInit()
+
         this.typeTableParam.content.dataid = id
         this.typeTableParam.content.type = 1
         this.typeTableParam.content.username = ''
+        this.typeTableParam.content.depname = val
         this.$refs.customerTypeTable.listData()
+        this.customerTypeInit()
 
         this.gradMapParam.content.dataid = id
         this.gradMapParam.content.type = 1
-        this.customerGradInit()
+
         this.gradTableParam.content.dataid = id
         this.gradTableParam.content.type = 1
         this.gradTableParam.content.username = ''
+        this.gradTableParam.content.depname = val
+        this.customerGradInit()
 
 
         this.contactMapParam.content.dataid = id
         this.contactMapParam.content.type = 1
-        this.customerContactInit()
+
         this.contactTableParam.content.dataid = id
         this.contactTableParam.content.type = 1
         this.contactTableParam.content.username = ''
+        this.contactTableParam.content.depname = val
         this.$refs.customerContactTable.listData()
+        this.customerContactInit()
 
         this.projectMapParam.content.dataid = id
         this.projectMapParam.content.type = 1
-        this.customerProjectInit()
+
         this.projectTableParam.content.dataid = id
         this.projectTableParam.content.type = 1
         this.projectTableParam.content.username = ''
+        this.projectTableParam.content.depname = val
         this.$refs.customerProjectTable.listData()
+        this.customerProjectInit()
 
         this.fllowMapParam.content.dataid = id
         this.fllowMapParam.content.type = 1
-        this.customerFllowInit()
+
         this.fllowTableParam.content.dataid = id
         this.fllowTableParam.content.type = 1
         this.fllowTableParam.content.username = ''
+        this.fllowTableParam.content.depname = val
         this.$refs.customerFllowTable.listData()
+        this.customerFllowInit()
 
         this.unfllowMapParam.content.dataid = id
         this.unfllowMapParam.content.type = 1
-        this.customerUnfllowInit()
+
         this.unfllowTableParam.content.dataid = id
         this.unfllowTableParam.content.type = 1
         this.unfllowTableParam.content.username = ''
+        this.unfllowTableParam.content.depname = val
         this.$refs.customerUnfllowTable.listData()
+        this.customerUnfllowInit()
       } else {
 
         let name = JSON.parse(sessionStorage.getItem('accountinfo')).name
@@ -2530,74 +2565,83 @@ export default {
       }
     },
     selectPerson(id){
-      this.depment = ''
-      this.dataAllParam.content.dataid = id
-      this.dataAllParam.content.type = 0
+      let type = 0
+      let dataid = id
+      if (id || this.depment[this.depment.length - 1]){
+        type = id?0:1
+        dataid = id?id:this.depment[this.depment.length - 1]
+      }else {
+        type = 1
+        dataid = -1
+      }
+      this.dataAllParam.content.dataid = dataid
+      this.dataAllParam.content.type = type
+
       this.dataAllParam.content.username = this.person
       this.dataAllParam.content.dateType = this.dateType
       this.getdataAll()
 
-      this.chartParam1.content.dataid = id
-      this.chartParam1.content.type = 0
+      this.chartParam1.content.dataid = dataid
+      this.chartParam1.content.type = type
       this.chartParam1.content.username = this.person
       this.chartParam1.content.depname = ''
       this.chart1Fun()
 
-      this.chartParam2.content.dataid = id
-      this.chartParam2.content.type = 0
+      this.chartParam2.content.dataid = dataid
+      this.chartParam2.content.type = type
       this.chartParam2.content.username = this.person
       this.chart2Fun()
 
-      this.projectParam.content.dataid = id
-      this.projectParam.content.type = 0
+      this.projectParam.content.dataid = dataid
+      this.projectParam.content.type = type
       this.projectParam.content.username = this.person
       this.chart3Fun()
 
-      this.typeMapParam.content.dataid = id
-      this.typeMapParam.content.type = 0
+      this.typeMapParam.content.dataid = dataid
+      this.typeMapParam.content.type = type
       this.customerTypeInit()
-      this.typeTableParam.content.dataid = id
-      this.typeTableParam.content.type = 0
+      this.typeTableParam.content.dataid = dataid
+      this.typeTableParam.content.type = type
       this.typeTableParam.content.username = this.person
       this.$refs.customerTypeTable.listData()
 
-      this.gradMapParam.content.dataid = id
-      this.gradMapParam.content.type = 0
+      this.gradMapParam.content.dataid = dataid
+      this.gradMapParam.content.type = type
       this.customerGradInit()
-      this.gradTableParam.content.dataid = id
-      this.gradTableParam.content.type = 0
+      this.gradTableParam.content.dataid = dataid
+      this.gradTableParam.content.type = type
       this.gradTableParam.content.username = this.person
 
 
-      this.contactMapParam.content.dataid = id
-      this.contactMapParam.content.type = 0
+      this.contactMapParam.content.dataid = dataid
+      this.contactMapParam.content.type = type
       this.customerContactInit()
-      this.contactTableParam.content.dataid = id
-      this.contactTableParam.content.type = 0
+      this.contactTableParam.content.dataid = dataid
+      this.contactTableParam.content.type = type
       this.contactTableParam.content.username = this.person
       this.$refs.customerContactTable.listData()
 
-      this.projectMapParam.content.dataid = id
-      this.projectMapParam.content.type = 0
+      this.projectMapParam.content.dataid = dataid
+      this.projectMapParam.content.type = type
       this.customerProjectInit()
-      this.projectTableParam.content.dataid = id
-      this.projectTableParam.content.type = 0
+      this.projectTableParam.content.dataid = dataid
+      this.projectTableParam.content.type = type
       this.projectTableParam.content.username = this.person
       this.$refs.customerProjectTable.listData()
 
-      this.fllowMapParam.content.dataid = id
-      this.fllowMapParam.content.type = 0
+      this.fllowMapParam.content.dataid = dataid
+      this.fllowMapParam.content.type = type
       this.customerFllowInit()
-      this.fllowTableParam.content.dataid = id
-      this.fllowTableParam.content.type = 0
+      this.fllowTableParam.content.dataid = dataid
+      this.fllowTableParam.content.type = type
       this.fllowTableParam.content.username = this.person
       this.$refs.customerFllowTable.listData()
 
-      this.unfllowMapParam.content.dataid = id
-      this.unfllowMapParam.content.type = 0
+      this.unfllowMapParam.content.dataid = dataid
+      this.unfllowMapParam.content.type = type
       this.customerUnfllowInit()
-      this.unfllowTableParam.content.dataid = id
-      this.unfllowTableParam.content.type = 0
+      this.unfllowTableParam.content.dataid = dataid
+      this.unfllowTableParam.content.type = type
       this.unfllowTableParam.content.username = this.person
       this.$refs.customerUnfllowTable.listData()
     },
@@ -2606,85 +2650,101 @@ export default {
       this.dataAllParam.content.where.isleave = this.isleave
       this.dataAllParam.content.dateType = this.dateType
       this.person = ''
-      this.dataAllParam.content.dataid = this.dataAllParam.content.type == 0?-1:this.dataAllParam.content.dataid
+      this.dataAllParam.content.type = 1
+      this.dataAllParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.getdataAll()
 
       this.chartParam1.content.where.isleave = this.isleave
       this.chartParam1.content.username = ''
-      this.chartParam1.content.dataid = this.chartParam1.content.type == 0?-1:this.chartParam1.content.dataid
+      this.chartParam1.content.type = 1
+      this.chartParam1.content.dataid =this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.chart1Fun()
 
       this.chartParam2.content.where.isleave = this.isleave
       this.chartParam2.content.username = ''
-      this.chartParam2.content.dataid = this.chartParam2.content.type == 0?-1:this.chartParam2.content.dataid
+      this.chartParam2.content.type = 1
+      this.chartParam2.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.chart2Fun()
 
       this.projectParam.content.where.isleave = this.isleave
       this.projectParam.content.username = ''
-      this.projectParam.content.dataid = this.projectParam.content.type == 0?-1:this.projectParam.content.dataid
+      this.projectParam.content.type = 1
+      this.projectParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.chart3Fun()
 
       this.typeTableParam.content.where.isleave = this.isleave
       this.typeTableParam.content.username = ''
-      this.typeTableParam.content.dataid = this.typeTableParam.content.type == 0?-1:this.typeTableParam.content.dataid
+      this.typeTableParam.content.type = 1
+      this.typeTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerTypeTable.listData()
 
 
       this.typeMapParam.content.where.isleave = this.isleave
       this.typeMapParam.content.username = ''
-      this.typeMapParam.content.dataid = this.typeMapParam.content.type == 0?-1:this.typeMapParam.content.dataid
+      this.typeMapParam.content.type = 1
+      this.typeMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerTypeInit()
 
       this.gradMapParam.content.where.isleave = this.isleave
       this.gradMapParam.content.username = ''
-      this.gradMapParam.content.dataid = this.gradMapParam.content.type == 0?-1:this.gradMapParam.content.dataid
+      this.gradMapParam.content.type = 1
+      this.gradMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerGradInit()
 
       this.gradTableParam.content.where.isleave = this.isleave
       this.gradTableParam.content.username = ''
-      this.gradTableParam.content.dataid = this.gradTableParam.content.type == 0?-1:this.gradTableParam.content.dataid
+      this.gradTableParam.content.type = 1
+      this.gradTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
 
       this.contactMapParam.content.where.isleave = this.isleave
       this.contactMapParam.content.username = ''
-      this.contactMapParam.content.dataid = this.contactMapParam.content.type == 0?-1:this.contactMapParam.content.dataid
+      this.contactMapParam.content.type = 1
+      this.contactMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerContactInit()
 
       this.contactTableParam.content.where.isleave = this.isleave
       this.contactTableParam.content.username = ''
-      this.contactTableParam.content.dataid = this.contactTableParam.content.type == 0?-1:this.contactTableParam.content.dataid
+      this.contactTableParam.content.type = 1
+      this.contactTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerContactTable.listData()
 
       this.projectMapParam.content.where.isleave = this.isleave
       this.projectMapParam.content.username = ''
-      this.projectMapParam.content.dataid = this.projectMapParam.content.type == 0?-1:this.projectMapParam.content.dataid
+      this.projectMapParam.content.type = 1
+      this.projectMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerProjectInit()
 
       this.projectTableParam.content.where.isleave = this.isleave
       this.projectTableParam.content.username = ''
-      this.projectTableParam.content.dataid = this.projectTableParam.content.type == 0?-1:this.projectTableParam.content.dataid
+      this.projectTableParam.content.type = 1
+      this.projectTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerProjectTable.listData()
 
       this.fllowMapParam.content.where.isleave = this.isleave
       this.fllowMapParam.content.username = ''
-      this.fllowMapParam.content.dataid = this.fllowMapParam.content.type == 0?-1:this.fllowMapParam.content.dataid
+      this.fllowMapParam.content.type = 1
+      this.fllowMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerFllowInit()
 
       this.fllowTableParam.content.where.isleave = this.isleave
       this.fllowTableParam.content.username = ''
-      this.fllowTableParam.content.dataid = this.fllowTableParam.content.type == 0?-1:this.fllowTableParam.content.dataid
+      this.fllowTableParam.content.type = 1
+      this.fllowTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerFllowTable.listData()
 
       this.unfllowMapParam.content.where.isleave = this.isleave
       this.unfllowMapParam.content.username = ''
-      this.unfllowMapParam.content.dataid = this.unfllowMapParam.content.type == 0?-1:this.unfllowMapParam.content.dataid
+      this.unfllowMapParam.content.type = 1
+      this.unfllowMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerUnfllowInit()
 
       this.unfllowTableParam.content.where.isleave = this.isleave
       this.unfllowTableParam.content.username = ''
-      this.unfllowTableParam.content.dataid = this.unfllowTableParam.content.type == 0?-1:this.unfllowTableParam.content.dataid
+      this.unfllowTableParam.content.type = 1
+      this.unfllowTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerUnfllowTable.listData()
 
-      this.personDataAll()
+      this.personDataAll(this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1)
     },
     async getCustomerType () {
       const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
@@ -2708,11 +2768,12 @@ export default {
       })
     },
     /*获取新的业务员列表*/
-    async personDataAll(){
+    async personDataAll(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.isleave
+          isleave:this.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)
@@ -2729,11 +2790,12 @@ export default {
 
     },
     /*获取新的业务员列表*/
-    async personData(keyName,isleave){
+    async personData(keyName,isleave,depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:isleave
+          isleave:isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 3 - 2
src/HDrpManagement/projectData/components/pageTable.vue

@@ -67,8 +67,9 @@ export default {
     async listData(init,state){
       if(init) this.$emit('handleParam',this.param)
       let param = JSON.parse(JSON.stringify(this.param))
-      if (state == '状态'){
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        param.content.type = 1
+        param.content.dataid = param.content.depname[param.content.depname.length -1]?param.content.depname[param.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]

+ 228 - 152
src/HDrpManagement/projectData/index.vue

@@ -180,17 +180,19 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="typeTableParam.content.dataid"
+                        v-model="typeTableParam.content.depname"
                         :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.username='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()}}">
+                        @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.username='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData(null,'部门');typeInit(null,'部门')} else
+                        {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData(null,'部门');typeInit(null,'部门')}}">
                       </el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="typeTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()}}"
+                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()} else
+                      {typeMapParam.content.type=1;typeMapParam.content.dataid=typeTableParam.content.depname[typeTableParam.content.depname.length -1];typeTableParam.content.dataid=typeTableParam.content.depname[typeTableParam.content.depname.length -1];typeTableParam.content.type=1;typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()}}"
                     >
                         <el-option
                             v-for="item in typeMapParamSalesman"
@@ -333,16 +335,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="gradTableParam.content.dataid"
+                        v-model="gradTableParam.content.depname"
                         :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.username='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$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='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData(null,'部门');gradInit(null,'部门')} else
+                        {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData(null,'部门');gradInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="gradTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()}}"
+                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()} else
+                      {gradMapParam.content.type=1;gradMapParam.content.dataid=gradTableParam.content.depname[gradTableParam.content.depname.length -1];gradTableParam.content.dataid=gradTableParam.content.depname[gradTableParam.content.depname.length -1];gradTableParam.content.type=1;gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()}}"
                       >
                         <el-option
                             v-for="item in gradMapParamSalesman"
@@ -494,15 +498,17 @@
                       placement="bottom"
                       :append-to-body="false"
                       size="small"
-                      v-model="scoreTableParam1.content.dataid"
+                      v-model="scoreTableParam1.content.depname"
                       :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.username='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';scoreTableParam1.content.pageNumber = 1;$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='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData(null,'部门');scoreInit(null,'部门')} else
+                      {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData(null,'部门');scoreInit(null,'部门')}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >{{$t('业务员')}}:</label>
                     <el-select v-model="scoreTableParam1.content.username" filterable :placeholder="$t('请选择')" size="small"
-                    @change="$event => {if($event) {scoreMapParam1.content.type=0;scoreMapParam1.content.dataid=$event;scoreTableParam1.content.type=0;scoreTableParam1.content.dataid=$event;scoreTableParam1.content.depname='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';gradMapParam.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.depname='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()}}"
+                    @change="$event => {if($event) {scoreMapParam1.content.type=0;scoreMapParam1.content.dataid=$event;scoreTableParam1.content.type=0;scoreTableParam1.content.dataid=$event;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()} else
+                    {scoreMapParam1.content.type=1;gradMapParam.content.dataid=scoreTableParam1.content.depname[scoreTableParam1.content.depname.length -1];scoreTableParam1.content.dataid=scoreTableParam1.content.depname[scoreTableParam1.content.depname.length -1];scoreTableParam1.content.type=1;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()}}"
                     >
                       <el-option
                           v-for="item in scoreMapParam1Salesman"
@@ -625,16 +631,16 @@
                         size="small"
                         :append-to-body="false"
                         placement="bottom"
-                        v-model="addParam.content.dataid"
+                        v-model="addParam.content.depname"
                         :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.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(null,'部门')} else {addParam.content.dataid='';addParam.content.type='';addParam.content.username='';addFun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="addParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {addParam.content.type=0;addParam.content.dataid=$event;addParam.content.depname='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.depname='';addFun()}}"
+                        @change="$event => {if($event) {addParam.content.type=0;addParam.content.dataid=$event;addFun()} else {addParam.content.dataid=addParam.content.depname[addParam.content.depname.length -1];addParam.content.type=1;addFun()}}"
                         >
                         <el-option
                             v-for="item in addParamSalesman"
@@ -685,16 +691,16 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="baobeiParam.content.dataid"
+                        v-model="baobeiParam.content.depname"
                         :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.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(null,'部门')} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.username='';baobeiFun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="baobeiParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {baobeiParam.content.type=0;baobeiParam.content.dataid=$event;baobeiParam.content.depname='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.depname='';baobeiFun()}}"
+                        @change="$event => {if($event) {baobeiParam.content.type=0;baobeiParam.content.dataid=$event;baobeiFun()} else {baobeiParam.content.dataid=baobeiParam.content.depname[baobeiParam.content.depname.length -1];baobeiParam.content.type=1;baobeiFun()}}"
                         >
                         <el-option
                             v-for="item in baobeiParamSalesman"
@@ -745,16 +751,16 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="baojiaParam.content.dataid"
+                        v-model="baojiaParam.content.depname"
                         :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.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(null,'部门')} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.username='';baojiaFun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="baojiaParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {baojiaParam.content.type=0;baojiaParam.content.dataid=$event;baojiaParam.content.depname='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.depname='';baojiaFun()}}"
+                        @change="$event => {if($event) {baojiaParam.content.type=0;baojiaParam.content.dataid=$event;baojiaFun()} else {baojiaParam.content.dataid=baojiaParam.content.depname[baojiaParam.content.depname.length -1];baojiaParam.content.type=1;baojiaParam.content.depname='';baojiaFun()}}"
                         >
                         <el-option
                             v-for="item in baojiaParamSalesman"
@@ -805,16 +811,16 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="fllowParam.content.dataid"
+                        v-model="fllowParam.content.depname"
                         :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.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(null,'部门')} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.username='';fllowFun(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="fllowParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {fllowParam.content.type=0;fllowParam.content.dataid=$event;fllowParam.content.depname='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.depname='';fllowFun()}}"
+                        @change="$event => {if($event) {fllowParam.content.type=0;fllowParam.content.dataid=$event;fllowFun()} else {fllowParam.content.dataid=fllowParam.content.depname[fllowParam.content.depname.length -1];fllowParam.content.type=1;fllowFun()}}"
                         >
                         <el-option
                             v-for="item in fllowParamSalesman"
@@ -865,18 +871,19 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="fllowTableParam.content.dataid"
+                        v-model="fllowTableParam.content.depname"
                         :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.username='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';fllowTableParam.content.pageNumber = 1;$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='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData(null,'部门');fllowInit(null,'部门')} else
+                        {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData(null,'部门');fllowInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="fllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';
-                        fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';
-                        fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()}}"
+                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;
+                        fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type=1;fllowMapParam.content.dataid=fllowTableParam.content.depname[fllowTableParam.content.depname.length -1];fllowTableParam.content.dataid=fllowTableParam.content.depname[fllowTableParam.content.depname.length -1];fllowTableParam.content.type=1;
+                        fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()}}"
                       >
                         <el-option
                             v-for="item in fllowMapParamSalesman"
@@ -1017,16 +1024,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="contactTableParam.content.dataid"
+                        v-model="contactTableParam.content.depname"
                         :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.username='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';contactTableParam.content.pageNumber = 1;$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='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData(null,'部门');contactInit(null,'部门')} else
+                        {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData(null,'部门');contactInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="contactTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()}}"
+                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()} else
+                      {contactMapParam.content.type=1;contactMapParam.content.dataid=contactTableParam.content.depname[contactTableParam.content.depname.length -1];contactTableParam.content.dataid=contactTableParam.content.depname[contactTableParam.content.depname.length -1];contactTableParam.content.type=1;contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()}}"
                       >
                         <el-option
                             v-for="item in contactMapParamSalesman"
@@ -1167,16 +1176,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="customerTableParam.content.dataid"
+                        v-model="customerTableParam.content.depname"
                         :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.username='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';customerTableParam.content.pageNumber = 1;$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='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData(null,'部门');customerInit(null,'部门')} else
+                        {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData(null,'部门');customerInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="customerTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {customerMapParam.content.type=0;customerMapParam.content.dataid=$event;customerTableParam.content.type=0;customerTableParam.content.dataid=$event;customerTableParam.content.depname='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.depname='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()}}"
+                      @change="$event => {if($event) {customerMapParam.content.type=0;customerMapParam.content.dataid=$event;customerTableParam.content.type=0;customerTableParam.content.dataid=$event;customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()} else
+                      {customerMapParam.content.type=1;customerMapParam.content.dataid=customerTableParam.content.depname[customerTableParam.content.depname.length -1];customerTableParam.content.dataid=customerTableParam.content.depname[customerTableParam.content.depname.length -1];customerTableParam.content.type=1;customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()}}"
                       >
                         <el-option
                             v-for="item in customerMapParamSalesman"
@@ -1317,16 +1328,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="scoreTableParam.content.dataid"
+                        v-model="scoreTableParam.content.depname"
                         :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.username='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';scoreTableParam.content.pageNumber = 1;$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='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData(null,'部门');projectScoreInit(null,'部门')} else
+                        {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData(null,'部门');projectScoreInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="scoreTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {scoreMapParam.content.type=0;scoreMapParam.content.dataid=$event;scoreTableParam.content.type=0;scoreTableParam.content.dataid=$event;scoreTableParam.content.depname='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.depname='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()}}"
+                      @change="$event => {if($event) {scoreMapParam.content.type=0;scoreMapParam.content.dataid=$event;scoreTableParam.content.type=0;scoreTableParam.content.dataid=$event;scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()} else
+                      {scoreMapParam.content.type=1;scoreMapParam.content.dataid=scoreTableParam.content.depname[scoreTableParam.content.depname.length -1];scoreTableParam.content.dataid=scoreTableParam.content.depname[scoreTableParam.content.depname.length -1];scoreTableParam.content.type=1;scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()}}"
                       >
                         <el-option
                             v-for="item in scoreMapParamSalesman"
@@ -1466,16 +1479,18 @@
                         placement="bottom"
                         ref="selectdep"
                         size="small"
-                        v-model="unfllowTableParam.content.dataid"
+                        v-model="unfllowTableParam.content.depname"
                         :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.username='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';unfllowTableParam.content.pageNumber = 1;$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='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData(null,'部门');customerUnfllowInit(null,'部门')} else
+                        {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData(null,'部门');customerUnfllowInit(null,'部门')}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >{{$t('业务员')}}:</label>
                       <el-select v-model="unfllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
+                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else
+                      {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=unfllowTableParam.content.depname[unfllowTableParam.content.depname.length -1];unfllowTableParam.content.dataid=unfllowTableParam.content.depname[unfllowTableParam.content.depname.length -1];unfllowTableParam.content.type=1;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
                       >
                         <el-option
                             v-for="item in unfllowMapParamSalesman"
@@ -1638,16 +1653,16 @@
                       ref="selectdep"
                       size="small"
                       placement="bottom"
-                      v-model="dateParam.content.dataid"
+                      v-model="dateParam.content.depname"
                       :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.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(null,'部门')} else {dateParam.content.dataid='';dateParam.content.type='';dateParam.content.username='';getDate(null,'部门')}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >{{$t('业务员')}}:</label>
                     <el-select v-model="dateParam.content.username" filterable :placeholder="$t('请选择')" size="small"
                                :popper-append-to-body="false"
-                               @change="$event => {if($event) {dateParam.content.type=0;dateParam.content.dataid=$event;dateParam.content.depname='';getDate()} else {dateParam.content.type='';dateParam.content.dataid='';dateParam.content.depname='';getDate()}}"
+                               @change="$event => {if($event) {dateParam.content.type=0;dateParam.content.dataid=$event;getDate()} else {dateParam.content.type=1;dateParam.content.dataid=dateParam.content.depname[dateParam.content.depname.length -1];getDate()}}"
                     >
                       <el-option
                           v-for="item in dateParamSalesman"
@@ -1804,7 +1819,7 @@
             </div>
             <div class="mt-10 inline-16">
               <label  class="search__label">{{$t('项目状态')}}:</label>
-              <el-select class="inline-24" v-model="paramDetail.content.where.status" placeholder="请选择项目状态" @change="selectChange" size="small" clearable>
+              <el-select class="inline-24" v-model="paramDetail.content.where.status" :placeholder="$t(`请选择项目状态`)" @change="selectChange" size="small" clearable>
                 <el-option
                     v-for="item in option.statusTab"
                     :key="item.value"
@@ -2286,6 +2301,7 @@ export default {
           "type": "",
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "depname":"",
           "begnode":"",//开始节点
           "endnode":"",//结束节点
           "where": {
@@ -2467,9 +2483,10 @@ export default {
     },
     //项目类型图初始化
     async typeInit (init,state) {
-      if (state == '状态'){
-        this.personData('typeMapParamSalesman',this.typeMapParam.content.where.isleave)
-        this.typeMapParam.content.dataid = this.typeMapParam.content.type == 0 || this.typeMapParam.content.type == ''  ? -1:this.typeMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('typeMapParamSalesman',this.typeMapParam.content.where.isleave,this.typeTableParam.content.depname[this.typeTableParam.content.depname.length -1])
+        this.typeMapParam.content.type = 1
+        this.typeMapParam.content.dataid = this.typeTableParam.content.depname[this.typeTableParam.content.depname.length -1]?this.typeTableParam.content.depname[this.typeTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.typeMapParam)
       this.typeData.map = res.data
@@ -2552,9 +2569,10 @@ export default {
     },
     //项目等级图初始化
     async gradInit (init,state) {
-      if (state == '状态'){
-        this.personData('gradMapParamSalesman',this.gradMapParam.content.where.isleave)
-        this.gradMapParam.content.dataid = this.gradMapParam.content.type == 0 || this.gradMapParam.content.type == ''  ? -1:this.gradMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('gradMapParamSalesman',this.gradMapParam.content.where.isleave,this.gradTableParam.content.depname[this.gradTableParam.content.depname.length -1])
+        this.gradMapParam.content.type = 1
+        this.gradMapParam.content.dataid = this.gradTableParam.content.depname[this.gradTableParam.content.depname.length -1]?this.gradTableParam.content.depname[this.gradTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.gradMapParam)
       this.gradData.map = res.data
@@ -2631,9 +2649,10 @@ export default {
     },
     //项目评估图初始化
     async scoreInit (init,state) {
-      if (state == '状态'){
-        this.personData('scoreMapParam1Salesman',this.scoreMapParam1.content.where.isleave)
-        this.scoreMapParam1.content.dataid = this.scoreMapParam1.content.type == 0 || this.scoreMapParam1.content.type == ''  ? -1:this.scoreMapParam1.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('scoreMapParam1Salesman',this.scoreMapParam1.content.where.isleave,this.scoreTableParam1.content.depname[this.scoreTableParam1.content.depname.length -1])
+        this.scoreMapParam1.content.type = 1
+        this.scoreMapParam1.content.dataid = this.scoreTableParam1.content.depname[this.scoreTableParam1.content.depname.length -1]?this.scoreTableParam1.content.depname[this.scoreTableParam1.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.scoreMapParam1)
       this.scoreData.map = res.data
@@ -2684,9 +2703,10 @@ export default {
     //12月新增初始化
     async addFun (init,state) {
       let param = JSON.parse(JSON.stringify(this.addParam))
-      if (state == '状态'){
-        this.personData('addParamSalesman',this.addParam.content.where.isleave)
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('addParamSalesman',this.addParam.content.where.isleave,this.addParam.content.depname[this.addParam.content.depname.length -1])
+        param.content.type = 1
+        param.content.dataid = this.addParam.content.depname[this.addParam.content.depname.length -1]?this.addParam.content.depname[this.addParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2771,9 +2791,10 @@ export default {
     //12月报备初始化
     async baobeiFun (init,state) {
       let param = JSON.parse(JSON.stringify(this.baobeiParam))
-      if (state == '状态'){
-        this.personData('baobeiParamSalesman',this.baobeiParam.content.where.isleave)
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('baobeiParamSalesman',this.baobeiParam.content.where.isleave,this.baobeiParam.content.depname[this.baobeiParam.content.depname.length -1])
+        param.content.type = 1
+        param.content.dataid = this.baobeiParam.content.depname[this.baobeiParam.content.depname.length -1]?this.baobeiParam.content.depname[this.baobeiParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2858,9 +2879,10 @@ export default {
     //12月跟进初始化
     async fllowFun (init,state) {
       let param = JSON.parse(JSON.stringify(this.fllowParam))
-      if (state == '状态'){
-        this.personData('fllowParamSalesman',this.fllowParam.content.where.isleave)
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('fllowParamSalesman',this.fllowParam.content.where.isleave,this.fllowParam.content.depname[this.fllowParam.content.depname.length -1])
+        param.content.type = 1
+        param.content.dataid = fllowParam.content.depname[fllowParam.content.depname.length -1]?fllowParam.content.depname[fllowParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2941,9 +2963,10 @@ export default {
     //12月报价初始化
     async baojiaFun (init,state) {
       let param = JSON.parse(JSON.stringify(this.baojiaParam))
-      if (state == '状态'){
-        this.personData('baojiaParamSalesman',this.baojiaParam.content.where.isleave)
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('baojiaParamSalesman',this.baojiaParam.content.where.isleave,this.baojiaParam.content.depname[this.baojiaParam.content.depname.length -1])
+        param.content.type = 1
+        param.content.dataid = this.baojiaParam.content.depname[this.baojiaParam.content.depname.length -1]?this.baojiaParam.content.depname[this.baojiaParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -2984,9 +3007,10 @@ export default {
     },
     //项目跟进图初始化
     async fllowInit (init,state) {
-      if (state == '状态'){
-        this.personData('fllowMapParamSalesman',this.fllowMapParam.content.where.isleave)
-        this.fllowMapParam.content.dataid = this.fllowMapParam.content.type == 0 || this.fllowMapParam.content.type == ''  ? -1:this.fllowMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('fllowMapParamSalesman',this.fllowMapParam.content.where.isleave,this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1])
+        this.fllowMapParam.content.type = 1
+        this.fllowMapParam.content.dataid = this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1]?this.fllowTableParam.content.depname[this.fllowTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.fllowMapParam)
       this.projectFllowData.map = res.data
@@ -3061,9 +3085,10 @@ export default {
     },
     //项目联系人图初始化
     async contactInit (init,state) {
-      if (state == '状态'){
-        this.personData('contactMapParamSalesman',this.contactMapParam.content.where.isleave)
-        this.contactMapParam.content.dataid = this.contactMapParam.content.type == 0 || this.contactMapParam.content.type == ''  ? -1:this.contactMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('contactMapParamSalesman',this.contactMapParam.content.where.isleave,this.contactTableParam.content.depname[this.contactTableParam.content.depname.length -1])
+        this.contactMapParam.content.type = 1
+        this.contactMapParam.content.dataid = this.contactTableParam.content.depname[this.contactTableParam.content.depname.length -1]?this.contactTableParam.content.depname[this.contactTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.contactMapParam)
       this.projectContactData.map = res.data
@@ -3139,9 +3164,10 @@ export default {
     },
     //项目关联客户图初始化
     async customerInit (init,state) {
-      if (state == '状态'){
-        this.personData('customerMapParamSalesman',this.customerMapParam.content.where.isleave)
-        this.customerMapParam.content.dataid = this.customerMapParam.content.type == 0 || this.customerMapParam.content.type == ''  ? -1:this.customerMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('customerMapParamSalesman',this.customerMapParam.content.where.isleave,this.customerTableParam.content.depname[this.customerTableParam.content.depname.length -1])
+        this.customerMapParam.content.type = 1
+        this.customerMapParam.content.dataid = this.customerTableParam.content.depname[this.customerTableParam.content.depname.length -1]?this.customerTableParam.content.depname[this.customerTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.customerMapParam)
       this.projectCustomerData.map = res.data
@@ -3217,9 +3243,10 @@ export default {
     },
     //项目评估图初始化
     async projectScoreInit (init,state) {
-      if (state == '状态'){
-        this.personData('scoreMapParamSalesman',this.scoreMapParam.content.where.isleave)
-        this.scoreMapParam.content.dataid = this.scoreMapParam.content.type == 0 || this.scoreMapParam.content.type == ''  ? -1:this.scoreMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('scoreMapParamSalesman',this.scoreMapParam.content.where.isleave,this.scoreTableParam.content.depname[this.scoreTableParam.content.depname.length -1])
+        this.scoreMapParam.content.type = 1
+        this.scoreMapParam.content.dataid = this.scoreTableParam.content.depname[this.scoreTableParam.content.depname.length -1]?this.scoreTableParam.content.depname[this.scoreTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.scoreMapParam)
       this.projectScoreData.map = res.data
@@ -3295,10 +3322,12 @@ export default {
     },
     async getDate (init,state) {
       if(init === true) this.dateParam.content.where.projecttype = this.projectType.length ? this.projectType[0].value : ''
+
       let param = JSON.parse(JSON.stringify(this.dateParam))
-      if (state == '状态'){
-        this.personData('dateParamSalesman',this.dateParam.content.where.isleave)
-        param.content.dataid = param.content.type == 0 || param.content.type == ''  ? -1:param.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('dateParamSalesman',this.dateParam.content.where.isleave,this.dateParam.content.depname[this.dateParam.content.depname.length -1])
+        param.content.type = 1
+        param.content.dataid = this.dateParam.content.depname[this.dateParam.content.depname.length -1]?this.dateParam.content.depname[this.dateParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -3309,9 +3338,10 @@ export default {
     },
     //项目未跟进情况图初始化
     async customerUnfllowInit (init,state) {
-      if (state == '状态'){
-        this.personData('unfllowMapParamSalesman',this.unfllowMapParam.content.where.isleave)
-        this.unfllowMapParam.content.dataid = this.unfllowMapParam.content.type == 0 || this.unfllowMapParam.content.type == ''  ? -1:this.unfllowMapParam.content.dataid
+      if (state == '状态' || state == '部门'){
+        this.personData('unfllowMapParamSalesman',this.unfllowMapParam.content.where.isleave,this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1])
+        this.unfllowMapParam.content.type = 1
+        this.unfllowMapParam.content.dataid = this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1]?this.unfllowTableParam.content.depname[this.unfllowTableParam.content.depname.length -1]:-1
       }
       let res = await this.$api.requested(this.unfllowMapParam)
       this.customerUnfllowData.map = res.data
@@ -3449,6 +3479,7 @@ export default {
     selectDep (val) {
       this.person = ''
       let id = val[val.length - 1]
+      this.personDataAll(id)
       if (val.length) {
         /*数据总览*/
         this.dataAllParam.content.dataid = id
@@ -3464,6 +3495,7 @@ export default {
         this.typeTableParam.content.dataid = id
         this.typeTableParam.content.type = 1
         this.typeTableParam.content.username = ''
+        this.typeTableParam.content.depname = val
         this.$refs.typeTable.listData()
 
         /*项目等级分析*/
@@ -3473,6 +3505,7 @@ export default {
         this.gradTableParam.content.dataid = id
         this.gradTableParam.content.type = 1
         this.gradTableParam.content.username = ''
+        this.gradTableParam.content.depname = val
         this.$refs.gradTable.listData()
 
         /*项目评估分析*/
@@ -3482,30 +3515,35 @@ export default {
         this.scoreTableParam1.content.dataid = id
         this.scoreTableParam1.content.type = 1
         this.scoreTableParam1.content.username = ''
+        this.scoreTableParam1.content.depname = val
         this.$refs.scoreTable.listData()
 
         /*近12月项目新增分析*/
         this.addParam.content.dataid = id
         this.addParam.content.type = 1
         this.addParam.content.username = ''
+        this.addParam.content.depname = val
         this.addFun()
 
         /*近12月项目报备分析*/
         this.baobeiParam.content.dataid = id
         this.baobeiParam.content.type = 1
         this.baobeiParam.content.username = ''
+        this.baobeiParam.content.depname = val
         this.baobeiFun()
 
         /*近12月项目跟进分析*/
         this.fllowParam.content.dataid = id
         this.fllowParam.content.type = 1
         this.fllowParam.content.username = ''
+        this.fllowParam.content.depname = val
         this.fllowFun()
 
         /*近12月项目报价分析*/
         this.baojiaParam.content.dataid = id
         this.baojiaParam.content.type = 1
         this.baojiaParam.content.username = ''
+        this.baojiaParam.content.depname = val
         this.baojiaFun()
 
         /*项目跟进情况统计*/
@@ -3516,6 +3554,7 @@ export default {
         this.fllowTableParam.content.dataid = id
         this.fllowTableParam.content.type = 1
         this.fllowTableParam.content.username = ''
+        this.fllowTableParam.content.depname = val
         this.fllowTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectFllowTable.listData()
 
@@ -3527,6 +3566,7 @@ export default {
         this.contactTableParam.content.dataid = id
         this.contactTableParam.content.type = 1
         this.contactTableParam.content.username = ''
+        this.contactTableParam.content.depname = val
         this.contactTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectContactTable.listData()
 
@@ -3538,6 +3578,7 @@ export default {
         this.customerTableParam.content.dataid = id
         this.customerTableParam.content.type = 1
         this.customerTableParam.content.username = ''
+        this.customerTableParam.content.depname = val
         this.customerTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.projectCustomerTable.listData()
 
@@ -3548,6 +3589,7 @@ export default {
         this.scoreTableParam.content.dataid = id
         this.scoreTableParam.content.type = 1
         this.scoreTableParam.content.username = ''
+        this.scoreTableParam.content.depname = val
         this.$refs.projectScoreTable.listData()
 
         /*有效项目未跟进天数分析*/
@@ -3558,6 +3600,7 @@ export default {
         this.unfllowTableParam.content.dataid = id
         this.unfllowTableParam.content.type = 1
         this.unfllowTableParam.content.username = ''
+        this.unfllowTableParam.content.depname = val
         this.unfllowTableParam.content.where.status = this.siteid == 'HY' || this.siteid == 'YOSTEST1' ? ['跟进中'] : []
         this.$refs.customerUnfllowTable.listData()
 
@@ -3565,6 +3608,7 @@ export default {
         this.dateParam.content.dataid = id
         this.dateParam.content.type = 1
         this.dateParam.content.username = ''
+        this.dateParam.content.depname = val
         this.getDate()
 
       } else {
@@ -3680,113 +3724,121 @@ export default {
       }
     },
     selectPerson(id){
-      this.depment = ''
+      let type = 0
+      let dataid = id
+      if (id || this.depment[this.depment.length - 1]){
+        type = id?0:1
+        dataid = id?id:this.depment[this.depment.length - 1]
+      }else {
+        type = 1
+        dataid = -1
+      }
       /*数据总览*/
-      this.dataAllParam.content.dataid = id
-      this.dataAllParam.content.type = 0
+      this.dataAllParam.content.dataid = dataid
+      this.dataAllParam.content.type = type
       this.dataAllParam.content.username = this.person
       this.dataAllParam.content.dateType = this.dateType
       this.getdataAll()
 
       /*项目类型分析*/
-      this.typeMapParam.content.dataid = id
-      this.typeMapParam.content.type = 0
+      this.typeMapParam.content.dataid = dataid
+      this.typeMapParam.content.type = type
       this.typeInit()
-      this.typeTableParam.content.dataid = id
-      this.typeTableParam.content.type = 0
+      this.typeTableParam.content.dataid = dataid
+      this.typeTableParam.content.type = type
       this.typeTableParam.content.username = this.person
       this.$refs.typeTable.listData()
 
       /*项目等级分析*/
-      this.gradMapParam.content.dataid = id
-      this.gradMapParam.content.type = 0
+      this.gradMapParam.content.dataid = dataid
+      this.gradMapParam.content.type = type
       this.gradInit()
-      this.gradTableParam.content.dataid = id
-      this.gradTableParam.content.type = 0
+      this.gradTableParam.content.dataid = dataid
+      this.gradTableParam.content.type = type
       this.gradTableParam.content.username = this.person
       this.$refs.gradTable.listData()
 
       /*项目评估分析*/
-      this.scoreMapParam1.content.dataid = id
-      this.scoreMapParam1.content.type = 0
+      this.scoreMapParam1.content.dataid = dataid
+      this.scoreMapParam1.content.type = type
       this.scoreInit()
-      this.scoreTableParam1.content.dataid = id
-      this.scoreTableParam1.content.type = 0
+      this.scoreTableParam1.content.dataid = dataid
+      this.scoreTableParam1.content.type = type
       this.scoreTableParam1.content.username = this.person
       this.$refs.scoreTable.listData()
 
       /*近12月项目新增分析*/
-      this.addParam.content.dataid = id
-      this.addParam.content.type = 0
+      this.addParam.content.dataid = dataid
+      this.addParam.content.type = type
       this.addParam.content.username = this.person
       this.addFun()
 
       /*近12月项目报备分析*/
-      this.baobeiParam.content.dataid = id
-      this.baobeiParam.content.type = 0
+      this.baobeiParam.content.dataid = dataid
+      this.baobeiParam.content.type = type
       this.baobeiParam.content.username = this.person
       this.baobeiFun()
 
       /*近12月项目跟进分析*/
-      this.fllowParam.content.dataid = id
-      this.fllowParam.content.type = 0
+      this.fllowParam.content.dataid = dataid
+      this.fllowParam.content.type = type
       this.fllowParam.content.username = this.person
       this.fllowFun()
 
       /*近12月项目报价分析*/
-      this.baojiaParam.content.dataid = id
-      this.baojiaParam.content.type = 0
+      this.baojiaParam.content.dataid = dataid
+      this.baojiaParam.content.type = type
       this.baojiaParam.content.username = this.person
       this.baojiaFun()
 
       /*近12月项目跟进分析*/
-      this.fllowMapParam.content.dataid = id
-      this.fllowMapParam.content.type = 0
+      this.fllowMapParam.content.dataid = dataid
+      this.fllowMapParam.content.type = type
       this.fllowInit()
-      this.fllowTableParam.content.dataid = id
-      this.fllowTableParam.content.type = 0
+      this.fllowTableParam.content.dataid = dataid
+      this.fllowTableParam.content.type = type
       this.fllowTableParam.content.username = this.person
       this.$refs.projectFllowTable.listData()
 
       /*项目联系人情况统计*/
-      this.contactMapParam.content.dataid = id
-      this.contactMapParam.content.type = 0
+      this.contactMapParam.content.dataid = dataid
+      this.contactMapParam.content.type = type
       this.contactInit()
-      this.contactTableParam.content.dataid = id
-      this.contactTableParam.content.type = 0
+      this.contactTableParam.content.dataid = dataid
+      this.contactTableParam.content.type = type
       this.contactTableParam.content.username = this.person
       this.$refs.projectContactTable.listData()
 
       /*项目关联客户情况统计*/
-      this.customerMapParam.content.dataid = id
-      this.customerMapParam.content.type = 0
+      this.customerMapParam.content.dataid = dataid
+      this.customerMapParam.content.type = type
       this.customerInit()
-      this.customerTableParam.content.dataid = id
-      this.customerTableParam.content.type = 0
+      this.customerTableParam.content.dataid = dataid
+      this.customerTableParam.content.type = type
       this.customerTableParam.content.username = this.person
       this.$refs.projectCustomerTable.listData()
 
       /*项目评估情况统计*/
-      this.scoreMapParam.content.dataid = id
-      this.scoreMapParam.content.type = 0
+      this.scoreMapParam.content.dataid = dataid
+      this.scoreMapParam.content.type = type
       this.projectScoreInit()
-      this.scoreTableParam.content.dataid = id
-      this.scoreTableParam.content.type = 0
+      this.scoreTableParam.content.dataid = dataid
+      this.scoreTableParam.content.type = type
       this.scoreTableParam.content.username = this.person
       this.$refs.projectScoreTable.listData()
 
       /*有效项目未跟进天数分析*/
-      this.unfllowMapParam.content.dataid = id
-      this.unfllowMapParam.content.type = 0
+      this.unfllowMapParam.content.dataid = dataid
+      this.unfllowMapParam.content.type = type
       this.customerUnfllowInit()
-      this.unfllowTableParam.content.dataid = id
-      this.unfllowTableParam.content.type = 0
+      this.unfllowTableParam.content.dataid = dataid
+      this.unfllowTableParam.content.type = type
       this.unfllowTableParam.content.username = this.person
       this.$refs.customerUnfllowTable.listData()
 
       /*项目生命周期分析*/
-      this.dateParam.content.dataid = id
-      this.dateParam.content.type = 0
+      this.dateParam.content.dataid = dataid
+      this.dateParam.content.type = type
       this.dateParam.content.username = this.person
       this.getDate()
     },
@@ -3796,117 +3848,139 @@ export default {
       this.dataAllParam.content.where.isleave = this.isleave
       this.dataAllParam.content.dateType = this.dateType
       this.person = ''
-      this.dataAllParam.content.dataid = this.dataAllParam.content.type == 0?-1:this.dataAllParam.content.dataid
+      this.dataAllParam.content.type = 1
+      this.dataAllParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.getdataAll()
 
       /*项目类型分析*/
       this.typeMapParam.content.where.isleave = this.isleave
       this.typeMapParam.content.username = ''
-      this.typeMapParam.content.dataid = this.typeMapParam.content.type == 0?-1:this.typeMapParam.content.dataid
+      this.typeMapParam.content.type = 1
+      this.typeMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.typeInit()
       this.typeTableParam.content.where.isleave = this.isleave
       this.typeTableParam.content.username = ''
-      this.typeTableParam.content.dataid = this.typeTableParam.content.type == 0?-1:this.typeTableParam.content.dataid
+      this.typeTableParam.content.type = 1
+      this.typeTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.typeTable.listData()
 
       /*项目等级分析*/
       this.gradMapParam.content.where.isleave = this.isleave
       this.gradMapParam.content.username = ''
-      this.gradMapParam.content.dataid = this.gradMapParam.content.type == 0?-1:this.gradMapParam.content.dataid
+      this.gradMapParam.content.type = 1
+      this.gradMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.gradInit()
       this.gradTableParam.content.where.isleave = this.isleave
       this.gradTableParam.content.username = ''
-      this.gradTableParam.content.dataid = this.gradTableParam.content.type == 0?-1:this.gradTableParam.content.dataid
+      this.gradTableParam.content.type = 1
+      this.gradTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.gradTable.listData()
 
       /*项目评估分析*/
       this.scoreMapParam1.content.where.isleave = this.isleave
       this.scoreMapParam1.content.username = ''
-      this.scoreMapParam1.content.dataid = this.scoreMapParam1.content.type == 0?-1:this.scoreMapParam1.content.dataid
+      this.scoreMapParam1.content.type = 1
+      this.scoreMapParam1.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.scoreInit()
       this.scoreTableParam1.content.where.isleave = this.isleave
       this.scoreTableParam1.content.username = ''
-      this.scoreTableParam1.content.dataid = this.scoreTableParam1.content.type == 0?-1:this.scoreTableParam1.content.dataid
+      this.scoreTableParam1.content.type = 1
+      this.scoreTableParam1.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.scoreTable.listData()
 
       /*近12月项目新增分析*/
       this.addParam.content.where.isleave = this.isleave
       this.addParam.content.username = ''
-      this.addParam.content.dataid = this.addParam.content.type == 0?-1:this.addParam.content.dataid
+      this.addParam.content.type = 1
+      this.addParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.addFun()
 
       /*近12月项目报备分析*/
       this.baobeiParam.content.where.isleave = this.isleave
       this.baobeiParam.content.username = ''
-      this.baobeiParam.content.dataid = this.baobeiParam.content.type == 0?-1:this.baobeiParam.content.dataid
+      this.baobeiParam.content.type = 1
+      this.baobeiParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.baobeiFun()
 
       /*近12月项目跟进分析*/
       this.fllowParam.content.where.isleave = this.isleave
       this.fllowParam.content.username = ''
-      this.fllowParam.content.dataid = this.fllowParam.content.type == 0?-1:this.fllowParam.content.dataid
+      this.fllowParam.content.type = 1
+      this.fllowParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.fllowFun()
 
       /*近12月项目报价分析*/
       this.baojiaParam.content.where.isleave = this.isleave
       this.baojiaParam.content.username = ''
-      this.baojiaParam.content.dataid = this.baojiaParam.content.type == 0?-1:this.baojiaParam.content.dataid
+      this.baojiaParam.content.type = 1
+      this.baojiaParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.baojiaFun()
 
       /*近12月项目跟进分析*/
       this.fllowMapParam.content.where.isleave = this.isleave
       this.fllowMapParam.content.username = ''
-      this.fllowMapParam.content.dataid = this.fllowMapParam.content.type == 0?-1:this.fllowMapParam.content.dataid
+      this.fllowMapParam.content.type = 1
+      this.fllowMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.fllowInit()
       this.fllowTableParam.content.where.isleave = this.isleave
       this.fllowTableParam.content.username = ''
-      this.fllowTableParam.content.dataid = this.fllowTableParam.content.type == 0?-1:this.fllowTableParam.content.dataid
+      this.fllowTableParam.content.type = 1
+      this.fllowTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.projectFllowTable.listData()
 
       /*项目联系人情况统计*/
       this.contactMapParam.content.where.isleave = this.isleave
       this.contactMapParam.content.username = ''
-      this.contactMapParam.content.dataid = this.contactMapParam.content.type == 0?-1:this.contactMapParam.content.dataid
+      this.contactMapParam.content.type = 1
+      this.contactMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.contactInit()
       this.contactTableParam.content.where.isleave = this.isleave
       this.contactTableParam.content.username = ''
-      this.contactTableParam.content.dataid = this.contactTableParam.content.type == 0?-1:this.contactTableParam.content.dataid
+      this.contactTableParam.content.type = 1
+      this.contactTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.projectContactTable.listData()
 
       /*项目关联客户情况统计*/
       this.customerMapParam.content.where.isleave = this.isleave
       this.customerMapParam.content.username = ''
-      this.customerMapParam.content.dataid = this.customerMapParam.content.type == 0?-1:this.customerMapParam.content.dataid
+      this.customerMapParam.content.type = 1
+      this.customerMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerInit()
       this.customerTableParam.content.where.isleave = this.isleave
       this.customerTableParam.content.username = ''
-      this.customerTableParam.content.dataid = this.customerTableParam.content.type == 0?-1:this.customerTableParam.content.dataid
+      this.customerTableParam.content.type = 1
+      this.customerTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.projectCustomerTable.listData()
 
       /*项目评估情况统计*/
       this.scoreMapParam.content.where.isleave = this.isleave
       this.scoreMapParam.content.username = ''
-      this.scoreMapParam.content.dataid = this.scoreMapParam.content.type == 0?-1:this.scoreMapParam.content.dataid
+      this.scoreMapParam.content.type = 1
+      this.scoreMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.projectScoreInit()
       this.scoreTableParam.content.where.isleave = this.isleave
       this.scoreTableParam.content.username = ''
-      this.scoreTableParam.content.dataid = this.scoreTableParam.content.type == 0?-1:this.scoreTableParam.content.dataid
+      this.scoreTableParam.content.type = 1
+      this.scoreTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.projectScoreTable.listData()
 
       /*有效项目未跟进天数分析*/
       this.unfllowMapParam.content.where.isleave = this.isleave
       this.unfllowMapParam.content.username = ''
-      this.unfllowMapParam.content.dataid = this.unfllowMapParam.content.type == 0?-1:this.unfllowMapParam.content.dataid
+      this.unfllowMapParam.content.type = 1
+      this.unfllowMapParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.customerUnfllowInit()
       this.unfllowTableParam.content.where.isleave = this.isleave
       this.unfllowTableParam.content.username = ''
-      this.unfllowTableParam.content.dataid = this.unfllowTableParam.content.type == 0?-1:this.unfllowTableParam.content.dataid
+      this.unfllowTableParam.content.type = 1
+      this.unfllowTableParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.$refs.customerUnfllowTable.listData()
 
       /*项目生命周期分析*/
       this.dateParam.content.where.isleave = this.isleave
       this.dateParam.content.username = ''
-      this.dateParam.content.dataid = this.dateParam.content.type == 0?-1:this.dateParam.content.dataid
+      this.dateParam.content.type = 1
+      this.dateParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.getDate()
 
       this.personDataAll()
@@ -3933,11 +4007,12 @@ export default {
       this.unfllowMapParam.content.where.projecttype = this.projectType.length ? this.projectType[0].value : ''
     },
     /*获取新的业务员列表*/
-    async personDataAll(){
+    async personDataAll(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.isleave
+          isleave:this.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)
@@ -3958,11 +4033,12 @@ export default {
 
     },
     /*获取新的业务员列表*/
-    async personData(keyName,isleave){
+    async personData(keyName,isleave,depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:isleave
+          isleave:isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 12 - 4
src/HDrpManagement/salerpriceData/components/departmentSalesperson.vue

@@ -57,14 +57,22 @@ export default {
   methods: {
     selectDep(val) {
       this.person = "";
-      this.depmentid = val[val.length - 1];
+      this.depmentid = val[val.length - 1]?val[val.length - 1]:-1;
       console.log(this.depmentid, "depmentid");
-      this.$emit("depSelect", this.depmentid);
+      this.$emit("depSelect", this.depmentid,1);
     },
     selectPerson(val) {
-      this.depment = "";
       this.depmentid = val;
-      this.$emit("personSelect", this.depmentid);
+      console.log(this.depment,'depment33333')
+      let type = 0
+      if (val || this.depment){
+        type = val?0:1
+        this.depmentid = val?val:this.depment
+      }else {
+        type = 1
+        this.depmentid = -1
+      }
+      this.$emit("personSelect", this.depmentid,type);
     },
   },
   mounted() {},

+ 11 - 8
src/HDrpManagement/salerpriceData/components/salesTemplate.vue

@@ -105,31 +105,34 @@ export default {
     async listData(val){
       if (val == '状态'){
         this.$refs.departmentSalesperson.person = ''
-        this.param.content.dataid = this.param.content.type == 0 ? -1 : this.param.content.dataid
-        this.personData()
+        this.param.content.type = 1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
+        this.personData(this.$refs.departmentSalesperson.depment)
       }
       this.param.content.dateType = this.dateType
       const res = await this.$api.requested(this.param)
       this.list = res.data
     },
     /*选择部门*/
-    depSelect(val){
-      this.param.content.type = 1
+    depSelect(val,type){
+      this.param.content.type = type
       this.param.content.dataid = val
+      this.personData(val)
       this.listData()
     },
     /*选择业务员*/
-    personSelect(val){
-      this.param.content.type = 0
+    personSelect(val,type){
+      this.param.content.type = type
       this.param.content.dataid = val
       this.listData()
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.param.content.where.isleave
+          isleave:this.param.content.where.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 28 - 17
src/HDrpManagement/salerpriceData/index.vue

@@ -250,7 +250,8 @@ export default {
       depmentParam: {
         id: 20230620102004,
         content: {
-          isleave:0
+          isleave:0,
+          depid:''
         },
       },
       customerLead: [],
@@ -486,9 +487,9 @@ export default {
       this.$refs.salesperson.param.content.pageNumber = 1;
       this.$refs.salesperson.param.content.pageSize = 10;
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.depment =
-        type == "1" ? dataid : "";
+        type == "1" ? dataid : this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.depment;
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.person =
-        state?'':type == "0" ? dataid : "";
+        type == "0" ? dataid : "";
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.deplist =
         this.deplist;
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.personnelList =
@@ -501,10 +502,10 @@ export default {
       this.$refs.SalerType.param.content.pageNumber = 1;
       this.$refs.SalerType.param.content.pageSize = 20;
       this.$refs.SalerType.$refs.departmentSalesperson.depment =
-        type == "1" ? dataid : "";
+          type == "1" ? dataid : this.$refs.SalerType.$refs.departmentSalesperson.depment;
       this.$refs.SalerType.$refs.departmentSalesperson.deplist = this.deplist;
       this.$refs.SalerType.$refs.departmentSalesperson.person =
-        state?'':type == "0" ? dataid : "";
+          type == "0" ? dataid : "";
       this.$refs.SalerType.$refs.departmentSalesperson.personnelList =
         this.personnelList;
       this.$refs.SalerType.queryModel(dataid, type, isleave);
@@ -515,11 +516,11 @@ export default {
       this.$refs.CustomerType.param.content.pageNumber = 1;
       this.$refs.CustomerType.param.content.pageSize = 20;
       this.$refs.CustomerType.$refs.departmentSalesperson.depment =
-        type == "1" ? dataid : "";
+          type == "1" ? dataid : this.$refs.CustomerType.$refs.departmentSalesperson.depment;
       this.$refs.CustomerType.$refs.departmentSalesperson.deplist =
         this.deplist;
       this.$refs.CustomerType.$refs.departmentSalesperson.person =
-        state?'':type == "0" ? dataid : "";
+          type == "0" ? dataid : "";
       this.$refs.CustomerType.$refs.departmentSalesperson.personnelList =
         this.personnelList;
       this.$refs.CustomerType.queryModel(dataid, type, isleave);
@@ -530,10 +531,10 @@ export default {
       this.$refs.projectType.param.content.pageNumber = 1;
       this.$refs.projectType.param.content.pageSize = 20;
       this.$refs.projectType.$refs.departmentSalesperson.depment =
-        type == "1" ? dataid : "";
+          type == "1" ? dataid : this.$refs.projectType.$refs.departmentSalesperson.depment;
       this.$refs.projectType.$refs.departmentSalesperson.deplist = this.deplist;
       this.$refs.projectType.$refs.departmentSalesperson.person =
-        state?'':type == "0" ? dataid : "";
+          type == "0" ? dataid : "";
       this.$refs.projectType.$refs.departmentSalesperson.personnelList =
         this.personnelList;
       this.$refs.projectType.queryModel(dataid, type, isleave);
@@ -544,10 +545,10 @@ export default {
       this.$refs.PhoneType.param.content.pageNumber = 1;
       this.$refs.PhoneType.param.content.pageSize = 20;
       this.$refs.PhoneType.$refs.departmentSalesperson.depment =
-        type == "1" ? dataid : "";
+          type == "1" ? dataid : this.$refs.PhoneType.$refs.departmentSalesperson.depment;
       this.$refs.PhoneType.$refs.departmentSalesperson.deplist = this.deplist;
       this.$refs.PhoneType.$refs.departmentSalesperson.person =
-        state?'':type == "0" ? dataid : "";
+          type == "0" ? dataid : "";
       this.$refs.PhoneType.$refs.departmentSalesperson.personnelList =
         this.personnelList;
       this.$refs.PhoneType.queryModel(dataid, type, isleave);
@@ -566,20 +567,30 @@ export default {
         this.person = "";
         this.dataid = "";
         this.departmentid = val[val.length - 1];
+        this.depmentParam.content.depid = this.departmentid
+        this.personData()
         this.otherModel(this.departmentid, "1", this.isleave);
       }
     },
     selectPerson(val) {
-      this.depment = "";
-      this.departmentid = "";
-      this.dataid = val;
-      this.otherModel(val, "0", this.isleave);
+      console.log(this.depment,'depment1111')
+      let type = 0
+      if (val || this.depment[this.depment.length -1]){
+        type = val?0:1
+        this.dataid = val?val:this.depment[this.depment.length -1]
+      }else {
+        type = 1
+        this.dataid = -1
+      }
+      this.otherModel(this.dataid, type, this.isleave);
     },
+
     leaveChange() {
       this.person = ''
-      const type = this.depment ? "1" : "0";
-      const dataid = type == 0 ? -1 : this.departmentid
+      const type = 1
+      const dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.depmentParam.content.isleave = this.isleave
+      this.depmentParam.content.depid = this.depment[this.depment.length -1]
       this.personData()
       this.otherModel(dataid, type, this.isleave,'状态');
     },

+ 10 - 8
src/HDrpManagement/salerpriceData/modules/customerType.vue

@@ -197,7 +197,8 @@
       async queryModel(val,type,isleave,state){
         if (state == '状态'){
           this.$refs.departmentSalesperson.person = ''
-          this.param.content.dataid = this.param.content.type == 0?-1:val
+          this.param.content.type = 1
+          this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
         }else {
           this.param.content.dataid = val?val : this.dataid
         }
@@ -240,7 +241,7 @@
           }
         })
         this.chartPie.changeData(this.chartData)
-        state == '状态'?this.personData():''
+        state == '状态'?this.personData(this.$refs.departmentSalesperson.depment):''
       },
       async queryTable(val,isleave){
         this.param.content.dataid = val || this.dataid
@@ -417,25 +418,26 @@
         this.$emit('backFull',val)
       },
       /*选择部门*/
-      depSelect(val){
-        this.param.content.type = 1
+      depSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
       },
       /*选择业务员*/
-      personSelect(val){
-        this.param.content.type = 0
+      personSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
       },
       /*获取新的业务员列表*/
-      async personData(){
+      async personData(depid){
         let param = {
           id: 20230620102004,
           content: {
-            isleave:this.param.content.where.isleave
+            isleave:this.param.content.where.isleave,
+            depid:depid
           },
         }
         const res = await this.$api.requested(param)

+ 11 - 8
src/HDrpManagement/salerpriceData/modules/phoneType.vue

@@ -189,7 +189,8 @@
       async queryModel(val,type,isleave,state){
         if (state == '状态'){
           this.$refs.departmentSalesperson.person = ''
-          this.param.content.dataid = this.param.content.type == 0?-1:val
+          this.param.content.type = 1
+          this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
         }else {
           this.param.content.dataid = val?val : this.dataid
         }
@@ -232,7 +233,7 @@
           }
         })
         this.chartPie.changeData(this.chartData)
-        state == '状态'?this.personData():''
+        state == '状态'?this.personData(this.$refs.departmentSalesperson.depment):''
       },
       async queryTable(val,isleave){
         this.param.content.dataid = val || this.dataid
@@ -409,25 +410,27 @@
         this.$emit('backFull',val)
       },
       /*选择部门*/
-      depSelect(val){
-        this.param.content.type = 1
+      depSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
+        this.personData(val)
         this.queryModel(val,null,this.param.content.where.isleave)
       },
       /*选择业务员*/
-      personSelect(val){
-        this.param.content.type = 0
+      personSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,null,this.param.content.where.isleave)
       },
       /*获取新的业务员列表*/
-      async personData(){
+      async personData(depid){
         let param = {
           id: 20230620102004,
           content: {
-            isleave:this.param.content.where.isleave
+            isleave:this.param.content.where.isleave,
+            depid:depid
           },
         }
         const res = await this.$api.requested(param)

+ 10 - 8
src/HDrpManagement/salerpriceData/modules/projectType.vue

@@ -188,7 +188,8 @@
       async queryModel(val,type,isleave,state){
         if (state == '状态'){
           this.$refs.departmentSalesperson.person = ''
-          this.param.content.dataid = this.param.content.type == 0?-1:val
+          this.param.content.type = 1
+          this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
         }else {
           this.param.content.dataid = val?val : this.dataid
         }
@@ -231,7 +232,7 @@
           }
         })
         this.chartPie.changeData(this.chartData)
-        state == '状态'?this.personData():''
+        state == '状态'?this.personData(this.$refs.departmentSalesperson.depment):''
       },
       async queryTable(val,isleave){
         this.param.content.dataid = val || this.dataid
@@ -408,25 +409,26 @@
         this.$emit('backFull',val)
       },
       /*选择部门*/
-      depSelect(val){
-        this.param.content.type = 1
+      depSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
       },
       /*选择业务员*/
-      personSelect(val){
-        this.param.content.type = 0
+      personSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
       },
       /*获取新的业务员列表*/
-      async personData(){
+      async personData(depid){
         let param = {
           id: 20230620102004,
           content: {
-            isleave:this.param.content.where.isleave
+            isleave:this.param.content.where.isleave,
+            depid:depid
           },
         }
         const res = await this.$api.requested(param)

+ 13 - 8
src/HDrpManagement/salerpriceData/modules/salerType.vue

@@ -188,9 +188,12 @@
         this.renderPie(val)
       },
       async queryModel(val,type,isleave,state){
+
+        console.log(this.$refs.departmentSalesperson.depment,'depment部门数据输出')
         if (state == '状态'){
           this.$refs.departmentSalesperson.person = ''
-          this.param.content.dataid = this.param.content.type == 0?-1:val
+          this.param.content.type = 1
+          this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
         }else {
           this.param.content.dataid = val?val : this.dataid
         }
@@ -235,7 +238,7 @@
           }
         })
         this.chartPie.changeData(this.chartData)
-        state == '状态'?this.personData():''
+        state == '状态'?this.personData(this.$refs.departmentSalesperson.depment):''
       },
       async queryTable(val,isleave){
         this.param.content.dataid = val || this.dataid
@@ -414,25 +417,27 @@
         this.$emit('backFull',val)
       },
       /*选择部门*/
-      depSelect(val){
-        this.param.content.type = 1
+      depSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
+        this.personData(val)
         this.queryModel(val,null,this.param.content.where.isleave)
       },
       /*选择业务员*/
-      personSelect(val){
-        this.param.content.type = 0
+      personSelect(val,type){
+        this.param.content.type = type
         this.param.content.dataid = val
         this.param.content.pageNumber = 1
         this.queryModel(val,null,this.param.content.where.isleave)
       },
       /*获取新的业务员列表*/
-      async personData(){
+      async personData(depid){
         let param = {
           id: 20230620102004,
           content: {
-            isleave:this.param.content.where.isleave
+            isleave:this.param.content.where.isleave,
+            depid:depid
           },
         }
         const res = await this.$api.requested(param)

+ 22 - 12
src/components/dataTemplate/depStatus.vue

@@ -110,7 +110,6 @@ export default {
     },
     /*选择部门*/
     selectDep(val) {
-      console.log(val,'val2222')
       if (val.length === 0){
         const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
         console.log(JSON.parse(sessionStorage.getItem('active_account')).userid)
@@ -119,34 +118,45 @@ export default {
       }else {
         this.person = ''
         this.departmentid = val[val.length -1]
-        this.$emit(`depData`,this.departmentid,'1',this.isleave)
+        // this.$emit(`depData`,this.departmentid,'1',this.isleave)
       }
+      this.personData(this.departmentid,'部门')
     },
     /*选择人员*/
     selectPerson(val){
-      this.depment = ''
-      this.departmentid = ''
-      this.dataid = val
-      this.$emit(`personData`,val,'0',this.isleave)
+      let type = 0
+      if (val || this.depment){
+        type = val?0:1
+        this.dataid = val?val:this.depment
+      }else {
+        type = 1
+        this.dataid = -1
+      }
+      this.$emit(`personData`,this.dataid,type,this.isleave,'人员',this.depment)
     },
     /*选择在职状态*/
     leaveChange(){
       this.person = ''
-      const type = this.depment?'1':'0'
-      const dataid = type == 0?-1:this.departmentid
-      this.$emit(`leaveData`,dataid,type,this.isleave,'状态')
-      this.personData()
+      const dataid = this.depment?this.depment:-1
+      // this.$emit(`leaveData`,dataid,type,this.isleave,'状态')
+      this.personData(dataid,'状态')
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid,state){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.isleave
+          isleave:this.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)
       this.personnelList = res.data.hr
+      if (state == '状态'){
+        this.$emit(`leaveData`,depid,'1',this.isleave,state,this.personnelList)
+      }else {
+        this.$emit(`depData`,depid,'1',this.isleave,state,this.personnelList)
+      }
     },
   },
   mounted() {

+ 20 - 13
src/views/clueData/index.vue

@@ -12,7 +12,7 @@
               <div class="inline-16">
                 <label  class="search__label" >{{$t('部门')}}:</label>
                 <!--              <el-cascader ref="selectdep" size="small" v-model="departmentid" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>-->
-                <el-cascader class="inline-16" placement="bottom" ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep" clearable></el-cascader>
+                <el-cascader class="inline-16"  placement="bottom" ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep" clearable></el-cascader>
               </div>
               <div class="inline-16">
                 <label  class="search__label" >{{$t('业务员')}}:</label>
@@ -76,7 +76,8 @@ export default {
       depmentParam:{
         "id": 20230620102004,
         "content": {
-          "isleave":1
+          "isleave":1,
+          "depid":""
         }
       },
       scrollData:'',
@@ -229,37 +230,43 @@ export default {
       return arr
     },
     selectDep(val) {
-      console.log(val,'val2222')
       if (val.length === 0){
         const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
         this.otherModel(userid,'0')
       }else {
         this.person = ''
-        this.departmentid = val[val.length -1]
-
+        this.departmentid = val[val.length -1]?val[val.length -1]:-1
+        this.personData(this.departmentid)
         this.otherModel(this.departmentid,'1',this.isleave)
       }
 
     },
     selectPerson(val){
-      this.depment = ''
-      this.departmentid = ''
+      let type = 0
+      if (val || this.departmentid){
+        type = val?0:1
+        this.dataid = val?val:this.depmentid
+      }else {
+        type = 1
+        this.dataid = -1
+      }
       this.dataid = val
-      this.otherModel(val,'0',this.isleave)
+      this.otherModel(this.dataid,type,this.isleave)
     },
     leaveChange(){
       this.person = ''
-      const type = this.depment?'1':'0'
-      const dataid = type == 0?-1:this.departmentid
+      const type = 1
+      const dataid = this.departmentid?this.departmentid:-1
       this.otherModel(dataid,type,this.isleave,'状态')
-      this.personData()
+      this.personData(this.departmentid)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.isleave
+          isleave:this.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 18 - 10
src/views/clueData/modules/clueAdd.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson id="department" ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson id="department" ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -80,7 +80,8 @@ export default {
     async queryModel(val,isleave,state){
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
-        this.param.content.dataid = this.param.content.type == 0?-1:val
+        this.param.content.type = 1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -121,7 +122,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.newHistogram,this.lineChart])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueAddAnalysisChart', {
@@ -170,21 +171,28 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      this.param.content.dataid = val?val:-1
+      this.personData(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
-      this.param.content.type = 0
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      if (val || this.$refs.departmentSalesperson.depmentid){
+        this.param.content.type = val?0:1
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+      }else {
+        this.param.content.type = 1
+        this.param.content.dataid = -1
+      }
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.param.content.where.isleave
+          isleave:this.param.content.where.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 18 - 10
src/views/clueData/modules/clueChange.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -79,7 +79,8 @@ export default {
     async queryModel(val,isleave,state){
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
-        this.param.content.dataid = this.param.content.type == 0?-1:val
+        this.param.content.type = 1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -102,7 +103,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.histogram,this.lineChart])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueChangeAnalysisChart', {
@@ -149,21 +150,28 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      this.param.content.dataid = val?val:-1
+      this.personData(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
-      this.param.content.type = 0
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      if (val || this.$refs.departmentSalesperson.depmentid){
+        this.param.content.type = val?0:1
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+      }else {
+        this.param.content.type = 1
+        this.param.content.dataid = -1
+      }
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.param.content.where.isleave
+          isleave:this.param.content.where.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 18 - 10
src/views/clueData/modules/clueFollow.vue

@@ -9,7 +9,7 @@
 
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -81,7 +81,8 @@ export default {
     async queryModel(val,isleave,state){
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
-        this.param.content.dataid = this.param.content.type == 0?-1:val
+        this.param.content.type = 1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -123,7 +124,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.newHistogram,this.lineChart])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueFollowAnalysisChart', {
@@ -172,21 +173,28 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      this.param.content.dataid = val?val:-1
+      this.personData(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
-      this.param.content.type = 0
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      if (val || this.$refs.departmentSalesperson.depmentid){
+        this.param.content.type = val?0:1
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+      }else {
+        this.param.content.type = 1
+        this.param.content.dataid = -1
+      }
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.param.content.where.isleave
+          isleave:this.param.content.where.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 18 - 10
src/views/clueData/modules/clueUnFollow.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -180,7 +180,8 @@ export default {
     async queryModel(val,isleave,state){
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
-        this.param.content.dataid = this.param.content.type == 0?-1:val
+        this.param.content.type = 1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -222,7 +223,7 @@ export default {
         }
       })
       this.chartColumn.changeData(this.columnData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartColumn = new Column('clueUnFollowAnalysisChart', {
@@ -253,21 +254,28 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      this.param.content.dataid = val?val:-1
+      this.personData(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid ,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
-      this.param.content.type = 0
-      this.param.content.dataid = val
-      this.queryModel(val,this.param.content.where.isleave)
+      if (val || this.$refs.departmentSalesperson.depmentid){
+        this.param.content.type = val?0:1
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+      }else {
+        this.param.content.type = 1
+        this.param.content.dataid = -1
+      }
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {
-          isleave:this.param.content.where.isleave
+          isleave:this.param.content.where.isleave,
+          depid:depid
         },
       }
       const res = await this.$api.requested(param)

+ 3 - 3
src/views/salesData/index.vue

@@ -445,11 +445,11 @@ export default {
       this.otherModel(this.dataid,type,this.isleave)
     },
     leaveChange(){
-      const type = this.depment?'1':'0'
+      const type = 1
       this.person = ''
-      const dataid = type == '0'?-1:this.departmentid
+      const dataid =  this.departmentid?this.departmentid:-1
       this.otherModel(dataid,type,this.isleave,'状态')
-      this.personData()
+      this.personData(this.departmentid)
     },
     /*获取新的业务员列表*/
     async personData(depid){