Sfoglia il codice sorgente

数据总览新增业务员状态查询

qymljy 1 anno fa
parent
commit
d491379fb8

+ 285 - 43
src/HDrpManagement/customerData/index.vue

@@ -24,6 +24,24 @@
                 clearable
               ></el-cascader>
             </div>
+            <div class="inline-16">
+              <label  class="search__label" >业务员:</label>
+              <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
+                <el-option
+                    v-for="item in personnelList"
+                    :key="item.index"
+                    :label="item.name"
+                    :value="item.userid">
+                </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="data-all">
               <div style="margin-bottom:20px">客户数据概况</div>
               <div class="data-all-wrapper">
@@ -110,7 +128,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="chartParam1.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {chartParam1.content.type=0;chartParam1.content.dataid=$event;chartParam1.content.depname='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.depname='';chart1Fun()}}"
+                        @change="$event => {if($event) {chartParam1.content.type=0;chartParam1.content.dataid=$event;chartParam1.content.depname='';chartParam1.content.where.isleave='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.depname='';chartParam1.content.where.isleave='';chart1Fun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -120,6 +138,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="chartParam1.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="chart1Fun()" :disabled="chartParam1.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -138,7 +163,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="chart1" style="height:calc(100% - 55px)"></div>
+                <div ref="chart1" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--客户类型-->
@@ -163,7 +188,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="typeTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()}}"
+                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.where.isleave='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.where.isleave='';typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -173,6 +198,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="typeTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="typeMapParam.content.where.isleave = typeTableParam.content.where.isleave;typeTableParam.content.pageNumber=1;$refs.customerTypeTable.listData();customerTypeInit()" :disabled="typeTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="typeTableParam.content.dateType === '全部'?'primary':''" size="small" @click="typeMapParam.content.dateType = '全部';typeTableParam.content.dateType = '全部';
@@ -223,9 +255,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="customerTypeEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="customerTypeEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="customerTypeTable"
                       :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -286,7 +318,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="gradTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"
+                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.where.isleave='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.where.isleave='';gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -296,6 +328,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="gradTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="gradMapParam.content.where.isleave = gradTableParam.content.where.isleave;gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()" :disabled="gradTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="gradTableParam.content.dateType === '全部'?'primary':''" size="small" @click="gradMapParam.content.dateType = '全部';gradTableParam.content.dateType = '全部';
@@ -346,9 +385,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="customerGradEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="customerGradEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="customerGradTable"
                       :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -406,7 +445,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="contactTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}}"
+                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.where.isleave='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.where.isleave='';contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -416,6 +455,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="contactTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="contactMapParam.content.where.isleave = contactTableParam.content.where.isleave;contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()" :disabled="contactTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="contactTableParam.content.dateType === '全部'?'primary':''" size="small" @click="contactMapParam.content.dateType = '全部';contactTableParam.content.dateType = '全部';
@@ -466,9 +512,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="customerContactEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="customerContactEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="customerContactTable"
                       :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -526,7 +572,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="projectTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {projectMapParam.content.type=0;projectMapParam.content.dataid=$event;projectTableParam.content.type=0;projectTableParam.content.dataid=$event;projectTableParam.content.depname='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.depname='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"
+                      @change="$event => {if($event) {projectMapParam.content.type=0;projectMapParam.content.dataid=$event;projectTableParam.content.type=0;projectTableParam.content.dataid=$event;projectTableParam.content.depname='';projectTableParam.content.where.isleave='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.depname='';projectTableParam.content.where.isleave='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -536,6 +582,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="projectTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="projectMapParam.content.where.isleave = projectTableParam.content.where.isleave;projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()" :disabled="projectTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="projectTableParam.content.dateType === '全部'?'primary':''" size="small" @click="projectMapParam.content.dateType = '全部';projectTableParam.content.dateType = '全部';
@@ -586,9 +639,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="customerProjectEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="customerProjectEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="customerProjectTable"
                       :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -646,7 +699,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="fllowTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()}}"
+                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';fllowTableParam.content.where.isleave='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.depname='';fllowTableParam.content.where.isleave='';fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -656,6 +709,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="fllowTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="fllowMapParam.content.where.isleave = fllowTableParam.content.where.isleave;fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()" :disabled="fllowTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="fllowTableParam.content.dateType === '全部'?'primary':''" size="small" @click="fllowMapParam.content.dateType = '全部';fllowTableParam.content.dateType = '全部';
@@ -706,9 +766,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="customerFllowEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="customerFllowEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="customerFllowTable"
                       :tablecols="tool.tabelCol($route.name).typeTable.tablecols"
@@ -766,7 +826,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="chartParam2.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {chartParam2.content.type=0;chartParam2.content.dataid=$event;chartParam2.content.depname='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.depname='';chart2Fun()}}"
+                        @change="$event => {if($event) {chartParam2.content.type=0;chartParam2.content.dataid=$event;chartParam2.content.depname='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.depname='';chartParam2.content.where.isleave='';chart2Fun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -776,6 +836,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="chartParam2.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="chart2Fun()" :disabled="chartParam2.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -794,7 +861,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="chart2" style="height:calc(100% - 55px)"></div>
+                <div ref="chart2" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--有效客户未跟进情况-->
@@ -819,7 +886,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="unfllowTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
+                      @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';unfllowTableParam.content.where.isleave='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';unfllowTableParam.content.where.isleave='';unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -829,6 +896,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="unfllowTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="unfllowMapParam.content.where.isleave = unfllowTableParam.content.where.isleave;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()" :disabled="unfllowTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label" >客户类型:</label>
                       <el-select v-model="unfllowTableParam.content.where.type" placeholder="请选择" size="small"
@@ -895,7 +969,7 @@
                 <div style="height:calc(100% - 55px)">
                   <div ref="customerUnfllowEl" style="height:30%"></div>
                 <div style="font-size:16px;color:#333333;margin:10px 0">{{ unfllowStatus ? unfllowStatus : '全部' }}</div>
-                  <div :style="{height:windowWidth>1521 || isFull?'calc(70% - 100px)':'calc(66% - 100px)'}">
+                  <div :style="{height:windowWidth>1521 || isFull?'calc(72% - 100px)':'calc(61% - 100px)'}">
                     <pageTable
                       ref="customerUnfllowTable"
                       :tablecols="tool.tabelCol($route.name).typeTable1.tablecols.splice(0,tool.tabelCol($route.name).typeTable1.tablecols.length - 1)"
@@ -953,7 +1027,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="projectParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                        @change="$event => {if($event) {projectParam.content.type=0;projectParam.content.dataid=$event;projectParam.content.depname='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.depname='';chart3Fun()}}"
+                        @change="$event => {if($event) {projectParam.content.type=0;projectParam.content.dataid=$event;projectParam.content.depname='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.depname='';projectParam.content.where.isleave='';chart3Fun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -963,6 +1037,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="projectParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="chart3Fun()" :disabled="projectParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -981,7 +1062,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="chart3" style="height:calc(100% - 55px)"></div>
+                <div ref="chart3" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
           </div>
@@ -1019,6 +1100,7 @@ export default {
       },
       unfllowStatus:'',
       person:'',
+      isleave:'',
       dualAxes:'',
       customerTypeMap:'',
       uvBillData:[],
@@ -1045,7 +1127,10 @@ export default {
             "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
             "type": '',
             "dataid": '',
-            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
+            "where":{
+              "isleave":""
+            }
         }
       },
       //近12月跟进分析
@@ -1058,7 +1143,11 @@ export default {
             "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
             "type": '',
             "dataid": '',
-            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
+            "where":{
+              "isleave":''
+            }
+
         }
       },
       //近12月客户报价
