数据总览部门查询调整

src/HDrpManagement/contactData/components/depStatus.vue

@@ -116,7 +116,8 @@ export default {
         this.$emit(`depData`,userid,'0')
       }else {
         this.person = ''
-        this.departmentid = val[val.length -1]
+        this.depment = val[val.length -1]?val[val.length -1]:-1
+        this.departmentid = val[val.length -1]?val[val.length -1]:-1
 
       }
       this.personData(this.departmentid,'部门')

src/HDrpManagement/customerData/index.vue

@@ -922,7 +922,7 @@
                     <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"
+                      :popper-append-to-body="false" clearable
                       @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()}}"
                       >
@@ -1071,7 +1071,7 @@
                     <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"
+                      :popper-append-to-body="false" clearable
                         @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
@@ -1906,78 +1906,78 @@ export default {
     },
     //客户等级图初始化
     async customerGradInit (init,state) {
-      if (state == '状态'){
-        this.personData('gradMapParamSalesman',this.gradMapParam.content.where.isleave)
-        this.gradMapParam.content.username = ''
-        this.gradMapParam.content.dataid = this.gradMapParam.content.type == 0 || this.gradMapParam.content.type == ''  ? -1:this.gradMapParam.content.dataid
-      }
-      let res = await this.$api.requested(this.gradMapParam)
-      this.customerGradData.map = res.data
-      console.log(this.customerGradData,'客户数据');
-      if (init) {
-        this.customerGradMap = new Pie(this.$refs.customerGradEl, {
-          appendPadding: 10,
-          data:this.customerGradData.map,
-          angleField: 'ratio',
-          colorField: 'key',
-          radius: 1,
-          innerRadius: 0.64,
-          meta: {
-            value: {
-              formatter: (v) => `${v} ¥`,
-            },
-          },
-          label:{
-            formatter: (datum) => `${datum.ratio}%`
-          },
-          tooltip:{
-            formatter: (datum) => {
-              return { name: datum.key, value: datum.ratio + '%' };
-            },
-          },
-          statistic: {
-            title: {
-              offsetY: -4,
-              style: {
-                fontSize:'16px'
-              },
-              content:'客户总数'
-            },
-            content: {
-              offsetY: 4,
-              style: {
-                whiteSpace: 'pre-wrap',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-                fontSize:'16px'
-              },
-              customHtml: (container, view, datum, data) => {
-                const text = data[0].totalqty
-                return text
-              },
-            },
-          },
-          legend: {
-            position:'bottom'
-          },
-          // 添加 中心统计文本 交互
-          interactions: [{ type: 'element-single-selected' }, { type: 'element-active' }],
-        });
-        this.customerGradMap.on('element:click',(v) => {
-          if (v.data.data.key != this.gradTableParam.content.where.grade) {
-            this.gradTableParam.content.where.grade = v.data.data.key
-            this.gradTableParam.content.pageNumber = 1
-            this.$refs.customerGradTable.listData()
-          } else {
-            this.gradTableParam.content.where.grade = ''
-            this.gradTableParam.content.pageNumber = 1
-            this.$refs.customerGradTable.listData()
-          }
-        })
-        this.customerGradMap.render();
-      } else {
-        this.customerGradMap.changeData(this.customerGradData.map)
-      }
+      // if (state == '状态'){
+      //   this.personData('gradMapParamSalesman',this.gradMapParam.content.where.isleave)
+      //   this.gradMapParam.content.username = ''
+      //   this.gradMapParam.content.dataid = this.gradMapParam.content.type == 0 || this.gradMapParam.content.type == ''  ? -1:this.gradMapParam.content.dataid
+      // }
+      // let res = await this.$api.requested(this.gradMapParam)
+      // this.customerGradData.map = res.data
+      // console.log(this.customerGradData,'客户数据');
+      // if (init) {
+      //   this.customerGradMap = new Pie(this.$refs.customerGradEl, {
+      //     appendPadding: 10,
+      //     data:this.customerGradData.map,
+      //     angleField: 'ratio',
+      //     colorField: 'key',
+      //     radius: 1,
+      //     innerRadius: 0.64,
+      //     meta: {
+      //       value: {
+      //         formatter: (v) => `${v} ¥`,
+      //       },
+      //     },
+      //     label:{
+      //       formatter: (datum) => `${datum.ratio}%`
+      //     },
+      //     tooltip:{
+      //       formatter: (datum) => {
+      //         return { name: datum.key, value: datum.ratio + '%' };
+      //       },
+      //     },
+      //     statistic: {
+      //       title: {
+      //         offsetY: -4,
+      //         style: {
+      //           fontSize:'16px'
+      //         },
+      //         content:'客户总数'
+      //       },
+      //       content: {
+      //         offsetY: 4,
+      //         style: {
+      //           whiteSpace: 'pre-wrap',
+      //           overflow: 'hidden',
+      //           textOverflow: 'ellipsis',
+      //           fontSize:'16px'
+      //         },
+      //         customHtml: (container, view, datum, data) => {
+      //           const text = data[0].totalqty
+      //           return text
+      //         },
+      //       },
+      //     },
+      //     legend: {
+      //       position:'bottom'
+      //     },
+      //     // 添加 中心统计文本 交互
+      //     interactions: [{ type: 'element-single-selected' }, { type: 'element-active' }],
+      //   });
+      //   this.customerGradMap.on('element:click',(v) => {
+      //     if (v.data.data.key != this.gradTableParam.content.where.grade) {
+      //       this.gradTableParam.content.where.grade = v.data.data.key
+      //       this.gradTableParam.content.pageNumber = 1
+      //       this.$refs.customerGradTable.listData()
+      //     } else {
+      //       this.gradTableParam.content.where.grade = ''
+      //       this.gradTableParam.content.pageNumber = 1
+      //       this.$refs.customerGradTable.listData()
+      //     }
+      //   })
+      //   this.customerGradMap.render();
+      // } else {
+      //   this.customerGradMap.changeData(this.customerGradData.map)
+      // }
 
     },
     //客户联系人图初始化
