数据分析新增状态查询

src/HDrpManagement/customerPortrait/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <basicLayout 
-    ref="list" 
-    tableName="publicCustomerTable" 
-    idName="sa_customersid" 
-    :apiId="{query:20230713132804}" 
+    <basicLayout
+    ref="list"
+    tableName="publicCustomerTable"
+    idName="sa_customersid"
+    :apiId="{query:20230713132804}"
     :options="options"
     :isExport="false"
     @listCreate="listCreate"
@@ -13,21 +13,21 @@
       <div slot="custom" style="display:flex;flex-wrap:wrap">
         <div class="mt-10">
           <label  class="search__label">部门:</label>
-          <el-cascader 
+          <el-cascader
             class="inline-24"
-            ref="selectdep" 
-            size="small" 
-            v-model="form.dep" 
-            :options="selectList.dep" 
-            :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-            @change="depChange"  
+            ref="selectdep"
+            size="small"
+            v-model="form.dep"
+            :options="selectList.dep"
+            :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
+            @change="depChange"
             clearable
           ></el-cascader>
         </div>
 
         <div class="mt-10">
-          <label  class="search__label" >人员:</label>
-          <el-select class="inline-24" filterable v-model="form.people" size="small" placeholder="请选择部门" clearable @change="peopleChange">
+          <label  class="search__label" >业务员:</label>
+          <el-select class="inline-24" filterable v-model="form.people" size="small" placeholder="请选择业务员" clearable @change="peopleChange">
             <el-option
                 v-for="item in selectList.hr"
                 :key="item.userid"
@@ -36,7 +36,13 @@
             ></el-option>
           </el-select>
         </div>
-
+        <div class="inline-16">
+          <p class="search__label">状态:</p>
+          <el-select v-model="form.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="selectChange" :disabled="form.dep == ''">
+            <el-option label="在职" value="1"></el-option>
+            <el-option label="离职" value="2"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label  class="search__label" >客户类型:</label>
           <el-select v-model="form.type" class="inline-24" placeholder="请选择客户类型" size="small" clearable @change="selectChange">
@@ -84,7 +90,7 @@
             </el-select>
           </div>
 
-        
+
 
         <div class="mt-10" style="margin-right:10px">
           <label  class="search__label" >时间范围:</label>
@@ -199,7 +205,8 @@ export default {
         "type": "",
         "tradingstatus": "",
         "begindate":"",
-        "enddate":""
+        "enddate":"",
+        "isleave":""
       },
       selectList:[],
       dateSelect:[],
@@ -335,7 +342,7 @@ export default {
         "content": {
         }
       })
-      this.selectList = res.data 
+      this.selectList = res.data
       this.selectList.dep = this.createMenu(res.data.dep)
       console.log(this.selectList,'范围选择数据');
     },
@@ -351,7 +358,7 @@ export default {
         this.$refs.list.param.content.where.begindate = ''
         this.$refs.list.param.content.where.enddate = ''
       }