@@ -1071,7 +1160,10 @@ export default {
             "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
             "type": '',
             "dataid": '',
-            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+            "enddate": `${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
+            "where":{
+              "isleave":""
+            }
         }
       },
       //客户类型
@@ -1086,7 +1178,8 @@ export default {
           "dateType":"全部",
           "where":{
             "begdate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       },
@@ -1102,7 +1195,8 @@ export default {
           "where": {
               "customerstype":"",// 客户各种类型 以及 无类型  ------ 客户类型情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "isleave":""
           }
         }
       },
@@ -1123,7 +1217,8 @@ export default {
           "dateType":"全部",
           "where":{
             "begdate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       },
@@ -1139,7 +1234,8 @@ export default {
           "where": {
               "grade": "", // 1 2 3 4 5 无等级  ------客户等级统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "isleave":""
           }
         }
       },
@@ -1160,7 +1256,8 @@ export default {
           "dateType":"全部",
           "where":{
             "begdate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       },
@@ -1176,7 +1273,8 @@ export default {
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------客户联系人情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "isleave":""
           }
         }
       },
@@ -1197,7 +1295,8 @@ export default {
           "dateType":"全部",
           "where":{
             "begdate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       },
@@ -1213,7 +1312,8 @@ export default {
           "where": {
               "isproject": "", //无关联项目 有关联项目  ------客户关联项目情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "isleave":""
           }
         }
       },
@@ -1234,7 +1334,8 @@ export default {
           "dateType":"全部",
           "where":{
             "begdate":"",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
         }
       },
@@ -1250,7 +1351,8 @@ export default {
           "where": {
               "isfollowup": "", // 有跟进 无跟进------客户跟进情况统计列表使用该字段
               "begdate":"",
-              "enddate":""
+              "enddate":"",
+              "isleave":""
           }
         }
       },
@@ -1271,7 +1373,8 @@ export default {
           "where": {
               "tradingstatus": "",//成交状态
               "type": "",//客户类型
-              "grade": ""//客户等级
+              "grade": "",//客户等级
+              "isleave":""
           }
         }
       },
@@ -1288,7 +1391,8 @@ export default {
             "tradingstatus": "",//成交状态
             "type": "",//客户类型
             "grade": "",//客户等级
-            "dateType": ""// 时间阶段
+            "dateType": "",// 时间阶段
+            "isleave":""
           }
         }
       },
@@ -1302,6 +1406,9 @@ export default {
           "dataid": '',
           "type":"",
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "where":{
+            "isleave":""
+          }
         }
       },
       newFollowup:[]
@@ -1327,6 +1434,7 @@ export default {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
+      this.person = JSON.parse(sessionStorage.getItem('accountinfo')).name
     },
     //12月新增初始化
     async chart1Fun (init) {
@@ -1962,6 +2070,7 @@ export default {
       return arr
     },
     selectDep (val) {
+      this.person = ''
       let id = val[val.length - 1]
       if (val.length) {
         /*数据总览*/
@@ -2110,6 +2219,139 @@ export default {
         this.$refs.customerUnfllowTable.listData()
       }
     },
+    selectPerson(id){
+      this.depment = ''
+      this.isleave = ''
+      this.dataAllParam.content.dataid = id
+      this.dataAllParam.content.type = 0
+      this.dataAllParam.content.username = this.person
+      this.dataAllParam.content.where.isleave = ''
+      this.getdataAll()
+
+      this.chartParam1.content.dataid = id
+      this.chartParam1.content.type = 0
+      this.chartParam1.content.username = this.person
+      this.chartParam1.content.depname = ''
+      this.chartParam1.content.where.isleave = ''
+      this.chart1Fun()
+
+      this.chartParam2.content.dataid = id
+      this.chartParam2.content.type = 0
+      this.chartParam2.content.username = this.person
+      this.chartParam2.content.where.isleave = ''
+      this.chart2Fun()
+
+      this.projectParam.content.dataid = id
+      this.projectParam.content.type = 0
+      this.projectParam.content.username = this.person
+      this.projectParam.content.where.isleave = ''
+      this.chart3Fun()
+
+      this.typeMapParam.content.dataid = id
+      this.typeMapParam.content.type = 0
+      this.customerTypeInit()
+      this.typeTableParam.content.dataid = id
+      this.typeTableParam.content.type = 0
+      this.typeTableParam.content.username = this.person
+      this.typeTableParam.content.where.isleave = ''
+      this.$refs.customerTypeTable.listData()
+
+      this.gradMapParam.content.dataid = id
+      this.gradMapParam.content.type = 0
+      this.customerGradInit()
+      this.gradTableParam.content.dataid = id
+      this.gradTableParam.content.type = 0
+      this.gradTableParam.content.username = this.person
+      this.gradTableParam.content.where.isleave = ''
+      this.$refs.customerGradTable.listData()
+
+
+      this.contactMapParam.content.dataid = id
+      this.contactMapParam.content.type = 0
+      this.customerContactInit()
+      this.contactTableParam.content.dataid = id
+      this.contactTableParam.content.type = 0
+      this.contactTableParam.content.username = this.person
+      this.contactTableParam.content.where.isleave = ''
+      this.$refs.customerContactTable.listData()
+
+      this.projectMapParam.content.dataid = id
+      this.projectMapParam.content.type = 0
+      this.customerProjectInit()
+      this.projectTableParam.content.dataid = id
+      this.projectTableParam.content.type = 0
+      this.projectTableParam.content.username = this.person
+      this.projectTableParam.content.where.isleave = ''
+      this.$refs.customerProjectTable.listData()
+
+      this.fllowMapParam.content.dataid = id
+      this.fllowMapParam.content.type = 0
+      this.customerFllowInit()
+      this.fllowTableParam.content.dataid = id
+      this.fllowTableParam.content.type = 0
+      this.fllowTableParam.content.username = this.person
+      this.fllowTableParam.content.where.isleave = ''
+      this.$refs.customerFllowTable.listData()
+
+      this.unfllowMapParam.content.dataid = id
+      this.unfllowMapParam.content.type = 0
+      this.customerUnfllowInit()
+      this.unfllowTableParam.content.dataid = id
+      this.unfllowTableParam.content.type = 0
+      this.unfllowTableParam.content.username = this.person
+      this.unfllowTableParam.content.where.isleave = ''
+      this.$refs.customerUnfllowTable.listData()
+    },
+    leaveChange(){
+
+      this.dataAllParam.content.where.isleave = this.isleave
+      this.getdataAll()
+
+      this.chartParam1.content.where.isleave = this.isleave
+      this.chart1Fun()
+
+      this.chartParam2.content.where.isleave = this.isleave
+      this.chart2Fun()
+
+      this.projectParam.content.where.isleave = this.isleave
+      this.chart3Fun()
+
+      this.typeTableParam.content.where.isleave = this.isleave
+      this.customerTypeInit()
+
+      this.typeMapParam.content.where.isleave = this.isleave
+      this.$refs.customerTypeTable.listData()
+
+      this.gradMapParam.content.where.isleave = this.isleave
+      this.customerGradInit()
+
+      this.gradTableParam.content.where.isleave = this.isleave
+      this.$refs.customerGradTable.listData()
+
+      this.contactMapParam.content.where.isleave = this.isleave
+      this.customerContactInit()
+
+      this.contactTableParam.content.where.isleave = this.isleave
+      this.$refs.customerContactTable.listData()
+
+      this.projectMapParam.content.where.isleave = this.isleave
+      this.customerProjectInit()
+
+      this.projectTableParam.content.where.isleave = this.isleave
+      this.$refs.customerProjectTable.listData()
+
+      this.fllowMapParam.content.where.isleave = this.isleave
+      this.customerFllowInit()
+
+      this.fllowTableParam.content.where.isleave = this.isleave
+      this.$refs.customerFllowTable.listData()
+
+      this.unfllowMapParam.content.where.isleave = this.isleave
+      this.customerUnfllowInit()
+
+      this.unfllowTableParam.content.where.isleave = this.isleave
+      this.$refs.customerUnfllowTable.listData()
+    },
     async getCustomerType () {
       const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({

+ 411 - 54
src/HDrpManagement/projectData/index.vue

@@ -26,6 +26,24 @@
                 clearable
               ></el-cascader>
             </div>
+            <div class="inline-16">
+              <label  class="search__label" >业务员:</label>
+              <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
+                <el-option
+                    v-for="item in personnelList"
+                    :key="item.index"
+                    :label="item.name"
+                    :value="item.userid">
+                </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="data-all">
               <div style="margin-bottom:20px">项目数据概况</div>
               <div class="data-all-wrapper">
@@ -120,7 +138,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="typeTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()}}"
+                      @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';typeTableParam.content.where.isleave='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';typeTableParam.content.where.isleave='';typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()}}"
                     >
                         <el-option
                             v-for="item in personnelList"
@@ -130,6 +148,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="typeTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="typeMapParam.content.where.isleave = typeTableParam.content.where.isleave;typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()" :disabled="typeTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="typeTableParam.content.dateType === '全部'?'primary':''" size="small" @click="typeMapParam.content.dateType = '全部';typeTableParam.content.dateType = '全部';
@@ -183,10 +208,10 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="typeEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="typeEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
 <!--                  <div ref="typeEl" style="width:30%"></div>-->
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
 <!--                  <div class="panel-table" style="width:70%">-->
                     <pageTable
                       ref="typeTable"
@@ -253,7 +278,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="gradTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()}}"
+                      @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';gradTableParam.content.where.isleave='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';gradTableParam.content.where.isleave='';gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -263,6 +288,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="gradTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="gradTableParam.content.where.isleave = gradMapParam.content.where.isleave;gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()" :disabled="gradTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="gradTableParam.content.dateType === '全部'?'primary':''" size="small" @click="gradMapParam.content.dateType = '全部';gradTableParam.content.dateType = '全部';
@@ -316,9 +348,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="gradEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="gradEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="gradTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -394,7 +426,7 @@
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="scoreTableParam1.content.username" filterable placeholder="请选择" size="small"
-                    @change="$event => {if($event) {scoreMapParam1.content.type=0;scoreMapParam1.content.dataid=$event;scoreTableParam1.content.type=0;scoreTableParam1.content.dataid=$event;scoreTableParam1.content.depname='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';gradMapParam.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.depname='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()}}"
+                    @change="$event => {if($event) {scoreMapParam1.content.type=0;scoreMapParam1.content.dataid=$event;scoreTableParam1.content.type=0;scoreTableParam1.content.dataid=$event;scoreTableParam1.content.depname='';scoreTableParam1.content.where.isleave='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';gradMapParam.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.depname='';scoreTableParam1.content.where.isleave='';scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()}}"
                     >
                       <el-option
                           v-for="item in personnelList"
@@ -404,6 +436,13 @@
                       </el-option>
                     </el-select>
                   </div>
+                  <div class="mt-10 inline-16">
+                    <p class="search__label">状态:</p>
+                    <el-select v-model="scoreTableParam1.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="scoreMapParam1.content.where.isleave = scoreTableParam1.content.where.isleave;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()" :disabled="scoreTableParam1.content.type != '1'">
+                      <el-option label="在职" value="1"></el-option>
+                      <el-option label="离职" value="2"></el-option>
+                    </el-select>
+                  </div>
                   <div class="mt-10 inline-16">
                     <el-checkbox true-label="0" false-label="1" v-model="scoreMapParam1.content.where.unfinish" @change="scoreTableParam1.content.where.unfinish = scoreMapParam1.content.where.unfinish;scoreTableParam1.content.pageNumber = 1;$refs.scoreTable.listData();scoreInit()">包含失败、结案项目</el-checkbox>
                   </div>
@@ -444,7 +483,7 @@
                       </div>
                     </div>
                     <pageTable
-                      style="height:calc(100% - 60px) !important"
+                      :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 60px)'"
                       ref="scoreTable"
                       :tablecols="tool.tabelCol($route.name).projectTable2.tablecols.splice(0,tool.tabelCol($route.name).projectTable2.tablecols.length - 1)"
                       :param="scoreTableParam1"
@@ -511,7 +550,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="addParam.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {addParam.content.type=0;addParam.content.dataid=$event;addParam.content.depname='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.depname='';addFun()}}"
+                        @change="$event => {if($event) {addParam.content.type=0;addParam.content.dataid=$event;addParam.content.depname='';addParam.content.where.isleave='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.depname='';addParam.content.where.isleave='';addFun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -521,6 +560,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="addParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="addFun()" :disabled="addParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -539,7 +585,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="addEl" style="height: calc(100% - 55px)"></div>
+                <div ref="addEl":style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--12月项目报备-->
@@ -564,7 +610,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="baobeiParam.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {baobeiParam.content.type=0;baobeiParam.content.dataid=$event;baobeiParam.content.depname='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.depname='';baobeiFun()}}"
+                        @change="$event => {if($event) {baobeiParam.content.type=0;baobeiParam.content.dataid=$event;baobeiParam.content.depname='';baobeiParam.content.where.isleave='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.depname='';baobeiParam.content.where.isleave='';baobeiFun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -574,6 +620,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="baobeiParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="baobeiFun()" :disabled="baobeiParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -592,7 +645,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="baobeiEl" style="height:calc(100% - 55px)"></div>
+                <div ref="baobeiEl" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--12月项目报价-->
@@ -617,7 +670,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="baojiaParam.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {baojiaParam.content.type=0;baojiaParam.content.dataid=$event;baojiaParam.content.depname='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.depname='';baojiaFun()}}"
+                        @change="$event => {if($event) {baojiaParam.content.type=0;baojiaParam.content.dataid=$event;baojiaParam.content.depname='';baojiaParam.content.where.isleave='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.depname='';baojiaParam.content.where.isleave='';baojiaFun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -627,6 +680,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="baojiaParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="baojiaFun()" :disabled="baojiaParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -645,7 +705,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="baojiaEl" style="height:calc(100% - 55px)"></div>
+                <div ref="baojiaEl" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--12月项目跟进-->
@@ -670,7 +730,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="fllowParam.content.username" filterable placeholder="请选择" size="small"
                         :popper-append-to-body="false"
-                        @change="$event => {if($event) {fllowParam.content.type=0;fllowParam.content.dataid=$event;fllowParam.content.depname='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.depname='';fllowFun()}}"
+                        @change="$event => {if($event) {fllowParam.content.type=0;fllowParam.content.dataid=$event;fllowParam.content.depname='';fllowParam.content.where.isleave='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.depname='';fllowParam.content.where.isleave='';fllowFun()}}"
                         >
                         <el-option
                             v-for="item in personnelList"
@@ -680,6 +740,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="fllowParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="fllowFun()" :disabled="fllowParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-15">
                       <label  class="search__label" >分析日期:</label>
                       <el-date-picker
@@ -698,7 +765,7 @@
                     </div>
                   </div>
                 </div>
-                <div ref="fllowEl" style="height:calc(100% - 55px)"></div>
+                <div ref="fllowEl" :style="windowWidth<1574?'height:calc(100% - 100px)':windowWidth<1593?'height:calc(100% - 90px)':'height:calc(100% - 55px)'"></div>
               </div>
             </div>
             <!--项目跟进情况-->
@@ -723,9 +790,9 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="fllowTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';
+                      @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';fllowTableParam.content.where.isleave='';
                         fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';
-                        fllowTableParam.content.depname='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()}}"
+                        fllowTableParam.content.depname='';fllowTableParam.content.where.isleave='';fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -735,6 +802,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="fllowTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="fllowMapParam.content.where.isleave = fllowTableParam.content.where.isleave;fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()" :disabled="fllowTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="fllowTableParam.content.dateType === '全部'?'primary':''" size="small" @click="fllowMapParam.content.dateType = '全部';fllowTableParam.content.dateType = '全部';
@@ -788,9 +862,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="projectFllowEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="projectFllowEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="projectFllowTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -856,7 +930,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="contactTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()}}"
+                      @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';contactTableParam.content.where.isleave='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';contactTableParam.content.where.isleave='';contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -866,6 +940,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="contactTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="contactMapParam.content.where.isleave = contactTableParam.content.where.isleave;contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()" :disabled="contactTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="contactTableParam.content.dateType === '全部'?'primary':''" size="small" @click="contactMapParam.content.dateType = '全部';contactTableParam.content.dateType = '全部';
@@ -919,9 +1000,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="projectContactEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="projectContactEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="projectContactTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -987,7 +1068,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="customerTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {customerMapParam.content.type=0;customerMapParam.content.dataid=$event;customerTableParam.content.type=0;customerTableParam.content.dataid=$event;customerTableParam.content.depname='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.depname='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()}}"
+                      @change="$event => {if($event) {customerMapParam.content.type=0;customerMapParam.content.dataid=$event;customerTableParam.content.type=0;customerTableParam.content.dataid=$event;customerTableParam.content.depname='';customerTableParam.content.where.isleave='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.depname='';customerTableParam.content.where.isleave='';customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -997,6 +1078,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="customerTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="customerMapParam.content.where.isleave = customerTableParam.content.where.isleave;customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()" :disabled="customerTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="customerTableParam.content.dateType === '全部'?'primary':''" size="small" @click="customerMapParam.content.dateType = '全部';customerTableParam.content.dateType = '全部';
@@ -1050,9 +1138,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="projectCustomerEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="projectCustomerEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="projectCustomerTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -1118,7 +1206,7 @@
                       <label  class="search__label" >业务员:</label>
                       <el-select v-model="scoreTableParam.content.username" filterable placeholder="请选择" size="small"
                       :popper-append-to-body="false"
-                      @change="$event => {if($event) {scoreMapParam.content.type=0;scoreMapParam.content.dataid=$event;scoreTableParam.content.type=0;scoreTableParam.content.dataid=$event;scoreTableParam.content.depname='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.depname='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()}}"
+                      @change="$event => {if($event) {scoreMapParam.content.type=0;scoreMapParam.content.dataid=$event;scoreTableParam.content.type=0;scoreTableParam.content.dataid=$event;scoreTableParam.content.depname='';scoreTableParam.content.where.isleave='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.depname='';scoreTableParam.content.where.isleave='';scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -1128,6 +1216,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="scoreTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="scoreMapParam.content.where.isleave = scoreTableParam.content.where.isleave;scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()" :disabled="scoreTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
                         <el-button :type="scoreTableParam.content.dateType === '全部'?'primary':''" size="small" @click="scoreMapParam.content.dateType = '全部';scoreTableParam.content.dateType = '全部';
@@ -1181,9 +1276,9 @@
                     </div>
                   </div>
                 </div>
-                <div class="panel-content" :style="windowWidth<1611?'height:calc(100% - 99px)':'height:calc(100% - 53px)'">
-                  <div ref="projectScoreEl" :style="windowWidth<1505?'width:54%':windowWidth<1805?'width:54%':windowWidth<2500?'width:45%':'width:30%'"></div>
-                  <div class="panel-table" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+                <div class="panel-content" :style="windowWidth<1335?'height:calc(100% - 140px)':windowWidth<2006?'height:calc(100% - 93px)':windowWidth<2037?'height:calc(100% - 83px)':'height:calc(100% - 53px)'">
+                  <div ref="projectScoreEl" :style="windowWidth<1505?'width:54%;height:calc(100%)':windowWidth<1805?'width:54%;height:calc(100%)':windowWidth<2500?'width:45%':'width:30%'"></div>
+                  <div class="panel-table" :style="windowWidth<1505?'width:46%;height:calc(100%)':windowWidth<1805?'width:46%;height:calc(100%)':windowWidth<2500?'width:55%':'width:70%'">
                     <pageTable
                       ref="projectScoreTable"
                       :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -1258,6 +1353,13 @@
                         </el-option>
                       </el-select>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <p class="search__label">状态:</p>
+                      <el-select v-model="unfllowTableParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="unfllowMapParam.content.where.isleave = unfllowTableParam.content.where.isleave;unfllowTableParam.content.pageNumber = 1;$refs.customerUnfllowTable.listData();customerUnfllowInit()" :disabled="unfllowTableParam.content.type != '1'">
+                        <el-option label="在职" value="1"></el-option>
+                        <el-option label="离职" value="2"></el-option>
+                      </el-select>
+                    </div>
                     <div class="mt-10 inline-16">
                       <label  class="search__label">项目类型:</label>
                       <el-select
@@ -1303,7 +1405,7 @@
                 <div style="height:calc(100% - 55px)">
                   <div ref="customerUnfllowEl" style="height:30%"></div>
                   <div style="font-size:16px;color:#333333;margin:10px 0">{{ unfllowStatus ? unfllowStatus : '全部' }}</div>
-                  <div :style="{height:windowWidth>1784?'70%':'65%'}">
+                  <div :style="{height:windowWidth<1359?'60%':windowWidth<1372?'62%':windowWidth<2110?'66%':'71%'}">
                     <pageTable
                       style="height:calc(100% - 50px)"
                       v-if="projectType[0].value != ''"
@@ -1393,6 +1495,27 @@
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
                       @change="$event => {if($event.length) {[$event.length - 1];dateParam.content.type=1;dateParam.content.username='';getDate()} else {dateParam.content.dataid='';dateParam.content.type='';dateParam.content.username='';getDate()}}"></el-cascader>
                   </div>
+                  <div class="mt-10 inline-16">
+                    <label  class="search__label" >业务员:</label>
+                    <el-select v-model="dateParam.content.username" filterable placeholder="请选择" size="small"
+                               :popper-append-to-body="false"
+                               @change="$event => {if($event) {dateParam.content.type=0;dateParam.content.dataid=$event;dateParam.content.depname='';dateParam.content.where.isleave='';getDate()} else {dateParam.content.type='';dateParam.content.dataid='';dateParam.content.depname='';dateParam.content.where.isleave='';getDate()}}"
+                    >
+                      <el-option
+                          v-for="item in personnelList"
+                          :key="item.index"
+                          :label="item.name"
+                          :value="item.userid">
+                      </el-option>
+                    </el-select>
+                  </div>
+                  <div class="mt-10 inline-16">
+                    <p class="search__label">状态:</p>
+                    <el-select v-model="dateParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="getDate()" :disabled="dateParam.content.type != '1'">
+                      <el-option label="在职" value="1"></el-option>
+                      <el-option label="离职" value="2"></el-option>
+                    </el-select>
+                  </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label">项目类型:</label>
                     <el-select v-model="dateParam.content.where.projecttype" placeholder="请选择项目类型" @change="getDate" size="small" clearable>
@@ -1511,6 +1634,7 @@ export default {
       scoreStatus:'',
       unfllowStatus:'',
       person:'',
+      isleave:'',
       //项目类型分析
       typeMap:'',
       typeDate:[],
@@ -1525,7 +1649,8 @@ export default {
               "projecttype":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1545,7 +1670,8 @@ export default {
               "projecttype":"",//   项目类型分析统计列表使用该最低端
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1566,7 +1692,8 @@ export default {
               "grade":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1581,7 +1708,8 @@ export default {
               "grade": "", //  项目等级统计列表使用该字段
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1597,7 +1725,8 @@ export default {
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "where":{
-            "unfinish":'0'
+            "unfinish":'0',
+            "isleave":''
           }
         }
       },
@@ -1610,7 +1739,8 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "where":{
               "taskType":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           },
           "pageSize":20,
           "pageNumber":1
@@ -1627,7 +1757,10 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+          "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
+          "where":{
+            "isleave":''
+          }
         }
       },
       addData: {
@@ -1643,6 +1776,9 @@ export default {
           "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
+          "where":{
+            "isleave":''
+          }
         }
       },
       baobeiData: {
@@ -1658,6 +1794,9 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
           "dataid": '',
+          "where":{
+            "isleave":''
+          }
         }
       },
       fllowData: {
@@ -1671,6 +1810,9 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
           "dataid": '',
+          "where":{
+            "isleave":''
+          }
         }
       },
       baojiaData: {
@@ -1690,7 +1832,8 @@ export default {
               "grade":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1705,7 +1848,8 @@ export default {
               "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1726,7 +1870,8 @@ export default {
               "grade":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1741,7 +1886,8 @@ export default {
               "iscontacts": "", //无联系人 有联系人  ------项目联系人情况统计列表使用该字段
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1762,7 +1908,8 @@ export default {
               "iscustomers":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1777,7 +1924,8 @@ export default {
               "iscustomers": "", //无关联客户 有关联客户  ------项目关联客户情况统计列表使用该字段
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1798,7 +1946,8 @@ export default {
               "istask":"",
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1813,7 +1962,8 @@ export default {
               "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段
               "begdate":"",
               "enddate":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":""
           }
         }
       },
@@ -1831,7 +1981,8 @@ export default {
             "enddate":new Date().getFullYear() + '-' + (new Date().getMonth() + 1)  + '-' + new Date().getDate(),
             "where": {
                 "projecttype":"",
-                "unfinish":'0'
+                "unfinish":'0',
+                "isleave":''
             }
         }
       },
@@ -1845,7 +1996,8 @@ export default {
           "where": {
               "projecttype":"",
               "dateType":"",
-              "unfinish":'0'
+              "unfinish":'0',
+              "isleave":''
           }
         }
       },
@@ -1865,7 +2017,8 @@ export default {
             "projecttype": "",//项目类型
             "grade":"",//项目等级
             "tradefield":"",//领域
-            "sa_projectid":""//项目id
+            "sa_projectid":"",//项目id
+            "isleave":''
           }
         }
       },
@@ -1876,6 +2029,9 @@ export default {
           "dataid": '',
           "type":"",
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "where":{
+            "isleave":''
+          }
         }
       },
     }
@@ -1900,6 +2056,7 @@ export default {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
+      this.person = JSON.parse(sessionStorage.getItem('accountinfo')).name
     },
     //12月跟进初始化
     async chart2Fun (init) {
@@ -2744,6 +2901,7 @@ export default {
       return arr
     },
     selectDep (val) {
+      this.person = ''
       let id = val[val.length - 1]
       if (val.length) {
         /*数据总览*/
@@ -2965,6 +3123,205 @@ export default {
         this.getDate()
       }
     },
+    selectPerson(id){
+      this.depment = ''
+      this.isleave = ''
+      /*数据总览*/
+      this.dataAllParam.content.dataid = id
+      this.dataAllParam.content.type = 0
+      this.dataAllParam.content.username = this.person
+      this.dataAllParam.content.where.isleave = ''
+      this.getdataAll()
+
+      /*项目类型分析*/
+      this.typeMapParam.content.dataid = id
+      this.typeMapParam.content.type = 0
+      this.typeInit()
+      this.typeTableParam.content.dataid = id
+      this.typeTableParam.content.type = 0
+      this.typeTableParam.content.username = this.person
+      this.typeTableParam.content.where.isleave = ''
+      this.$refs.typeTable.listData()
+
+      /*项目等级分析*/
+      this.gradMapParam.content.dataid = id
+      this.gradMapParam.content.type = 0
+      this.gradInit()
+      this.gradTableParam.content.dataid = id
+      this.gradTableParam.content.type = 0
+      this.gradTableParam.content.username = this.person
+      this.gradTableParam.content.where.isleave = ''
+      this.$refs.gradTable.listData()
+
+      /*项目评估分析*/
+      this.scoreMapParam1.content.dataid = id
+      this.scoreMapParam1.content.type = 0
+      this.scoreInit()
+      this.scoreTableParam1.content.dataid = id
+      this.scoreTableParam1.content.type = 0
+      this.scoreTableParam1.content.username = this.person
+      this.scoreTableParam1.content.where.isleave = ''
+      this.$refs.scoreTable.listData()
+
+      /*近12月项目新增分析*/
+      this.addParam.content.dataid = id
+      this.addParam.content.type = 0
+      this.addParam.content.username = this.person
+      this.addParam.content.where.isleave = ''
+      this.addFun()
+
+      /*近12月项目报备分析*/
+      this.baobeiParam.content.dataid = id
+      this.baobeiParam.content.type = 0
+      this.baobeiParam.content.username = this.person
+      this.baobeiParam.content.where.isleave = ''
+      this.baobeiFun()
+
+      /*近12月项目跟进分析*/
+      this.fllowParam.content.dataid = id
+      this.fllowParam.content.type = 0
+      this.fllowParam.content.username = this.person
+      this.fllowParam.content.where.isleave = ''
+      this.fllowFun()
+
+      /*近12月项目报价分析*/
+      this.baojiaParam.content.dataid = id
+      this.baojiaParam.content.type = 0
+      this.baojiaParam.content.username = this.person
+      this.baojiaParam.content.where.isleave = ''
+      this.baojiaFun()
+
+      /*近12月项目跟进分析*/
+      this.fllowMapParam.content.dataid = id
+      this.fllowMapParam.content.type = 0
+      this.fllowInit()
+      this.fllowTableParam.content.dataid = id
+      this.fllowTableParam.content.type = 0
+      this.fllowTableParam.content.username = this.person
+      this.fllowTableParam.content.where.isleave = ''
+      this.$refs.projectFllowTable.listData()
+
+      /*项目联系人情况统计*/
+      this.contactMapParam.content.dataid = id
+      this.contactMapParam.content.type = 0
+      this.contactInit()
+      this.contactTableParam.content.dataid = id
+      this.contactTableParam.content.type = 0
+      this.contactTableParam.content.username = this.person
+      this.contactTableParam.content.where.isleave = ''
+      this.$refs.projectContactTable.listData()
+
+      /*项目关联客户情况统计*/
+      this.customerMapParam.content.dataid = id
+      this.customerMapParam.content.type = 0
+      this.customerInit()
+      this.customerTableParam.content.dataid = id
+      this.customerTableParam.content.type = 0
+      this.customerTableParam.content.username = this.person
+      this.customerTableParam.content.where.isleave = ''
+      this.$refs.projectCustomerTable.listData()
+
+      /*项目评估情况统计*/
+      this.scoreMapParam.content.dataid = id
+      this.scoreMapParam.content.type = 0
+      this.projectScoreInit()
+      this.scoreTableParam.content.dataid = id
+      this.scoreTableParam.content.type = 0
+      this.scoreTableParam.content.username = this.person
+      this.scoreTableParam.content.where.isleave = ''
+      this.$refs.projectScoreTable.listData()
+
+      /*有效项目未跟进天数分析*/
+      this.unfllowMapParam.content.dataid = id
+      this.unfllowMapParam.content.type = 0
+      this.customerUnfllowInit()
+      this.unfllowTableParam.content.dataid = id
+      this.unfllowTableParam.content.type = 0
+      this.unfllowTableParam.content.username = this.person
+      this.unfllowTableParam.content.where.isleave = ''
+      this.$refs.customerUnfllowTable.listData()
+
+      /*项目生命周期分析*/
+      this.dateParam.content.dataid = id
+      this.dateParam.content.type = 0
+      this.dateParam.content.username = this.person
+      this.dateParam.content.where.isleave = ''
+      this.getDate()
+    },
+    leaveChange(){
+      /*数据总览*/
+
+      this.dataAllParam.content.where.isleave = this.isleave
+      this.getdataAll()
+
+      /*项目类型分析*/
+      this.typeMapParam.content.where.isleave = this.isleave
+      this.typeInit()
+      this.typeTableParam.content.where.isleave = this.isleave
+      this.$refs.typeTable.listData()
+
+      /*项目等级分析*/
+      this.gradMapParam.content.where.isleave = this.isleave
+      this.gradInit()
+      this.gradTableParam.content.where.isleave = this.isleave
+      this.$refs.gradTable.listData()
+
+      /*项目评估分析*/
+      this.scoreMapParam1.content.where.isleave = this.isleave
+      this.scoreInit()
+      this.scoreTableParam1.content.where.isleave = this.isleave
+      this.$refs.scoreTable.listData()
+
+      /*近12月项目新增分析*/
+      this.addParam.content.where.isleave = this.isleave
+      this.addFun()
+
+      /*近12月项目报备分析*/
+      this.baobeiParam.content.where.isleave = this.isleave
+      this.baobeiFun()
+
+      /*近12月项目跟进分析*/
+      this.fllowParam.content.where.isleave = this.isleave
+      this.fllowFun()
+
+      /*近12月项目报价分析*/
+      this.baojiaParam.content.where.isleave = this.isleave
+      this.baojiaFun()
+
+      /*近12月项目跟进分析*/
+      this.fllowMapParam.content.where.isleave = this.isleave
+      this.fllowInit()
+      this.fllowTableParam.content.where.isleave = this.isleave
+      this.$refs.projectFllowTable.listData()
+
+      /*项目联系人情况统计*/
+      this.contactMapParam.content.where.isleave = this.isleave
+      this.contactInit()
+      this.contactTableParam.content.where.isleave = this.isleave
+      this.$refs.projectContactTable.listData()
+
+      /*项目关联客户情况统计*/
+      this.customerMapParam.content.where.isleave = this.isleave
+      this.customerInit()
+      this.customerTableParam.content.where.isleave = this.isleave
+      this.$refs.projectCustomerTable.listData()
+
+      /*项目评估情况统计*/
+      this.scoreMapParam.content.where.isleave = this.isleave
+      this.projectScoreInit()
+      this.scoreTableParam.content.where.isleave = this.isleave
+      this.$refs.projectScoreTable.listData()
+
+      /*有效项目未跟进天数分析*/
+      this.unfllowMapParam.content.where.isleave = this.isleave
+      this.customerUnfllowInit()
+      this.unfllowTableParam.content.where.isleave = this.isleave
+      this.$refs.customerUnfllowTable.listData()
+
+      /*项目生命周期分析*/
+      this.dateParam.content.where.isleave = this.isleave
+      this.getDate()
+    },
     selectRow (data) {
       this.projectname = data.projectname
       this.dateParam.content.where.sa_projectid = data.sa_projectid

+ 40 - 6
src/views/clueData/index.vue

@@ -13,6 +13,24 @@
 <!--              <el-cascader ref="selectdep" size="small" v-model="departmentid" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>-->
               <el-cascader class="inline-16" placement="bottom" ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep" clearable></el-cascader>
             </div>
+            <div class="inline-16">
+              <label  class="search__label" >业务员:</label>
+              <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
+                <el-option
+                    v-for="item in personnelList"
+                    :key="item.index"
+                    :label="item.name"
+                    :value="item.userid">
+                </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>
           <!--  数字看板      -->
           <digitalSigns ref="digitalSigns"></digitalSigns>
@@ -44,6 +62,8 @@ export default {
     return {
       depment:'',
       departmentid:'',
+      person:'',
+      isleave:'',
       deplist:[],
       personnelList:[],
       depmentParam:{
@@ -66,6 +86,7 @@ export default {
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
       this.depment = ''
+      this.person = JSON.parse(window.sessionStorage.getItem('active_account')).name
    /*   this.departmentid = res.data.dep[0].departmentid*/
       const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
       this.otherMethod(userid)
@@ -106,9 +127,10 @@ export default {
       this.$refs.clueUnFollow.listData(dataid)
     },
     /*其他页面调用图表*/
-    otherModel(dataid,type){
+    otherModel(dataid,type,isleave){
       /*数字看板*/
       this.$refs.digitalSigns.param.content.type = type
+      this.$refs.digitalSigns.param.content.where.isleave = isleave
       this.$refs.digitalSigns.listData(dataid)
       /*线索新增*/
       this.$refs.clueAdd.$refs.departmentSalesperson.depment = type == '1'?dataid:''
@@ -116,28 +138,28 @@ export default {
       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)
+      this.$refs.clueAdd.queryModel(dataid,isleave)
       /*线索跟进*/
       this.$refs.clueFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.clueFollow.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.clueFollow.queryModel(dataid,isleave)
       /*线索转化*/
       this.$refs.clueChange.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.clueChange.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.clueChange.queryModel(dataid,isleave)
       /*有效线索未跟进天数*/
       this.$refs.clueUnFollow.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.clueUnFollow.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.clueUnFollow.queryModel(dataid,isleave)
     },
     createMenu (array) {
       var that = this
@@ -199,10 +221,22 @@ export default {
       }else {
         this.person = ''
         this.departmentid = val[val.length -1]
-        this.otherModel(this.departmentid,'1')
+        this.otherModel(this.departmentid,'1',this.isleave)
       }
 
     },
+    selectPerson(val){
+      this.depment = ''
+      this.departmentid = ''
+      this.isleave = ''
+      this.dataid = val
+      this.otherModel(val,'0',this.isleave)
+    },
+    leaveChange(){
+      const dataid = this.depment?this.departmentid:this.dataid
+      const type = this.depment?'1':'0'
+      this.otherModel(dataid,type,this.isleave)
+    },
     /*返回顶部*/
     toTop() {
       this.$refs.rollRef.scrollTop = 0

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

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson id="department" ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -52,7 +59,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate": ""
+          "enddate": "",
+          "where":{
+            "isleave":""
+          }
         }
       },
       enddate:new Date().getFullYear() + '-' +  (new Date().getMonth() + 1) + '-' + new Date().getDate(),
@@ -67,8 +77,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       this.param.content.enddate = this.enddate
       const res = await this.$api.requested(this.param)
       this.histogram = res.data.histogram
@@ -137,22 +148,23 @@ export default {
         },
       });
       this.chartDualAxes.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

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

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -52,7 +59,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate":""
+          "enddate":"",
+          "where":{
+            "isleave":''
+          }
         }
       },
       enddate:new Date().getFullYear() + '-' +  (new Date().getMonth() + 1) + '-' + new Date().getDate(),
@@ -66,9 +76,10 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       this.histogram = res.data.histogram
       this.lineChart = res.data.lineChart.map(item=>{
@@ -117,22 +128,23 @@ export default {
         },
       });
       this.chartDualAxes.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

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

@@ -11,6 +11,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -53,7 +60,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate":""
+          "enddate":"",
+          "where":{
+            "isleave":""
+          }
         }
       },
       enddate:new Date().getFullYear() + '-' +  (new Date().getMonth() + 1) + '-' + new Date().getDate(),
@@ -68,8 +78,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       this.param.content.enddate = this.enddate
       const res = await this.$api.requested(this.param)
       this.histogram = res.data.histogram
@@ -139,22 +150,23 @@ export default {
       });
 
       this.chartDualAxes.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

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

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-16">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -96,7 +103,10 @@ export default {
           "dateType":"",
           "isExport":0,
           "pageNumber": 1,
-          "pageSize": 20
+          "pageSize": 20,
+          "where":{
+            "isleave":""
+          }
         }
       },
       columnData:[],
@@ -116,9 +126,10 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryTable(val){
+    async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       if (res.data.length === 1){
         if (res.data[0].isEmpty == 1){
@@ -137,9 +148,10 @@ export default {
       }
 
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
+      this.param.content.where.isleave = isleave
       this.param.content.pageNumber = 1
       const res = await this.$api.requested(this.param)
       if (res.data.length <=1){
@@ -187,35 +199,36 @@ export default {
         const states = this.chartColumn.getStates()
         this.param.content.dateType = states.length === 0 ? '':ev.data.data.key
         this.param.content.pageNumber = 1
-        this.queryTable(this.param.content.dataid)
+        this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
       })
       this.chartColumn.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 3 - 0
src/views/clueData/modules/digitalSigns.vue

@@ -116,6 +116,9 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
+          "where":{
+            "isleave":""
+          }
         }
       }
     }

+ 3 - 0
src/views/salesData/components/boxLine.vue

@@ -122,6 +122,9 @@ export default {
           "dataid": 103,
           "dateType":"本年",// 本年 本季 本月
           "datatype":2,// 1-订单 2-出货 3-开票 4-回款
+          "where":{
+            "isleave":''
+          }
         }
       },
     }

+ 8 - 0
src/views/salesData/components/salesTemplate.vue

@@ -29,6 +29,13 @@
         <div class="inline-16 mt-10">
           <departmentSalesperson ref="departmentSalesperson" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
         </div>
+        <div class="mt-10 inline-16">
+          <p class="search__label">状态:</p>
+          <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="listData" :disabled="param.content.type == '0'">
+            <el-option label="在职" value="1"></el-option>
+            <el-option label="离职" value="2"></el-option>
+          </el-select>
+        </div>
         <el-button-group >
           <el-button size="small" :type="dateType === '本年'?'primary':''" @click="onChangeType('本年')">本年</el-button>
           <el-button size="small" :type="dateType === '本季'?'primary':''" @click="onChangeType('本季')">本季</el-button>
@@ -158,6 +165,7 @@ export default {
     /*选择业务员*/
     personSelect(val){
       this.param.content.type = 0
+      this.param.content.where.isleave = ''
       this.param.content.dataid = val
       this.listData()
     },

+ 54 - 16
src/views/salesData/index.vue

@@ -12,6 +12,24 @@
               <label  class="search__label" >部门:</label>
               <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>
+              <el-select v-model="person" filterable placeholder="请选择" size="small" clearable @change="selectPerson">
+                <el-option
+                    v-for="item in personnelList"
+                    :key="item.index"
+                    :label="item.name"
+                    :value="item.userid">
+                </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>
           <!--  数字看板      -->
           <digitalSigns ref="digitalSigns" :windowWidth="windowWidth"></digitalSigns>
@@ -82,7 +100,9 @@ export default {
   data(){
     return {
       depment:'',
+      person:'',
       departmentid:'',
+      isleave:'',
       deplist:[],
       personnelList:[],
       activeName: '客户销售',
@@ -100,6 +120,7 @@ export default {
       const res = await this.$api.requested(this.depmentParam)
       this.deplist = this.createMenu(res.data.dep)
       this.personnelList = res.data.hr
+      this.person = JSON.parse(window.sessionStorage.getItem('active_account')).name
       this.depment = ''
       this.departmentid = ''
       const userid = JSON.parse(sessionStorage.getItem('active_account')).userid
@@ -190,23 +211,27 @@ export default {
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
     },
     /*其他页面调用*/
-    otherModel(dataid,type){
+    otherModel(dataid,type,isleave){
       /*数字看板*/
       this.$refs.digitalSigns.$refs.order.param.content.type = type
       this.$refs.digitalSigns.$refs.order.param.content.dataid = dataid
+      this.$refs.digitalSigns.$refs.order.param.content.where.isleave = isleave
       this.$refs.digitalSigns.$refs.order.listData()
       this.$refs.digitalSigns.$refs.shipment.param.content.type = type
       this.$refs.digitalSigns.$refs.shipment.param.content.dataid = dataid
+      this.$refs.digitalSigns.$refs.shipment.param.content.where.isleave = isleave
       this.$refs.digitalSigns.$refs.shipment.listData()
       this.$refs.digitalSigns.$refs.invoicing.param.content.type = type
       this.$refs.digitalSigns.$refs.invoicing.param.content.dataid = dataid
+      this.$refs.digitalSigns.$refs.invoicing.param.content.where.isleave = isleave
       this.$refs.digitalSigns.$refs.invoicing.listData()
       this.$refs.digitalSigns.$refs.returned.param.content.type = type
       this.$refs.digitalSigns.$refs.returned.param.content.dataid = dataid
+      this.$refs.digitalSigns.$refs.returned.param.content.where.isleave = isleave
       this.$refs.digitalSigns.$refs.returned.listData()
       /*账户余额分析*/
       this.$refs.customerAccountBalanceAnalysis.param.content.type = type
-      this.$refs.customerAccountBalanceAnalysis.queryModel(dataid)
+      this.$refs.customerAccountBalanceAnalysis.queryModel(dataid,isleave)
       this.$refs.customerAccountBalanceAnalysis.depment = type == '1'?dataid:''
       this.$refs.customerAccountBalanceAnalysis.person = type == '0'?dataid:''
       this.$refs.customerAccountBalanceAnalysis.deplist = this.deplist
@@ -220,7 +245,7 @@ export default {
       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)
+      this.$refs.customer.listData(dataid,isleave)
       this.$refs.salesperson.param.content.dataid = dataid
       this.$refs.salesperson.param.content.type = type
       this.$refs.salesperson.param.content.pageNumber = 1
@@ -229,61 +254,61 @@ export default {
       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)
+      this.$refs.salesperson.listData(dataid,isleave)
       /*报价分析*/
       this.$refs.quotationAnalysis.param.content.type = type
       this.$refs.quotationAnalysis.plotParam.content.type = type
-      this.$refs.quotationAnalysis.listData(dataid)
-      this.$refs.quotationAnalysis.queryQuotationModel(dataid)
+      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.deplist = this.deplist
       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)
+      this.$refs.orderTrendAnalysis.queryModel(dataid,isleave)
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.orderType.queryModel(dataid,isleave)
       this.$refs.orderType.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.orderType.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.orderType.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.orderType.$refs.departmentSalesperson.personnelList = this.personnelList
       /*出货趋势分析*/
       this.$refs.shippingTrendAnalysis.param.content.type = type
-      this.$refs.shippingTrendAnalysis.queryModel(dataid)
+      this.$refs.shippingTrendAnalysis.queryModel(dataid,isleave)
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.delayedShipmentAnalysis.queryModel(dataid,isleave)
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.delayedShipmentAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*开票金额趋势分析*/
       this.$refs.invoiceAmountAnalysis.param.content.type = type
-      this.$refs.invoiceAmountAnalysis.queryModel(dataid)
+      this.$refs.invoiceAmountAnalysis.queryModel(dataid,isleave)
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.invoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       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)
+      this.$refs.uninvoiceAmountAnalysis.queryModel(dataid,isleave)
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
       this.$refs.uninvoiceAmountAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*出货未开票分析*/
       this.$refs.shippingUninvoiceAnalysis.param.content.type = type
-      this.$refs.shippingUninvoiceAnalysis.queryModel(dataid)
+      this.$refs.shippingUninvoiceAnalysis.queryModel(dataid,isleave)
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.depment = type == '1'?dataid:''
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.deplist = this.deplist
       this.$refs.shippingUninvoiceAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
@@ -291,8 +316,8 @@ export default {
       /*财务回款分析 */
       this.$refs.financialCollectionAnalysis.param.content.type = type
       this.$refs.financialCollectionAnalysis.tableParam.content.type = type
-      this.$refs.financialCollectionAnalysis.queryModel(dataid)
-      this.$refs.financialCollectionAnalysis.tableData(dataid)
+      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.deplist = this.deplist
       this.$refs.financialCollectionAnalysis.$refs.departmentSalesperson.person = type == '0'?dataid:''
@@ -357,10 +382,23 @@ export default {
         this.otherModel(userid,'0')
       }else {
         this.person = ''
+        this.dataid = ''
         this.departmentid = val[val.length -1]
-        this.otherModel(this.departmentid,'1')
+        this.otherModel(this.departmentid,'1',this.isleave)
       }
     },
+    selectPerson(val){
+      this.depment = ''
+      this.departmentid = ''
+      this.isleave = ''
+      this.dataid = val
+      this.otherModel(val,'0',this.isleave)
+    },
+    leaveChange(){
+      const dataid = this.depment?this.departmentid:this.dataid
+      const type = this.depment?'1':'0'
+      this.otherModel(dataid,type,this.isleave)
+    },
     handleClick(tab, event) {
       console.log(this.activeName);
       if (this.activeName === '客户销售'){

+ 19 - 7
src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -28,6 +28,13 @@
                 </el-option>
               </el-select>
             </div>
+            <div class="mt-10 inline-16">
+              <p class="search__label">状态:</p>
+              <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="depment == ''">
+                <el-option label="在职" value="1"></el-option>
+                <el-option label="离职" value="2"></el-option>
+              </el-select>
+            </div>
             <div class="inline-16 mt-10">
               <label class="search__label" >账户类型:</label>
               <el-select v-model="param.content.accountno" placeholder="请选择账户类型" size="small"  @change="accountSelect" :popper-append-to-body="!isFull">
@@ -105,7 +112,10 @@ export default {
           "type": "0", //0 人员 1 部门
           "dataid": "",
           "enddate":"",
-          "accountno":""
+          "accountno":"",
+          "where":{
+            "isleave":''
+          }
         }
       },
       balance:[],
@@ -151,9 +161,10 @@ export default {
       this.renderPie(val)
     },
     /*渲染图表*/
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.endDate
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       this.accountList = res.data.accountclass
       let lastYear = []
@@ -262,11 +273,11 @@ export default {
       });
 
       this.chartCustomerLine.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
 
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
@@ -274,15 +285,16 @@ export default {
       this.depment = val
       this.param.content.type = 1
       this.param.content.dataid = val[val.length -1]
-      this.queryModel(val[val.length -1])
+      this.queryModel(val[val.length -1],this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
       this.depment = ''
+     this.param.content.where.isleave = ''
       this.person = val
       this.param.content.type = 0
       this.param.content.dataid = this.person
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*账户类型*/
     async accountData(){
@@ -291,7 +303,7 @@ export default {
       this.param.content.accountno = res.data[0].accountno
     },
     accountSelect(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 4 - 2
src/views/salesData/modules/customerSales.vue

@@ -25,7 +25,8 @@ export default {
             "enddate": "",
             "condition":"",
             "customergrade":"",
-            "type":""
+            "type":"",
+            "isleave":""
           },
           "pageSize": 10,
           "pageNumber": 1
@@ -35,8 +36,9 @@ export default {
     }
   },
   methods:{
-    listData(val){
+    listData(val,type){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = type
       this.$refs.sales.listData()
     }
   },

+ 23 - 10
src/views/salesData/modules/delayedShipmentAnalysis.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-16">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -115,7 +122,10 @@ export default {
           "enddate": "",//分析日期
           "dateType": "",//图标联动  一周 一月 一季 一季以上 可不传 不传默认查全部
           "pageSize":20,
-          "pageNumber":1
+          "pageNumber":1,
+          "where":{
+            'isleave':''
+          }
         }
       },
       list:[],
@@ -135,8 +145,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       if (res.data.length === 1){
         if (res.data[0].isEmpty == 1){
@@ -181,42 +192,44 @@ export default {
         const states = this.chartBar.getStates()
         this.param.content.dateType = states.length === 0 ?'':ev.data.data.key
         this.param.content.pageNumber = 1
-        this.queryTable(this.param.content.dataid)
+        this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
       })
       this.chartBar.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
-    async queryTable(val){
+    async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 28 - 12
src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" placement="left-start"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="tableData(param.content.dataid,param.content.where.isleave);queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="inline-15 mt-10">
             <exportFile  :param="tableParam" :columns="tablecols" fileName="财务回款分析" :dataid="tableParam.content.dataid"></exportFile>
           </div>
@@ -89,7 +96,10 @@ export default {
         "id": 20231016211904,
         "content": {
           "type": 0,
-          "dataid": 54
+          "dataid": 54,
+          "where":{
+            "isleave":""
+          }
         }
       },
       tableParam:{
@@ -100,6 +110,9 @@ export default {
           "unwriteoffamounttype": "订单",
           "pageNumber": 1,
           "pageSize": 20,
+          "where":{
+            "isleave":""
+          }
         }
       },
       chartData:[],
@@ -117,10 +130,11 @@ export default {
   methods:{
     async listData(val){
       this.renderPie(val)
-      this.tableData(val)
+      this.tableData(val,this.param.content.where.isleave)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       this.chartData = res.data.map(item=>{
         let value = item.value/10000
@@ -160,13 +174,14 @@ export default {
       this.chartBar.on('plot:click',ev=>{
         this.tableParam.content.unwriteoffamounttype = this.hoverData.data.type
         this.tableParam.content.pageNumber = 1
-        this.tableData(this.param.content.dataid)
+        this.tableData(this.param.content.dataid,this.param.content.where.isleave)
       })
 
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
-    async tableData(val){
+    async tableData(val,isleave){
       this.tableParam.content.dataid = val || this.dataid
+      this.tableParam.content.where.isleave = isleave
       const res = await this.$api.requested(this.tableParam)
       this.list = res.data
       this.total = res.total
@@ -177,27 +192,28 @@ export default {
       this.param.content.type = 1
       this.param.content.dataid = val
       this.tableParam.content.type = 1
-      this.queryModel(val)
-      this.tableData(val)
+      this.queryModel(val,this.param.content.where.isleave)
+      this.tableData(val,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.tableData(val)
+      this.param.content.where.isleave = ''
+      this.queryModel(val,this.param.content.where.isleave)
+      this.tableData(val,this.param.content.where.isleave)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
 
       this.tableParam.content.pageSize = val
-      this.tableData(this.param.content.dataid)
+      this.tableData(this.param.content.dataid,this.param.content.where.isleave)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.tableParam.content.pageNumber = val
-      this.tableData(this.param.content.dataid)
+      this.tableData(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 18 - 6
src/views/salesData/modules/invoiceAmountAnalysis.vue

@@ -11,6 +11,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">年度:</span>
             <el-date-picker
@@ -60,7 +67,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": 54,
-          "year": "2023"
+          "year": "2023",
+          "where":{
+            "isleave":""
+          }
         }
       },
       yearNow:new Date(),
@@ -74,8 +84,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       this.param.content.year = new Date(this.yearNow).getFullYear()
       const res = await this.$api.requested(this.param)
       let amount = res.data.map(item=>{
@@ -151,22 +162,23 @@ export default {
         }
       });
       this.chartDualAxes.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 16 - 4
src/views/salesData/modules/orderTrendAnalysis.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">年度:</span>
             <el-date-picker
@@ -59,7 +66,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "year": "2023"
+          "year": "2023",
+          "where":{
+            "isleave":""
+          }
         }
       },
       list:[],
@@ -74,8 +84,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,type){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = type
       this.param.content.year = new Date(this.yearNow).getFullYear()
       const res = await this.$api.requested(this.param)
       this.list2 = res.data.map(item=>{
@@ -169,13 +180,14 @@ export default {
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 23 - 12
src/views/salesData/modules/orderType.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="inline-16 mt-10">
             <el-button-group >
               <el-button size="small" :type="type === '金额'?'primary':''" @click="changeType('金额')">金额</el-button>
@@ -117,7 +124,8 @@ export default {
           "where":{
             "begdate":"",
             "enddate":"",
-            "type":""//订单类型
+            "type":"", //订单类型
+            "isleave":""
           }
         }
       },
@@ -164,8 +172,9 @@ export default {
       })
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,type){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = type
       this.param.content.dataType = this.type
       this.param.content.dateType = this.dateType === '全部'?'':this.dateType
       const res = await this.$api.requested(this.param)
@@ -200,8 +209,9 @@ export default {
       })
       this.chartPie.changeData(this.chartData)
     },
-    async queryTable(val){
+    async queryTable(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       this.param.content.dataType = this.type
       this.param.content.dateType = this.dateType
       const res = await this.$api.requested(this.param)
@@ -266,14 +276,14 @@ export default {
         const states = this.chartPie.getStates()
         this.param.content.where.type = states.length ===0 ? '':ev.data.data.type
         this.param.content.pageNumber = 1
-        this.queryTable(this.param.content.dataid)
+        this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
       })
       this.chartPie.render()
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeType(val){
       this.type = val
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*切换年月*/
     changeTypeDate(val){
@@ -291,23 +301,23 @@ export default {
         this.monthDate = []
       }
       this.dateType = val
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     changMonth(){
       this.dateType = ''
       this.param.content.where.begdate = this.monthDate[0]
       this.param.content.where.enddate = this.monthDate[1]
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.queryTable(this.param.content.dataid)
+      this.queryTable(this.param.content.dataid,this.param.content.where.isleave)
     },
     goDetail(data){
       setTimeout(() => {
@@ -343,13 +353,14 @@ export default {
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
+      this.param.content.where.isleave = ''
       this.param.content.type = 0
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave,this.param.content.where.isleave)
     },
   },
   created() {

+ 25 - 6
src/views/salesData/modules/quotationAnalysis.vue

@@ -18,6 +18,13 @@
             <div class="inline-16 mt-10">
               <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
             </div>
+            <div class="mt-10 inline-16">
+              <p class="search__label">状态:</p>
+              <el-select v-model="plotParam.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="listData(plotParam.content.dataid,plotParam.content.where.isleave);queryQuotationModel(plotParam.content.dataid,plotParam.content.where.isleave)" :disabled="plotParam.content.type == '0'">
+                <el-option label="在职" value="1"></el-option>
+                <el-option label="离职" value="2"></el-option>
+              </el-select>
+            </div>
             <div class="mt-10 inline-15">
               <span class="search__label inline-16">分析日期:</span>
               <el-date-picker
@@ -95,6 +102,9 @@ export default {
         "content": {
           "type": '0',//0人员 1部门
           "dataid": '',
+          "where":{
+            "isleave":''
+          }
         }
       },
       plotParam:{
@@ -102,7 +112,10 @@ export default {
         "content": {
           "type": 0,//0人员 1部门
           "dataid": '',
-          "enddate": "" //分析日期
+          "enddate": "", //分析日期
+          "where":{
+            "isleave":''
+          }
         }
       },
       plotList:[],
@@ -113,8 +126,9 @@ export default {
     }
   },
   methods:{
-    async listData(val){
+    async listData(val,type){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = type
       const res = await this.$api.requested(this.param)
       this.proqty = res.data.proqty
       this.proamount = res.data.proamount
@@ -134,9 +148,10 @@ export default {
       this.renderPie(val)
     },
     /*渲染图表数据*/
-    async queryQuotationModel(val) {
+    async queryQuotationModel(val,type) {
       this.plotParam.content.dataid = val || this.dataid
       this.plotParam.content.enddate = this.endDate
+      this.plotParam.content.where.isleave = type
       const res = await this.$api.requested(this.plotParam)
       this.plotList=res.data
       this.chartLine.changeData(this.processData(this.plotList, ['newtotalqty', 'newcusqty','newproqty','oldtotalqty','oldcusqty','oldproqty']))
@@ -180,18 +195,22 @@ export default {
     },
     /*选择部门*/
     depSelect(val){
-      console.log(val,'val3333')
       this.plotParam.content.type = 1
+      this.param.content.type = 1
       this.plotParam.content.dataid = val
       this.dataid = val
-      this.queryQuotationModel()
+      this.listData(val,this.plotParam.content.where.isleave)
+      this.queryQuotationModel(val,this.plotParam.content.where.isleave)
     },
     /*选择业务员*/
     personSelect(val){
+      this.plotParam.content.where.isleave = ''
       this.plotParam.content.type = 0
+      this.param.content.type = 0
       this.plotParam.content.dataid = val
       this.dataid = val
-      this.queryQuotationModel()
+      this.listData(val,this.plotParam.content.where.isleave)
+      this.queryQuotationModel(val,this.plotParam.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 4 - 2
src/views/salesData/modules/salespersonSales.vue

@@ -24,7 +24,8 @@ export default {
           "pageSize": 10,
           "where": {
             "begdate": "",
-            "enddate":""
+            "enddate":"",
+            "isleave":""
           }
           //top pageSize传10 pageNumber传1 全部排名正常传值
         }
@@ -32,8 +33,9 @@ export default {
     }
   },
   methods:{
-    listData(val){
+    listData(val,type){
       this.param.content.dataid = val  || this.dataid
+      this.param.content.where.isleave = type
       this.$refs.sales.listData()
     }
   },

+ 18 - 6
src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -19,6 +19,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">年度:</span>
             <el-date-picker
@@ -66,7 +73,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "year": "2023"
+          "year": "2023",
+          "where":{
+            "isleave":""
+          }
         }
       },
       yearNow:new Date(),
@@ -81,8 +91,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       this.param.content.year = new Date(this.yearNow).getFullYear()
       const res = await this.$api.requested(this.param)
       const amount = res.data.map(item=>{
@@ -172,22 +183,23 @@ export default {
         }
       });
       this.chartDualAxes.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){

+ 15 - 5
src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" placement="left-start" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="inline-15 mt-10">
             <exportFile  :param="param" :columns="tablecols" fileName="出货未开票分析" :dataid="param.content.dataid"></exportFile>
           </div>
@@ -100,7 +107,8 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
-            "uninvicetype":""
+            "uninvicetype":"",
+            "isleave":""
           }
         }
       },
@@ -120,8 +128,9 @@ export default {
     async listData(val){
       this.renderPie(val)
     },
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       if (res.data.length === 1){
         if (res.data[0].isEmpty == '1'){
@@ -179,7 +188,7 @@ export default {
         this.queryTable(this.param.content.dataid)
       })*/
       this.chartBar.render()
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     async queryTable(val){
       this.param.content.dataid = val || this.dataid
@@ -192,13 +201,14 @@ export default {
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 18 - 6
src/views/salesData/modules/uninvoiceAmountAnalysis.vue

@@ -10,6 +10,13 @@
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson"  @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
+          <div class="mt-10 inline-16">
+            <p class="search__label">状态:</p>
+            <el-select v-model="param.content.where.isleave" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="queryModel(param.content.dataid,param.content.where.isleave)" :disabled="param.content.type == '0'">
+              <el-option label="在职" value="1"></el-option>
+              <el-option label="离职" value="2"></el-option>
+            </el-select>
+          </div>
           <div class="mt-10 inline-15">
             <span class="search__label inline-16">分析日期:</span>
             <el-date-picker
@@ -72,7 +79,10 @@ export default {
         "content": {
           "type": 0,
           "dataid": '',
-          "enddate": "2023-09-21"
+          "enddate": "2023-09-21",
+          "where":{
+            "isleave":""
+          }
         }
       },
       list:[],
@@ -97,9 +107,10 @@ export default {
       return result;
     },
     /*图表更新*/
-    async queryModel(val){
+    async queryModel(val,isleave){
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.endDate
+      this.param.content.where.isleave = isleave
       const res = await this.$api.requested(this.param)
       this.list = res.data.map(item=>{
         let zerotothree = item.zerotothree/10000
@@ -139,22 +150,23 @@ export default {
         }
       });
       this.chartLine.render();
-      this.queryModel(val)
+      this.queryModel(val,this.param.content.where.isleave)
     },
     changeDate(){
-      this.queryModel(this.param.content.dataid)
+      this.queryModel(this.param.content.dataid,this.param.content.where.isleave)
     },
     /*选择部门*/
     depSelect(val){
       this.param.content.type = 1
       this.param.content.dataid = val
-      this.queryModel(val)
+      this.queryModel(val,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 = ''
+      this.queryModel(val,this.param.content.where.isleave)
     },
     /*全屏*/
     onFull(){