@@ -2584,7 +2584,6 @@ export default {
       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 = dataid

src/HDrpManagement/projectData/index.vue

@@ -189,7 +189,7 @@
                     </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.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()}}"
@@ -343,7 +343,7 @@
                     </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"
+                      <el-select v-model="gradTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :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.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()}}"
@@ -506,7 +506,7 @@
                   </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"
+                    <el-select v-model="scoreTableParam1.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                     @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()}}"
                     >
@@ -638,7 +638,7 @@
                     </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"
+                      <el-select v-model="addParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
                         @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()}}"
                         >
@@ -698,7 +698,7 @@
                     </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"
+                      <el-select v-model="baobeiParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
                         @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()}}"
                         >
@@ -758,7 +758,7 @@
                     </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"
+                      <el-select v-model="baojiaParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
                         @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()}}"
                         >
@@ -818,9 +818,9 @@
                     </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"
+                      <el-select v-model="fllowParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                         :popper-append-to-body="false"
-                        @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()}}"
+                        @change="$event => {if($event) {fllowParam.content.type=0;fllowParam.content.dataid=$event;fllowFun(null,'状态')} else {fllowParam.content.dataid=fllowParam.content.depname[fllowParam.content.depname.length -1];fllowParam.content.type=1;fllowFun(null,'状态')}}"
                         >
                         <el-option
                             v-for="item in fllowParamSalesman"
@@ -879,7 +879,7 @@
                     </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.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;
@@ -1032,7 +1032,7 @@
                     </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.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()}}"
@@ -1184,7 +1184,7 @@
                     </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"
+                      <el-select v-model="customerTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :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.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()}}"
@@ -1336,7 +1336,7 @@
                     </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"
+                      <el-select v-model="scoreTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :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.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()}}"
@@ -1487,7 +1487,7 @@
                     </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"
+                      <el-select v-model="unfllowTableParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                       :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.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()}}"
@@ -1660,7 +1660,7 @@
                   </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"
+                    <el-select v-model="dateParam.content.username" filterable :placeholder="$t('请选择')" size="small" clearable
                                :popper-append-to-body="false"
                                @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()}}"
                     >