-      
+
       this.$refs.list.listData()
     },
     depChange(val){
@@ -362,6 +369,7 @@ export default {
     },
     peopleChange(){
       this.form.dep = ''
+      this.form.isleave = ''
       this.$refs.list.param.content.type = 0
       this.$refs.list.param.content.dataid = this.form.people
       this.$refs.list.listData()

src/HDrpManagement/dataanalysis/index.vue

@@ -10,7 +10,7 @@
           <el-cascader ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
         </div>
         <div class="mt-10 inline-16">
-          <label  class="search__label" >人员:</label>
+          <label  class="search__label" >业务员:</label>
           <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
             <el-option
                 v-for="item in personnelList"
@@ -20,7 +20,13 @@
             </el-option>
           </el-select>
         </div>
-
+        <div class="mt-10 inline-16">
+          <p class="search__label">状态:</p>
+          <el-select v-model="isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="leaveChange" :disabled="depment == ''">
+            <el-option label="在职" value="1"></el-option>
+            <el-option label="离职" value="2"></el-option>
+          </el-select>
+        </div>
           <div style="margin: auto;">
             <div class="content" >
               作业数据
@@ -83,6 +89,7 @@ export default {
       depment:'',
       deplist:[],
       personnelList:[],
+      isleave:'',
       depmentParam:{
         "id": 20230620102004,
         "content": {
@@ -93,7 +100,10 @@ export default {
         "content": {
           "dataType":"", // 1 作业数据 2 销售数据 3业绩数据
           "type":'', // 0 按人搜素 1 按部门搜索
-          "dataid":"" // 人员id或部门id
+          "dataid":"", // 人员id或部门id
+          "where":{
+            "isleave":"",
+          }
         }
       },
       tableParam:{
@@ -107,7 +117,8 @@ export default {
           "dateType":'',
           "where":{
             "begindate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       }
@@ -211,7 +222,7 @@ export default {
     },
     selectPerson(val){
       this.depment = ''
-      console.log(val)
+      this.isleave = ''
       this.dataid = val
       this.dataParam.content.type = 0
       this.dataParam.content.dataid = this.dataid
@@ -225,6 +236,16 @@ export default {
       this.$refs.clue.queryFollow()
       /*this.$refs.selectdep.clearCheckedNodes()*/
     },
+    leaveChange(){
+      this.dataParam.content.where.isleave = this.isleave
+      this.tableParam.content.where.isleave = this.isleave
+      this.$refs.assignment.queryList()
+      this.$refs.sales.queryList()
+      this.$refs.performance.queryList()
+      this.$refs.clue.queryAdd()
+      this.$refs.clue.queryUpdate()
+      this.$refs.clue.queryFollow()
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },

src/HDrpManagement/projectPortrait/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <basicLayout 
-    ref="list" 
-    tableName="projectChangeTable" 
-    idName="sys_datateamid" 
-    :apiId="{query:20230715111604}" 
+    <basicLayout
+    ref="list"
+    tableName="projectChangeTable"
+    idName="sys_datateamid"
+    :apiId="{query:20230715111604}"
     :options="options"
     :isExport="false"
     @listCreate="listCreate"
@@ -13,21 +13,21 @@
       <div slot="custom" style="display:flex;flex-wrap:wrap">
         <div class="mt-10">
           <label  class="search__label">部门:</label>
-          <el-cascader 
+          <el-cascader
             class="inline-24"
-            ref="selectdep" 
-            size="small" 
-            v-model="form.dep" 
-            :options="selectList.dep" 
-            :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  
-            @change="depChange"  
+            ref="selectdep"
+            size="small"
+            v-model="form.dep"
+            :options="selectList.dep"
+            :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
+            @change="depChange"
             clearable
           ></el-cascader>
         </div>
 
         <div class="mt-10">
-          <label  class="search__label" >人员:</label>
-          <el-select class="inline-24" filterable v-model="form.people" size="small" placeholder="请选择部门" clearable @change="peopleChange">
+          <label  class="search__label" >业务员:</label>
+          <el-select class="inline-24" filterable v-model="form.people" size="small" placeholder="请选择业务员" clearable @change="peopleChange">
             <el-option
                 v-for="item in selectList.hr"
                 :key="item.userid"
@@ -36,7 +36,13 @@
             ></el-option>
           </el-select>
         </div>
-
+        <div class="inline-16">
+          <p class="search__label">状态:</p>
+          <el-select v-model="form.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="selectChange" :disabled="form.dep == ''">
+            <el-option label="在职" value="1"></el-option>
+            <el-option label="离职" value="2"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label  class="search__label" >项目类型:</label>
           <el-select class="inline-24" v-model="form.projecttype" @change="selectChange" placeholder="请选择项目类型" size="mini" clearable filterable>
@@ -89,7 +95,7 @@
           </el-select>
         </div>
 
-        
+
         <div class="mt-10">
           <label  class="search__label">项目状态:</label>
           <el-select class="inline-24" v-model="form.status" placeholder="请选择项目状态" @change="selectChange" size="small" clearable>
@@ -102,7 +108,7 @@
           </el-select>
         </div>
 
-        
+
 
         <div class="mt-10" style="margin-right:10px">
           <label  class="search__label" >时间范围:</label>
@@ -220,7 +226,8 @@ export default {
         "stagename": "",
         "tradefield":"",
         "begindate": "",
-        "enddate": ""
+        "enddate": "",
+        "isleave":''
       },
       selectList:[],
       dateSelect:[],
@@ -351,7 +358,7 @@ export default {
         "content": {
         }
       })
-      this.selectList = res.data 
+      this.selectList = res.data
       this.selectList.dep = this.createMenu(res.data.dep)
       console.log(this.selectList,'范围选择数据');
     },
@@ -363,7 +370,7 @@ export default {
         this.$refs.list.param.content.where.begindate = ''
         this.$refs.list.param.content.where.enddate = ''
       }
-      
+
       this.$refs.list.listData()
     },
     selectChange () {
@@ -378,6 +385,7 @@ export default {
     },
     peopleChange(){
       this.form.dep = ''
+      this.form.isleave = ''
       this.$refs.list.param.content.type = 0
       this.$refs.list.param.content.dataid = this.form.people
       this.$refs.list.listData()

src/HDrpManagement/salerPortrait/index.vue

@@ -25,8 +25,8 @@
         </div>
 
         <div class="mt-10">
-          <label  class="search__label" >人员:</label>
-          <el-select class="inline-16" filterable v-model="people" size="small" placeholder="请选择部门" clearable @change="peopleChange">
+          <label  class="search__label" >业务员:</label>
+          <el-select class="inline-16" filterable v-model="people" size="small" placeholder="请选择业务员" clearable @change="peopleChange">
             <el-option
                 v-for="item in selectList.hr"
                 :key="item.userid"
@@ -35,7 +35,13 @@
             ></el-option>
           </el-select>
         </div>
-
+        <div class="inline-16">
+          <p class="search__label">状态:</p>
+          <el-select v-model="isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="leaveChange" :disabled="dep == ''">
+            <el-option label="在职" value="1"></el-option>
+            <el-option label="离职" value="2"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10" style="margin-right:10px">
           <label  class="search__label" >范围:</label>
           <el-date-picker
@@ -136,7 +142,8 @@ export default {
       dep:'',
       people:'',
       selectList:[],
-      dateSelect:[]
+      dateSelect:[],
+      isleave:''
     }
   },
   computed: {
@@ -260,6 +267,10 @@ export default {
 
       this.$refs.list.listData()
     },
+    leaveChange() {
+      this.$refs.list.param.content.where.isleave = this.isleave
+      this.$refs.list.listData()
+    },
     depChange(val){
       this.people = ''
       this.$refs.list.param.content.type = 1
@@ -268,6 +279,7 @@ export default {
     },
     peopleChange(){
       this.dep = ''
+      this.isleave = ''
       this.$refs.list.param.content.type = 0
       this.$refs.list.param.content.dataid = this.people
       this.$refs.list.listData()

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -6,7 +6,7 @@
       <el-cascader ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
     </div>
     <div class="inline-16">
-      <label  class="search__label" >人员:</label>
+      <label  class="search__label" >业务员:</label>
       <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
         <el-option
             v-for="item in personnelList"
@@ -16,6 +16,13 @@
         </el-option>
       </el-select>
     </div>
+    <div class="inline-16">
+      <p class="search__label">状态:</p>
+      <el-select v-model="isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="leaveChange" :disabled="depment == ''">
+        <el-option label="在职" value="1"></el-option>
+        <el-option label="离职" value="2"></el-option>
+      </el-select>
+    </div>
     <div class="inline-16">
       <p class="search__label">领域:</p>
       <el-select v-model="tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择领域" @change="dataParam.content.where.tradefield = tradefield;projectParam.content.where.tradefield = tradefield;getProportionOfFileModel()">
@@ -227,7 +234,8 @@ export default {
             "begdate":"",
             "enddate":"",
             "departmentid":"",
-            "tradefield":""
+            "tradefield":"",
+            "isleave":"0"
           }
         }
       },
@@ -238,17 +246,19 @@ export default {
           "pageSize": 20,
           "type": '',
           "dataid": '',
-          "dateType": '',
+          "dateType": 1,
           "sa_projstagemagid":'',
           "where": {
             "begdate":"",
             "enddate":"",
-            "tradefield":""
+            "tradefield":"",
+            "isleave":"0"
           }
         }
       },
       dateSelect:[],
       tradefield:'',
+      isleave:'',
       tradefields:[],
     }
   },
@@ -267,6 +277,18 @@ export default {
       sessionStorage.setItem('flagIndex',res.data.length)
       this.renderPie()
     },
+    leaveChange(){
+      if (this.isleave){
+        this.dataParam.content.where.isleave = this.isleave
+        this.projectParam.content.where.isleave = this.isleave
+        this.getProportionOfFileModel()
+      }else {
+        this.dataParam.content.where.isleave = 0
+        this.projectParam.content.where.isleave = 0
+        this.getProportionOfFileModel()
+      }
+
+    },
     createMenu (array) {
       var that = this
       let arr = []
@@ -328,6 +350,7 @@ export default {
     },
     selectPerson(val){
       this.depment = ''
+      this.isleave = ''
       this.dataParam.content.type = 0
       this.dataParam.content.dataid = val
       this.getProportionOfFileModel()