Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/customerData/components/pageTable.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <div>
-      <tableLayout height="400px" :layout="tablecols" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
+      <tableLayout height="356px" :layout="tablecols" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
         <template v-slot:header="data">
           <div v-if="data.data.label == '综合折扣'" style="display:flex;align-items:center">
             <span>{{ data.data.label }}</span>
@@ -80,5 +80,8 @@ export default {
 
 </script>
 <style scoped>
-
+/deep/.el-table {
+  min-height: 100% !important;
+  max-height: 100% !important;
+}
 </style>

src/HDrpManagement/customerData/index.vue

@@ -84,11 +84,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="chartParam1.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="chartParam1.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {chartParam1.content.type=1;chartParam1.content.dataid=$event[$event.length - 1];chartParam1.content.username='';chart1Fun()} else {chartParam1.content.dataid='';chartParam1.content.type='';chartParam1.content.username='';chart1Fun()}}"></el-cascader>
                   </div>
@@ -96,7 +96,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="chartParam1.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -128,11 +128,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="typeTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="typeTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.dataid=$event[$event.length - 1];typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.customerTypeTable.listData();customerTypeInit()}}"></el-cascader>
                   </div>
@@ -140,7 +140,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="typeTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';$refs.customerTypeTable.listData();customerTypeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';$refs.customerTypeTable.listData();customerTypeInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -199,11 +199,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="gradTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="gradTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.dataid=$event[$event.length - 1];gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.customerGradTable.listData();customerGradInit()}}"></el-cascader>
                   </div>
@@ -211,7 +211,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="gradTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';$refs.customerGradTable.listData();customerGradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';$refs.customerGradTable.listData();customerGradInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -267,11 +267,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="contactTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="contactTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.dataid=$event[$event.length - 1];contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.customerContactTable.listData();customerContactInit()}}"></el-cascader>
                   </div>
@@ -279,7 +279,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="contactTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';$refs.customerContactTable.listData();customerContactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';$refs.customerContactTable.listData();customerContactInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -334,11 +334,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="projectTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="projectTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.dataid=$event[$event.length - 1];projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';$refs.customerProjectTable.listData();customerFllowInit()}}"></el-cascader>
                   </div>
@@ -346,7 +346,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="projectTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {projectMapParam.content.type=0;projectMapParam.content.dataid=$event;projectTableParam.content.type=0;projectTableParam.content.dataid=$event;projectTableParam.content.depname='';$refs.customerProjectTable.listData();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.depname='';$refs.customerProjectTable.listData();customerFllowInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -401,11 +401,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="fllowTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="fllowTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.customerFllowTable.listData();customerFllowInit()}}"></el-cascader>
                   </div>
@@ -413,7 +413,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="fllowTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';$refs.customerFllowTable.listData();customerFllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.depname='';$refs.customerFllowTable.listData();customerFllowInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -468,11 +468,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="chartParam2.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="chartParam2.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {chartParam2.content.type=1;chartParam2.content.dataid=$event[$event.length - 1];chartParam2.content.username='';chart2Fun()} else {chartParam2.content.dataid='';chartParam2.content.type='';chartParam2.content.username='';chart2Fun()}}"></el-cascader>
                   </div>
@@ -480,7 +480,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="chartParam2.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -512,11 +512,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="unfllowTableParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="unfllowTableParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
                   </div>
@@ -524,7 +524,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="unfllowTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -618,11 +618,11 @@
                 <div class="panel-select">
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >部门:</label>
-                    <el-cascader
-                      ref="selectdep"
-                      size="small"
-                      v-model="projectParam.content.dataid"
-                      :options="deplist"
+                    <el-cascader 
+                      ref="selectdep" 
+                      size="small" 
+                      v-model="projectParam.content.dataid" 
+                      :options="deplist" 
                       :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
                       @change="$event => {if($event.length) {projectParam.content.type=1;projectParam.content.dataid=$event[$event.length - 1];projectParam.content.username='';chart3Fun()} else {projectParam.content.dataid='';projectParam.content.type='';projectParam.content.username='';chart3Fun()}}"></el-cascader>
                   </div>