@@ -2882,7 +2882,7 @@ export default {
       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
+        param.content.dataid = this.fllowParam.content.depname[this.fllowParam.content.depname.length -1]?this.fllowParam.content.depname[this.fllowParam.content.depname.length -1]:-1
       }
       if (param.content.dataid instanceof Array) {
         param.content.dataid = param.content.dataid[param.content.dataid.length - 1]
@@ -3983,7 +3983,7 @@ export default {
       this.dateParam.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
       this.getDate()
 
-      this.personDataAll()
+      this.personDataAll(this.depment[this.depment.length -1])
     },
     selectRow (data) {
       this.projectname = data.projectname

src/HDrpManagement/salerpriceData/components/departmentSalesperson.vue

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

src/HDrpManagement/salerpriceData/index.vue

@@ -250,7 +250,7 @@ export default {
       depmentParam: {
         id: 20230620102004,
         content: {
-          isleave:0,
+          isleave:1,
           depid:''
         },
       },
@@ -566,14 +566,13 @@ export default {
       } else {
         this.person = "";
         this.dataid = "";
-        this.departmentid = val[val.length - 1];
+        this.departmentid = val[val.length - 1]?val[val.length - 1]:-1;
         this.depmentParam.content.depid = this.departmentid
         this.personData()
         this.otherModel(this.departmentid, "1", this.isleave);
       }
     },
     selectPerson(val) {
-      console.log(this.depment,'depment1111')
       let type = 0
       if (val || this.depment[this.depment.length -1]){
         type = val?0:1

src/views/clueData/index.vue

@@ -148,30 +148,30 @@ export default {
       this.$refs.digitalSigns.param.content.where.isleave = isleave
       this.$refs.digitalSigns.listData(dataid,this.dateType)
       /*线索新增*/
-      this.$refs.clueAdd.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.clueAdd.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.clueAdd.$refs.departmentSalesperson.depment
       this.$refs.clueAdd.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.clueAdd.$refs.departmentSalesperson.person = state?'':type == '0'?dataid:''
+      this.$refs.clueAdd.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.clueAdd.param.content.type = type
       this.$refs.clueAdd.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.clueAdd.queryModel(dataid,isleave)
       /*线索跟进*/
-      this.$refs.clueFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.clueFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.clueFollow.$refs.departmentSalesperson.depment
       this.$refs.clueFollow.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.clueFollow.$refs.departmentSalesperson.person = state?'':type == '0'?dataid:''
+      this.$refs.clueFollow.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.clueFollow.param.content.type = type
       this.$refs.clueFollow.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.clueFollow.queryModel(dataid,isleave)
       /*线索转化*/
-      this.$refs.clueChange.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.clueChange.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.clueChange.$refs.departmentSalesperson.depment
       this.$refs.clueChange.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.clueChange.$refs.departmentSalesperson.person = state?'':type == '0'?dataid:''
+      this.$refs.clueChange.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.clueChange.param.content.type = type
       this.$refs.clueChange.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.clueChange.queryModel(dataid,isleave)
       /*有效线索未跟进天数*/
-      this.$refs.clueUnFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.clueUnFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.clueUnFollow.$refs.departmentSalesperson.depment
       this.$refs.clueUnFollow.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.clueUnFollow.$refs.departmentSalesperson.person = state?'':type == '0'?dataid:''
+      this.$refs.clueUnFollow.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.clueUnFollow.param.content.type = type
       this.$refs.clueUnFollow.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.clueUnFollow.queryModel(dataid,isleave)
@@ -235,6 +235,7 @@ export default {
         this.otherModel(userid,'0')
       }else {
         this.person = ''
+        this.depment = val[val.length -1]?val[val.length -1]:-1
         this.departmentid = val[val.length -1]?val[val.length -1]:-1
         this.personData(this.departmentid)
         this.otherModel(this.departmentid,'1',this.isleave)
@@ -243,22 +244,21 @@ export default {
     },
     selectPerson(val){
       let type = 0
-      if (val || this.departmentid){
+      if (val || this.depment){
         type = val?0:1
-        this.dataid = val?val:this.depmentid
+        this.dataid = val?val:this.depment
       }else {
         type = 1
         this.dataid = -1
       }
-      this.dataid = val
       this.otherModel(this.dataid,type,this.isleave)
     },
     leaveChange(){
       this.person = ''
       const type = 1
-      const dataid = this.departmentid?this.departmentid:-1
+      const dataid = this.depment?this.depment:-1
       this.otherModel(dataid,type,this.isleave,'状态')
-      this.personData(this.departmentid)
+      this.personData(this.depment)
     },
     /*获取新的业务员列表*/
     async personData(depid){

src/views/clueData/modules/clueAdd.vue

@@ -81,7 +81,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -122,7 +122,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.newHistogram,this.lineChart])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueAddAnalysisChart', {
@@ -177,9 +177,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/clueData/modules/clueChange.vue

@@ -80,7 +80,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -103,7 +103,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.histogram,this.lineChart])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueChangeAnalysisChart', {
@@ -156,9 +156,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/clueData/modules/clueFollow.vue

@@ -82,7 +82,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -124,7 +124,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.newHistogram,this.lineChart])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('clueFollowAnalysisChart', {
@@ -179,9 +179,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/clueData/modules/clueUnFollow.vue

@@ -181,7 +181,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -223,7 +223,7 @@ export default {
         }
       })
       this.chartColumn.changeData(this.columnData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartColumn = new Column('clueUnFollowAnalysisChart', {
@@ -260,9 +260,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/components/departmentSalesperson.vue

@@ -33,6 +33,7 @@ export default {
   methods:{
     selectDep(val){
       this.person = ''
+      this.depment = val[val.length -1]
       this.depmentid = val[val.length -1]
       console.log(this.depmentid,'depmentid')
       this.$emit('depSelect',this.depmentid)

src/views/salesData/components/salesTemplate.vue

@@ -156,8 +156,8 @@ export default {
       if (val == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid?this.$refs.departmentSalesperson.depmentid:-1
-        this.personData(this.$refs.departmentSalesperson.depmentid)
+        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)
@@ -172,9 +172,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val ||  this.$refs.departmentSalesperson.depmentid){
+      if (val ||  this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/index.vue

@@ -61,7 +61,7 @@
           <!--  近12月延期出货情况分析      -->
           <delayedShipmentAnalysis ref="delayedShipmentAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></delayedShipmentAnalysis>
           <!--  未出货已延期情况分析      -->
-          <unshippedExtensionAnalysis ref="unshippedExtensionAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></unshippedExtensionAnalysis>
+          <unshippedExtensionAnalysis ref="unshippedExtensionAnalysisRef" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></unshippedExtensionAnalysis>
           <!--  开票金额趋势分析      -->
           <invoiceAmountAnalysis ref="invoiceAmountAnalysis" :dataid="departmentid" :windowWidth="windowWidth" :scrollHeight="scrollData" @backFull="backFull"></invoiceAmountAnalysis>
           <!--  近12月出货未开票金额趋势分析      -->
@@ -204,10 +204,10 @@ export default {
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*未出货已延期情况分析*/
-      this.$refs.unshippedExtensionAnalysis.listData(dataid)
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.person = userName
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.unshippedExtensionAnalysisRef.listData(dataid)
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.person = userName
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.deplist = this.deplist
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.personnelList = this.personnelList
       /*开票金额趋势分析*/
       this.$refs.invoiceAmountAnalysis.listData(dataid)
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.person = userName
@@ -256,8 +256,8 @@ export default {
       /*账户余额分析*/
       this.$refs.customerAccountBalanceAnalysis.param.content.type = type
       this.$refs.customerAccountBalanceAnalysis.queryModel(dataid,isleave)
-      this.$refs.customerAccountBalanceAnalysis.depment = type == '1'?dataid:''
-      this.$refs.customerAccountBalanceAnalysis.person = leave?'':type == '0'?dataid:''
+      this.$refs.customerAccountBalanceAnalysis.depment = type == '1'?dataid:this.$refs.customerAccountBalanceAnalysis.depment
+      this.$refs.customerAccountBalanceAnalysis.person = type == '0'?dataid:''
       this.$refs.customerAccountBalanceAnalysis.deplist = this.deplist
       this.$refs.customerAccountBalanceAnalysis.personnelList = this.personnelList
       /*客户销售*/
@@ -265,8 +265,8 @@ export default {
       this.$refs.customer.param.content.type = type
       this.$refs.customer.param.content.pageNumber = 1
       this.$refs.customer.param.content.pageSize = 10
-      this.$refs.customer.$refs.sales.$refs.departmentSalesperson.depment = type == '1'?dataid:''
-      this.$refs.customer.$refs.sales.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.customer.$refs.sales.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.customer.$refs.sales.$refs.departmentSalesperson.depment
+      this.$refs.customer.$refs.sales.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.customer.$refs.sales.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.customer.$refs.sales.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.customer.listData(dataid,isleave)
@@ -274,8 +274,8 @@ export default {
       this.$refs.salesperson.param.content.type = type
       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:''
-      this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.depment
+      this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.salesperson.$refs.sales.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.salesperson.listData(dataid,isleave)
@@ -284,77 +284,77 @@ export default {
       this.$refs.quotationAnalysis.plotParam.content.type = type
       this.$refs.quotationAnalysis.listData(dataid,isleave)
       this.$refs.quotationAnalysis.queryQuotationModel(dataid,isleave)
-      this.$refs.quotationAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.quotationAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.quotationAnalysis.$refs.departmentSalesperson.depment
       this.$refs.quotationAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.quotationAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.quotationAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.quotationAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*订单趋势分析*/
       this.$refs.orderTrendAnalysis.param.content.type = type
       this.$refs.orderTrendAnalysis.queryModel(dataid,isleave)
-      this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.depment
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*订单类型占比分析*/
       this.$refs.orderType.param.content.type = type
       this.$refs.orderType.queryModel(dataid,isleave)
-      this.$refs.orderType.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.orderType.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.orderType.$refs.departmentSalesperson.depment
       this.$refs.orderType.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.orderType.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.orderType.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.orderType.$refs.departmentSalesperson.personnelList = this.personnelList
       /*订单产品类别占比分析*/
       this.$refs.orderProductCategory.param.content.type = type
       this.$refs.orderProductCategory.queryModel(dataid,isleave)
-      this.$refs.orderProductCategory.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.orderProductCategory.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.orderProductCategory.$refs.departmentSalesperson.depment
       this.$refs.orderProductCategory.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.orderProductCategory.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.orderProductCategory.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.orderProductCategory.$refs.departmentSalesperson.personnelList = this.personnelList
       /*出货趋势分析*/
       this.$refs.shippingTrendAnalysis.param.content.type = type
       this.$refs.shippingTrendAnalysis.queryModel(dataid,isleave)
-      this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.depment
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*近12月延期出货情况分析*/
       this.$refs.delayedShipmentAnalysis.param.content.type = type
       this.$refs.delayedShipmentAnalysis.queryModel(dataid,isleave)
-      this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.depment
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*未出货已延期情况分析*/
-      this.$refs.unshippedExtensionAnalysis.param.content.type = type
-      this.$refs.unshippedExtensionAnalysis.queryModel(dataid,isleave)
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
-      this.$refs.unshippedExtensionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.unshippedExtensionAnalysisRef.param.content.type = type
+      this.$refs.unshippedExtensionAnalysisRef.queryModel(dataid,isleave)
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.depment
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.deplist = this.deplist
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.person = type == '0'?dataid:''
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.personnelList = this.personnelList
       /*开票金额趋势分析*/
       this.$refs.invoiceAmountAnalysis.param.content.type = type
       this.$refs.invoiceAmountAnalysis.queryModel(dataid,isleave)
-      this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.depment
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*近12月出货未开票金额趋势分析*/
       this.$refs.uninvoiceAmountAnalysis.param.content.type = type
       this.$refs.uninvoiceAmountAnalysis.queryModel(dataid,isleave)
-      this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.depment
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*已下单未出货分析*/
       this.$refs.orderUnshippedGoods.param.content.type = type
       this.$refs.orderUnshippedGoods.queryModel(dataid,isleave)
-      this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.depment
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.personnelList = this.personnelList
       /*出货未开票分析*/
       this.$refs.shippingUninvoiceAnalysis.param.content.type = type
       this.$refs.shippingUninvoiceAnalysis.queryModel(dataid,isleave)
-      this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.depment
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
@@ -363,9 +363,9 @@ export default {
       this.$refs.financialCollectionAnalysis.tableParam.content.type = type
       this.$refs.financialCollectionAnalysis.queryModel(dataid,isleave)
       this.$refs.financialCollectionAnalysis.tableData(dataid,isleave)
-      this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
+      this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.depment
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.deplist = this.deplist
-      this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.person = leave?'':type == '0'?dataid:''
+      this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
     },
     createMenu (array) {
@@ -448,8 +448,8 @@ export default {
       const type = 1
       this.person = ''
       const dataid =  this.departmentid?this.departmentid:-1
-      this.otherModel(dataid,type,this.isleave,'状态')
       this.personData(this.departmentid)
+      this.otherModel(dataid,type,this.isleave,'状态')
     },
     /*获取新的业务员列表*/
     async personData(depid){
@@ -476,6 +476,7 @@ export default {
       this.$refs.orderUnshippedGoods.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
+      this.$refs.unshippedExtensionAnalysisRef.$refs.departmentSalesperson.personnelList = this.personnelList
     },
     handleClick(tab, event) {
       console.log(this.activeName);

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -165,7 +165,7 @@ export default {
       console.log(val,this.depment)
       if (leave == '状态'){
         this.person = ''
-        this.param.content.dataid = this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1
+        this.param.content.dataid = this.depment?this.depment:-1
         this.param.content.type = 1
       }else {
         this.param.content.dataid = val ? val : this.dataid
@@ -209,7 +209,7 @@ export default {
         }
       })
       this.chartCustomerLine.changeData([this.balance,this.tbzzl])
-      leave == '状态'?this.personData(this.depment[this.depment.length -1]?this.depment[this.depment.length -1]:-1):''
+      leave == '状态'?this.personData(this.depment?this.depment:-1):''
     },
     renderPie(val){
       this.chartCustomerLine = new DualAxes('customerAccountBalanceAnalysisChart', {
@@ -288,7 +288,7 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.person = ''
-      this.depment = val
+      this.depment = val[val.length - 1]?val[val.length - 1]:-1
       this.param.content.type = 1
       this.param.content.dataid = val[val.length - 1]?val[val.length - 1]:-1
       this.personData(val[val.length - 1]?val[val.length - 1]:-1)
@@ -296,12 +296,12 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (this.person || this.depment[this.depment.length - 1]){
+      if (this.person || this.depment){
         this.param.content.type = this.person? 0 : 1
-        this.param.content.dataid = this.person ? this.person : this.depment[this.depment.length - 1]
+        this.param.content.dataid = this.person ? this.person : this.depment
       }else {
-        this.param.content.type = -1
-        this.param.content.dataid = ''
+        this.param.content.type = 1
+        this.param.content.dataid = -1
       }
       this.person = val
       this.queryModel(this.param.content.dataid,this.param.content.where.isleave)

src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -161,7 +161,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid?this.$refs.departmentSalesperson.depmentid:-1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -191,7 +191,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
      this.chartBar = new Bar('delayedShipmentAnalysisChart', {
@@ -236,9 +236,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -154,7 +154,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -169,7 +169,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('financialCollectionAnalysisChart',{
@@ -206,7 +206,8 @@ export default {
     },
     async tableData(val,isleave,state){
       if (state == '状态'){
-        this.tableParam.content.dataid = this.tableParam.content.type == 0?-1:val
+        this.tableParam.content.type = 1
+        this.tableParam.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.tableParam.content.dataid = val?val : this.dataid
       }
@@ -227,9 +228,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
         this.tableParam.content.type = val?0:1
       }else {
         this.param.content.type = 1

src/views/salesData/modules/invoiceAmountAnalysis.vue

@@ -88,7 +88,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -119,7 +119,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('invoiceAmountAnalysisChart', {
@@ -183,9 +183,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/orderProductCategory.vue

@@ -237,7 +237,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid?this.$refs.departmentSalesperson.depmentid:-1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -284,7 +284,7 @@ export default {
         }
       })
       this.chartPie.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
@@ -440,15 +440,15 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val?0:1
+      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){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/orderTrendAnalysis.vue

@@ -88,7 +88,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -122,7 +122,7 @@ export default {
       this.list = this.list2.concat(list3)
 
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val,type){
       this.chartDualAxes = new DualAxes('orderAnalysisChart', {
@@ -193,9 +193,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/orderType.vue

@@ -199,7 +199,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -245,7 +245,7 @@ export default {
         }
       })
       this.chartPie.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
@@ -407,9 +407,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/orderUnshippedGoods.vue

@@ -160,7 +160,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -190,7 +190,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('orderUnshippedGoodsChart', {
@@ -235,9 +235,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/quotationAnalysis.vue

@@ -131,7 +131,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -143,7 +143,7 @@ export default {
       this.totalamount = res.data.totalamount
       this.totalqty = res.data.totalqty
       this.cusamount = res.data.cusamount
-      state == '状态' ?this.personData(this.$refs.departmentSalesperson.depmentid):''
+      state == '状态' ?this.personData(this.$refs.departmentSalesperson.depment):''
     },
     /*获取报价分析数据*/
     async queryQuotation(val,type) {
@@ -157,7 +157,8 @@ export default {
     /*渲染图表数据*/
     async queryQuotationModel(val,type,state) {
       if (state == '状态'){
-        this.plotParam.content.dataid = this.plotParam.content.type == 0?-1:val
+        this.plotParam.content.type = 1
+        this.plotParam.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.plotParam.content.dataid = val?val : this.dataid
       }
@@ -216,11 +217,11 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.plotParam.content.type = val?0:1
         this.param.content.type = val?0:1
-        this.plotParam.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
-        this.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.plotParam.content.dataid = val?val:this.$refs.departmentSalesperson.depment
+        this.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.plotParam.content.type = 1
         this.param.content.type = 1

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -104,7 +104,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid?this.$refs.departmentSalesperson.depmentid:-1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment?this.$refs.departmentSalesperson.depment:-1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -144,7 +144,7 @@ export default {
       })
       this.list1 = tbzzl.concat(zjl)
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('shippingTrendAnalysisChart',{
@@ -213,9 +213,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1
@@ -223,7 +223,7 @@ export default {
       this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*获取新的业务员列表*/
-    async personData(){
+    async personData(depid){
       let param = {
         id: 20230620102004,
         content: {

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -149,7 +149,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -180,7 +180,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) :''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) :''
     },
     renderPie(val){
       this.chartBar = new Bar('shippingUninvoiceAnalysisChart',{
@@ -230,9 +230,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -111,7 +111,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -132,7 +132,7 @@ export default {
         }
       })
       this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup'], meta))
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid ) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment ) : ''
     },
     renderPie(val){
       this.chartLine = new Line('uninvoiceAmountChart',{
@@ -171,9 +171,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1

src/views/salesData/modules/unshippedExtensionAnalysis.vue

@@ -157,7 +157,7 @@ export default {
       if (state == '状态'){
         this.$refs.departmentSalesperson.person = ''
         this.param.content.type = 1
-        this.param.content.dataid = this.$refs.departmentSalesperson.depmentid ? this.$refs.departmentSalesperson.depmentid : -1
+        this.param.content.dataid = this.$refs.departmentSalesperson.depment ? this.$refs.departmentSalesperson.depment : -1
       }else {
         this.param.content.dataid = val?val : this.dataid
       }
@@ -187,7 +187,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depment) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('unshippedExtensionAnalysisChart', {
@@ -231,9 +231,9 @@ export default {
     },
     /*选择业务员*/
     personSelect(val){
-      if (val || this.$refs.departmentSalesperson.depmentid){
+      if (val || this.$refs.departmentSalesperson.depment){
         this.param.content.type = val?0:1
-        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depmentid
+        this.param.content.dataid = val?val:this.$refs.departmentSalesperson.depment
       }else {
         this.param.content.type = 1
         this.param.content.dataid = -1