销售线索

src/views/salesData/modules/delayedShipmentAnalysis.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>
@@ -160,7 +160,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
       }
@@ -190,7 +191,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
      this.chartBar = new Bar('delayedShipmentAnalysisChart', {
@@ -229,21 +230,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)

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson" placement="left-start"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson" placement="left-start"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -153,7 +153,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
       }
@@ -168,7 +169,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('financialCollectionAnalysisChart',{
@@ -218,25 +219,34 @@ export default {
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
-      this.param.content.dataid = val
+      this.param.content.dataid = val?val:-1
       this.tableParam.content.type = 1
-      this.queryModel(val,this.param.content.where.isleave)
-      this.tableData(val,this.param.content.where.isleave)
+      this.personData(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
+      this.tableData(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
-      this.param.content.type = 0
-      this.param.content.dataid = val
-      this.tableParam.content.type = 0
-      this.queryModel(val,this.param.content.where.isleave)
-      this.tableData(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
+        this.tableParam.content.type = val?0:1
+      }else {
+        this.param.content.type = 1
+        this.param.content.dataid = -1
+        this.tableParam.content.type = 1
+      }
+
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
+      this.tableData(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)

src/views/salesData/modules/invoiceAmountAnalysis.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>
@@ -87,7 +87,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
       }
@@ -118,7 +119,7 @@ export default {
         }
       })
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('invoiceAmountAnalysisChart', {
@@ -176,21 +177,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)

src/views/salesData/modules/orderProductCategory.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>
@@ -236,7 +236,8 @@ export default {
     async queryModel(val,type,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
       }
@@ -283,7 +284,7 @@ export default {
         }
       })
       this.chartPie.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
@@ -439,21 +440,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?0: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)

src/views/salesData/modules/orderTrendAnalysis.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -87,7 +87,8 @@ export default {
     async queryModel(val,type,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.list = this.list2.concat(list3)
 
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val,type){
       this.chartDualAxes = new DualAxes('orderAnalysisChart', {
@@ -186,21 +187,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)

src/views/salesData/modules/orderType.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>
@@ -198,7 +198,8 @@ export default {
     async queryModel(val,type,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
       }
@@ -244,7 +245,7 @@ export default {
         }
       })
       this.chartPie.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
@@ -400,21 +401,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)

src/views/salesData/modules/orderUnshippedGoods.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>
@@ -159,7 +159,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
       }
@@ -189,7 +190,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('orderUnshippedGoodsChart', {
@@ -228,21 +229,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)

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -25,7 +25,7 @@
             <el-checkbox v-model="param.content.isbooked" true-label="1" false-label="0" @change="changeDate">{{$t(`包含备货数据`)}}</el-checkbox>
           </div>
           <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>
@@ -103,7 +103,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
       }
@@ -143,7 +144,7 @@ export default {
       })
       this.list1 = tbzzl.concat(zjl)
       this.chartDualAxes.changeData([this.list,this.list1])
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartDualAxes = new DualAxes('shippingTrendAnalysisChart',{
@@ -206,21 +207,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(){
       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)

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -8,7 +8,7 @@
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
-            <departmentSalesperson ref="departmentSalesperson" placement="left-start" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+            <departmentSalesperson ref="departmentSalesperson" placement="left-start" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull" :is-new-dep="true"></departmentSalesperson>
           </div>
           <div class="mt-10 inline-16">
             <p class="search__label">{{$t('状态')}}:</p>
@@ -148,7 +148,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
       }
@@ -179,7 +180,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData() :''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) :''
     },
     renderPie(val){
       this.chartBar = new Bar('shippingUninvoiceAnalysisChart',{
@@ -223,21 +224,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
+      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(val,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)

src/views/salesData/modules/uninvoiceAmountAnalysis.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>
@@ -110,7 +110,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
       }
@@ -131,7 +132,7 @@ export default {
         }
       })
       this.chartLine.changeData(this.processData(this.list, ['zerotothree', 'threetosix','sixtotwelve','twelveup'], meta))
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid ) : ''
     },
     renderPie(val){
       this.chartLine = new Line('uninvoiceAmountChart',{
@@ -164,21 +165,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)

src/views/salesData/modules/unshippedExtensionAnalysis.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>
@@ -156,7 +156,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
       }
@@ -186,7 +187,7 @@ export default {
         }
       })
       this.chartBar.changeData(this.chartData)
-      state == '状态' ? this.personData() : ''
+      state == '状态' ? this.personData(this.$refs.departmentSalesperson.depmentid) : ''
     },
     renderPie(val){
       this.chartBar = new Bar('unshippedExtensionAnalysisChart', {
@@ -225,21 +226,27 @@ 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.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)