@@ -630,7 +630,7 @@
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="projectParam.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -1528,20 +1528,21 @@ export default {
         this.unfllowTableParam.content.username = ''
         this.$refs.customerUnfllowTable.listData()
       } else {
+        let name = JSON.parse(sessionStorage.getItem('accountinfo')).name
         this.chartParam1.content.dataid = ''
         this.chartParam1.content.type =''
-        this.chartParam1.content.username = ''
+        this.chartParam1.content.username =name
         this.chartParam1.content.depname = ''
         this.chart1Fun()
 
         this.chartParam2.content.dataid = ''
         this.chartParam2.content.type =''
-        this.chartParam2.content.username = ''
+        this.chartParam2.content.username =name
         this.chart2Fun()
 
         this.projectParam.content.dataid = ''
         this.projectParam.content.type =''
-        this.projectParam.content.username = ''
+        this.projectParam.content.username =name
         this.chart3Fun()
 
         this.typeMapParam.content.dataid = ''
@@ -1549,7 +1550,7 @@ export default {
         this.customerTypeInit()
         this.typeTableParam.content.dataid = ''
         this.typeTableParam.content.type =''
-        this.typeTableParam.content.username = ''
+        this.typeTableParam.content.username = name
         this.$refs.customerTypeTable.listData()
 
         this.gradMapParam.content.dataid = ''
@@ -1557,7 +1558,8 @@ export default {
         this.customerGradInit()
         this.gradTableParam.content.dataid = ''
         this.gradTableParam.content.type =''
-        this.gradTableParam.content.username = ''
+        this.gradTableParam.content.username = name
+        console.log(this.gradTableParam.content.username,'除非');
         this.$refs.customerGradTable.listData()
 
 
@@ -1566,7 +1568,7 @@ export default {
         this.customerContactInit()
         this.contactTableParam.content.dataid = ''
         this.contactTableParam.content.type =''
-        this.contactTableParam.content.username = ''
+        this.contactTableParam.content.username = name
         this.$refs.customerContactTable.listData()
 
         this.projectMapParam.content.dataid = ''
@@ -1574,7 +1576,7 @@ export default {
         this.customerProjectInit()
         this.projectTableParam.content.dataid = ''
         this.projectTableParam.content.type =''
-        this.projectTableParam.content.username = ''
+        this.projectTableParam.content.username = name
         this.$refs.customerProjectTable.listData()
 
         this.fllowMapParam.content.dataid = ''
@@ -1582,7 +1584,7 @@ export default {
         this.customerFllowInit()
         this.fllowTableParam.content.dataid = ''
         this.fllowTableParam.content.type =''
-        this.fllowTableParam.content.username = ''
+        this.fllowTableParam.content.username = name
         this.$refs.customerFllowTable.listData()
 
         this.unfllowMapParam.content.dataid = ''
@@ -1590,7 +1592,7 @@ export default {
         this.customerUnfllowInit()
         this.unfllowTableParam.content.dataid = ''
         this.unfllowTableParam.content.type =''
-        this.unfllowTableParam.content.username = ''
+        this.unfllowTableParam.content.username = name
         this.$refs.customerUnfllowTable.listData()
       }
     },

src/HDrpManagement/projectData/components/pageTable.vue

@@ -2,7 +2,7 @@
 <template>
   <div style="width:100%">
     <div>
-      <tableLayout height="400px" :layout="tablecols" v-bind="$attrs" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
+      <tableLayout height="356px" :layout="tablecols" v-bind="$attrs" :data="list2" :opwidth="200"  :custom="true" :width="false" fixedName="operation" :customHeader="true">
         <template v-slot:header="data">
           <div v-if="data.data.label == '综合折扣'" style="display:flex;align-items:center">
             <span>{{ data.data.label }}</span>
@@ -81,5 +81,8 @@ export default {
 
 </script>
 <style scoped>
-
+/deep/.el-table {
+  min-height: 100% !important;
+  max-height: 100% !important;
+}
 </style>

src/HDrpManagement/projectData/index.vue

@@ -108,14 +108,14 @@
                       size="small"
                       v-model="typeTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {typeMapParam.content.type=1;typeMapParam.content.dataid=$event[$event.length - 1];typeTableParam.content.type=1;typeTableParam.content.dataid=$event[$event.length - 1];typeTableParam.content.username='';$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.username='';$refs.typeTable.listData();typeInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="typeTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {typeMapParam.content.type=0;typeMapParam.content.dataid=$event;typeTableParam.content.type=0;typeTableParam.content.dataid=$event;typeTableParam.content.depname='';$refs.typeTable.listData();typeInit()} else {typeMapParam.content.type='';typeMapParam.content.dataid='';typeTableParam.content.dataid='';typeTableParam.content.type='';typeTableParam.content.depname='';$refs.typeTable.listData();typeInit()}}"
-                    clearable>
+                  >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -124,14 +124,14 @@
                       </el-option>
                     </el-select>
                   </div>
-                  <div class="mt-10 inline-16" style="margin-left:10px">
+                  <!-- <div class="mt-10 inline-16" style="margin-left:10px">
                     <FullScroll domId="projectType"></FullScroll>
-                  </div>
+                  </div> -->
                 </div>
               </div>
               <div class="panel-content" id="projectType">
-                <div ref="typeEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem;">
+                <div ref="typeEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="typeTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -185,14 +185,14 @@
                       size="small"
                       v-model="gradTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {gradMapParam.content.type=1;gradMapParam.content.dataid=$event[$event.length - 1];gradTableParam.content.type=1;gradTableParam.content.dataid=$event[$event.length - 1];gradTableParam.content.username='';$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.username='';$refs.gradTable.listData();gradInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="gradTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {gradMapParam.content.type=0;gradMapParam.content.dataid=$event;gradTableParam.content.type=0;gradTableParam.content.dataid=$event;gradTableParam.content.depname='';$refs.gradTable.listData();gradInit()} else {gradMapParam.content.type='';gradMapParam.content.dataid='';gradTableParam.content.dataid='';gradTableParam.content.type='';gradTableParam.content.depname='';$refs.gradTable.listData();gradInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -204,8 +204,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="gradEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="gradEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="gradTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -259,14 +259,14 @@
                       size="small"
                       v-model="scoreTableParam1.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {scoreMapParam1.content.type=1;scoreMapParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.type=1;scoreTableParam1.content.dataid=$event[$event.length - 1];scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';scoreMapParam1.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.username='';$refs.scoreTable.listData();scoreInit()}}"></el-cascader>
                   </div>
                   <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='';$refs.scoreTable.listData();scoreInit()} else {scoreMapParam1.content.type='';gradMapParam.content.dataid='';scoreTableParam1.content.dataid='';scoreTableParam1.content.type='';scoreTableParam1.content.depname='';$refs.scoreTable.listData();scoreInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -284,7 +284,7 @@
                     <label  class="search__label" >评估分档位:</label>
                     <el-select v-model="scoreTableParam1.content.where.taskType" filterable placeholder="请选择" size="small"
                     @change="$refs.scoreTable.listData()"
-                    clearable>
+                    >
                       <el-option label="全部" value="" />
                       <el-option label="高分档" value="高分档" />
                       <el-option label="中分档" value="中分档" />
@@ -347,14 +347,14 @@
                       size="small"
                       v-model="addParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {addParam.content.type=1;addParam.content.dataid=$event[$event.length - 1];addParam.content.username='';addFun()} else {addParam.content.dataid='';addParam.content.type='';addParam.content.username='';addFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="addParam.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -391,14 +391,14 @@
                       size="small"
                       v-model="baobeiParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {baobeiParam.content.type=1;baobeiParam.content.dataid=$event[$event.length - 1];baobeiParam.content.username='';baobeiFun()} else {baobeiParam.content.dataid='';baobeiParam.content.type='';baobeiParam.content.username='';baobeiFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="baobeiParam.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -435,14 +435,14 @@
                       size="small"
                       v-model="baojiaParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {baojiaParam.content.type=1;baojiaParam.content.dataid=$event[$event.length - 1];baojiaParam.content.username='';baojiaFun()} else {baojiaParam.content.dataid='';baojiaParam.content.type='';baojiaParam.content.username='';baojiaFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="baojiaParam.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -479,14 +479,14 @@
                       size="small"
                       v-model="fllowParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {fllowParam.content.type=1;fllowParam.content.dataid=$event[$event.length - 1];fllowParam.content.username='';fllowFun()} else {fllowParam.content.dataid='';fllowParam.content.type='';fllowParam.content.username='';fllowFun()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="fllowParam.content.username" filterable placeholder="请选择" size="small"
                       @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()}}"
-                      clearable>
+                      >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -523,14 +523,14 @@
                       size="small"
                       v-model="fllowTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {fllowMapParam.content.type=1;fllowMapParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.type=1;fllowTableParam.content.dataid=$event[$event.length - 1];fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.username='';$refs.projectFllowTable.listData();fllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="fllowTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {fllowMapParam.content.type=0;fllowMapParam.content.dataid=$event;fllowTableParam.content.type=0;fllowTableParam.content.dataid=$event;fllowTableParam.content.depname='';$refs.projectFllowTable.listData();fllowInit()} else {fllowMapParam.content.type='';fllowMapParam.content.dataid='';fllowTableParam.content.dataid='';fllowTableParam.content.type='';fllowTableParam.content.depname='';$refs.projectFllowTable.listData();fllowInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -542,8 +542,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="projectFllowEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="projectFllowEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="projectFllowTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -597,14 +597,14 @@
                       size="small"
                       v-model="contactTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {contactMapParam.content.type=1;contactMapParam.content.dataid=$event[$event.length - 1];contactTableParam.content.type=1;contactTableParam.content.dataid=$event[$event.length - 1];contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.username='';$refs.projectContactTable.listData();contactInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="contactTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {contactMapParam.content.type=0;contactMapParam.content.dataid=$event;contactTableParam.content.type=0;contactTableParam.content.dataid=$event;contactTableParam.content.depname='';$refs.projectContactTable.listData();contactInit()} else {contactMapParam.content.type='';contactMapParam.content.dataid='';contactTableParam.content.dataid='';contactTableParam.content.type='';contactTableParam.content.depname='';$refs.projectContactTable.listData();contactInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -616,8 +616,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="projectContactEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="projectContactEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="projectContactTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -671,14 +671,14 @@
                       size="small"
                       v-model="customerTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {customerMapParam.content.type=1;customerMapParam.content.dataid=$event[$event.length - 1];customerTableParam.content.type=1;customerTableParam.content.dataid=$event[$event.length - 1];customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.username='';$refs.projectCustomerTable.listData();customerInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="customerTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {customerMapParam.content.type=0;customerMapParam.content.dataid=$event;customerTableParam.content.type=0;customerTableParam.content.dataid=$event;customerTableParam.content.depname='';$refs.projectCustomerTable.listData();customerInit()} else {customerMapParam.content.type='';customerMapParam.content.dataid='';customerTableParam.content.dataid='';customerTableParam.content.type='';customerTableParam.content.depname='';$refs.projectCustomerTable.listData();customerInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -690,8 +690,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="projectCustomerEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="projectCustomerEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="projectCustomerTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -745,14 +745,14 @@
                       size="small"
                       v-model="scoreTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {scoreMapParam.content.type=1;scoreMapParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.type=1;scoreTableParam.content.dataid=$event[$event.length - 1];scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.username='';$refs.projectScoreTable.listData();projectScoreInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="scoreTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {scoreMapParam.content.type=0;scoreMapParam.content.dataid=$event;scoreTableParam.content.type=0;scoreTableParam.content.dataid=$event;scoreTableParam.content.depname='';$refs.projectScoreTable.listData();projectScoreInit()} else {scoreMapParam.content.type='';scoreMapParam.content.dataid='';scoreTableParam.content.dataid='';scoreTableParam.content.type='';scoreTableParam.content.depname='';$refs.projectScoreTable.listData();projectScoreInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -764,8 +764,8 @@
                 </div>
               </div>
               <div class="panel-content">
-                <div ref="projectScoreEl" style="width:430rem"></div>
-                <div class="panel-table" style="width:1151rem">
+                <div ref="projectScoreEl" style="width:30%"></div>
+                <div class="panel-table" style="width:70%">
                   <pageTable
                     ref="projectScoreTable"
                     :tablecols="tool.tabelCol($route.name).projectTable.tablecols"
@@ -819,14 +819,14 @@
                       size="small"
                       v-model="unfllowTableParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}" 
                       @change="$event => {if($event.length) {unfllowMapParam.content.type=1;unfllowMapParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.type=1;unfllowTableParam.content.dataid=$event[$event.length - 1];unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.username='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"></el-cascader>
                   </div>
                   <div class="mt-10 inline-16">
                     <label  class="search__label" >业务员:</label>
                     <el-select v-model="unfllowTableParam.content.username" filterable placeholder="请选择" size="small"
                     @change="$event => {if($event) {unfllowMapParam.content.type=0;unfllowMapParam.content.dataid=$event;unfllowTableParam.content.type=0;unfllowTableParam.content.dataid=$event;unfllowTableParam.content.depname='';$refs.customerUnfllowTable.listData();customerUnfllowInit()} else {unfllowMapParam.content.type='';unfllowMapParam.content.dataid='';unfllowTableParam.content.dataid='';unfllowTableParam.content.type='';unfllowTableParam.content.depname='';$refs.customerUnfllowTable.listData();customerUnfllowInit()}}"
-                    clearable>
+                    >
                       <el-option
                           v-for="item in personnelList"
                           :key="item.index"
@@ -945,7 +945,7 @@
                       size="small"
                       v-model="dateParam.content.dataid"
                       :options="deplist"
-                      :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  clearable
+                      :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.dataid=$event[$event.length - 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">
@@ -993,7 +993,7 @@
                 <selectProject :projectType="projectType" :projectLead="projectLead" :tradefieldSelect="tradefieldSelect"  @selectRow="selectRow" ref="selectProject">
                   <div slot="input" style="display:flex;align-items:center">
                     <el-input v-model="projectname" style="width:300px" size="small" placeholder="请选择项目" @focus="$refs.selectProject.visible=true"></el-input>
-                    <el-button @click="projectname='';dateParam.content.where.sa_projectid='';getDate()" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
+                    <el-button style="margin-left:10px" @click="projectname='';dateParam.content.where.sa_projectid='';getDate()" size="mini" type="text" v-if="dateParam.content.where.sa_projectid">清空</el-button>
                   </div>
                 </selectProject>
               </div>
@@ -1009,7 +1009,7 @@
                     <el-option label="结案" value="结案"></el-option>
                   </el-select>
                 </div>
-                <span style="margin:0 25px">至</span>
+                <span style="margin:0 35px 0 25px">至</span>
                 <div class="mt-10 inline-16">
                   <label  class="search__label">结束节点:</label>
                   <el-select v-model="dateParam.content.endnode" placeholder="结束节点" @change="getDate" size="small" clearable>
@@ -2116,13 +2116,18 @@ export default {
         this.unfllowTableParam.content.type = 1
         this.unfllowTableParam.content.username = ''
         this.$refs.customerUnfllowTable.listData()
+
+        this.dateParam.content.dataid = id
+        this.getDate()
+
       } else {
+        let name = JSON.parse(sessionStorage.getItem('accountinfo')).name
         this.typeMapParam.content.dataid = ''
         this.typeMapParam.content.type = ''
         this.typeInit()
         this.typeTableParam.content.dataid = ''
         this.typeTableParam.content.type = ''
-        this.typeTableParam.content.username = ''
+        this.typeTableParam.content.username = name
         this.$refs.typeTable.listData()
 
         this.gradMapParam.content.dataid = ''
@@ -2130,7 +2135,7 @@ export default {
         this.gradInit()
         this.gradTableParam.content.dataid = ''
         this.gradTableParam.content.type = ''
-        this.gradTableParam.content.username = ''
+        this.gradTableParam.content.username = name
         this.$refs.gradTable.listData()
 
         this.scoreMapParam1.content.dataid = ''
@@ -2138,7 +2143,7 @@ export default {
         this.scoreInit()
         this.scoreTableParam1.content.dataid = ''
         this.scoreTableParam1.content.type = ''
-        this.scoreTableParam1.content.username = ''
+        this.scoreTableParam1.content.username = name
         this.$refs.scoreTable.listData()
 
         this.addParam.content.dataid = ''
@@ -2162,7 +2167,7 @@ export default {
         this.fllowInit()
         this.fllowTableParam.content.dataid = ''
         this.fllowTableParam.content.type = ''
-        this.fllowTableParam.content.username = ''
+        this.fllowTableParam.content.username = name
         this.$refs.projectFllowTable.listData()
 
         this.contactMapParam.content.dataid = ''
@@ -2170,7 +2175,7 @@ export default {
         this.contactInit()
         this.contactTableParam.content.dataid = ''
         this.contactTableParam.content.type = ''
-        this.contactTableParam.content.username = ''
+        this.contactTableParam.content.username = name
         this.$refs.projectContactTable.listData()
 
         this.customerMapParam.content.dataid = ''
@@ -2178,7 +2183,7 @@ export default {
         this.customerInit()
         this.customerTableParam.content.dataid = ''
         this.customerTableParam.content.type = ''
-        this.customerTableParam.content.username = ''
+        this.customerTableParam.content.username = name
         this.$refs.projectCustomerTable.listData()
 
         this.scoreMapParam.content.dataid = ''
@@ -2186,7 +2191,7 @@ export default {
         this.scoreInit()
         this.scoreTableParam.content.dataid = ''
         this.scoreTableParam.content.type = ''
-        this.scoreTableParam.content.username = ''
+        this.scoreTableParam.content.username = name
         this.$refs.projectScoreTable.listData()
 
         this.unfllowMapParam.content.dataid = ''
@@ -2194,8 +2199,11 @@ export default {
         this.customerUnfllowInit()
         this.unfllowTableParam.content.dataid = ''
         this.unfllowTableParam.content.type = ''
-        this.unfllowTableParam.content.username = ''
+        this.unfllowTableParam.content.username = name
         this.$refs.customerUnfllowTable.listData()
+
+        this.dateParam.content.dataid = ''
+        this.getDate()
       }
     },
     selectRow (data) {