客户数据、项目数据、项目商机、报价单调整

src/HDrpManagement/customerData/index.vue

@@ -173,6 +173,48 @@
                         </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 = '全部';
+                          typeMapParam.content.where.begdate = '';typeMapParam.content.where.enddate = '';typeTableParam.content.where.begdate = '';typeTableParam.content.where.enddate = '';typeDate = []
+                          typeTableParam.content.pageNumber = 1;$refs.customerTypeTable.listData();customerTypeInit()">全部</el-button>
+                        <el-button :type="typeTableParam.content.dateType === '本年'?'primary':''" size="small" @click="typeMapParam.content.dateType = '本年';typeTableParam.content.dateType = '本年';
+                          typeDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];typeMapParam.content.where.begdate = new Date().getFullYear() + '-01';typeMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          typeTableParam.content.where.begdate = new Date().getFullYear() + '-01';typeTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          typeTableParam.content.pageNumber = 1;$refs.customerTypeTable.listData();customerTypeInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="typeDate"
+                          :clearable="false"
+                          @change="typeMapParam.content.dateType = '';typeMapParam.content.where.begdate = typeDate[0];typeMapParam.content.where.enddate = typeDate[1];typeTableParam.content.dateType = '';typeTableParam.content.where.begdate = typeDate[0];typeTableParam.content.where.enddate = typeDate[1];
+                          typeTableParam.content.pageNumber = 1;$refs.customerTypeTable.listData();customerTypeInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="typeDate"
+                          :clearable="false"
+                          @change="typeMapParam.content.dateType = '';typeMapParam.content.where.begdate = typeDate[0];typeMapParam.content.where.enddate = typeDate[1];typeTableParam.content.dateType = '';typeTableParam.content.where.begdate = typeDate[0];typeTableParam.content.where.enddate = typeDate[1];
+                          typeTableParam.content.pageNumber = 1;$refs.customerTypeTable.listData();customerTypeInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile :param="typeTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户类型情况统计" :dataid="typeMapParam.content.dataid"></exportFile>
                     </div>
@@ -254,6 +296,48 @@
                         </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 = '全部';
+                          gradMapParam.content.where.begdate = '';gradMapParam.content.where.enddate = '';gradTableParam.content.where.begdate = '';gradTableParam.content.where.enddate = '';gradDate = []
+                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">全部</el-button>
+                        <el-button :type="gradTableParam.content.dateType === '本年'?'primary':''" size="small" @click="gradMapParam.content.dateType = '本年';gradTableParam.content.dateType = '本年';
+                          gradDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];gradMapParam.content.where.begdate = new Date().getFullYear() + '-01';gradMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          gradTableParam.content.where.begdate = new Date().getFullYear() + '-01';gradTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="gradDate"
+                          :clearable="false"
+                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
+                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="gradDate"
+                          :clearable="false"
+                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
+                          gradTableParam.content.pageNumber = 1;$refs.customerGradTable.listData();customerGradInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="gradTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户等级情况统计" :dataid="gradMapParam.content.dataid"></exportFile>
                     </div>
@@ -332,6 +416,48 @@
                         </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 = '全部';
+                          contactMapParam.content.where.begdate = '';contactMapParam.content.where.enddate = '';contactTableParam.content.where.begdate = '';contactTableParam.content.where.enddate = '';contactDate = []
+                          contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()">全部</el-button>
+                        <el-button :type="contactTableParam.content.dateType === '本年'?'primary':''" size="small" @click="contactMapParam.content.dateType = '本年';contactTableParam.content.dateType = '本年';
+                          contactDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];contactMapParam.content.where.begdate = new Date().getFullYear() + '-01';contactMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          contactTableParam.content.where.begdate = new Date().getFullYear() + '-01';contactTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="contactDate"
+                          :clearable="false"
+                          @change="contactMapParam.content.dateType = '';contactMapParam.content.where.begdate = contactDate[0];contactMapParam.content.where.enddate = contactDate[1];contactTableParam.content.dateType = '';contactTableParam.content.where.begdate = contactDate[0];contactTableParam.content.where.enddate = contactDate[1];
+                          contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="contactDate"
+                          :clearable="false"
+                          @change="contactMapParam.content.dateType = '';contactMapParam.content.where.begdate = contactDate[0];contactMapParam.content.where.enddate = contactDate[1];contactTableParam.content.dateType = '';contactTableParam.content.where.begdate = contactDate[0];contactTableParam.content.where.enddate = contactDate[1];
+                          contactTableParam.content.pageNumber = 1;$refs.customerContactTable.listData();customerContactInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="contactTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户联系人情况统计" :dataid="contactMapParam.content.dataid"></exportFile>
                     </div>
@@ -394,13 +520,13 @@
                         v-model="projectTableParam.content.dataid"
                         :options="deplist"
                         :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"
-                        @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerFllowInit()}}"></el-cascader>
+                        @change="$event => {if($event.length) {projectMapParam.content.type=1;projectMapParam.content.dataid=$event[$event.length - 1];projectTableParam.content.type=1;projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.username='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()}}"></el-cascader>
                     </div>
                     <div class="mt-10 inline-16">
                       <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();customerFllowInit()} else {projectMapParam.content.type='';projectMapParam.content.dataid='';projectTableParam.content.dataid='';projectTableParam.content.type='';projectTableParam.content.depname='';projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerFllowInit()}}"
+                      @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()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -410,6 +536,48 @@
                         </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 = '全部';
+                          projectMapParam.content.where.begdate = '';projectMapParam.content.where.enddate = '';projectTableParam.content.where.begdate = '';projectTableParam.content.where.enddate = '';projectDate = []
+                          projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()">全部</el-button>
+                        <el-button :type="projectTableParam.content.dateType === '本年'?'primary':''" size="small" @click="projectMapParam.content.dateType = '本年';projectTableParam.content.dateType = '本年';
+                          projectDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];projectMapParam.content.where.begdate = new Date().getFullYear() + '-01';projectMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          projectTableParam.content.where.begdate = new Date().getFullYear() + '-01';projectTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="projectDate"
+                          :clearable="false"
+                          @change="projectMapParam.content.dateType = '';projectMapParam.content.where.begdate = projectDate[0];projectMapParam.content.where.enddate = projectDate[1];projectTableParam.content.dateType = '';projectTableParam.content.where.begdate = projectDate[0];projectTableParam.content.where.enddate = projectDate[1];
+                          projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="projectDate"
+                          :clearable="false"
+                          @change="projectMapParam.content.dateType = '';projectMapParam.content.where.begdate = projectDate[0];projectMapParam.content.where.enddate = projectDate[1];projectTableParam.content.dateType = '';projectTableParam.content.where.begdate = projectDate[0];projectTableParam.content.where.enddate = projectDate[1];
+                          projectTableParam.content.pageNumber = 1;$refs.customerProjectTable.listData();customerProjectInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="projectTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户关联项目情况统计" :dataid="projectMapParam.content.dataid"></exportFile>
                     </div>
@@ -488,6 +656,48 @@
                         </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 = '全部';
+                          fllowMapParam.content.where.begdate = '';fllowMapParam.content.where.enddate = '';fllowTableParam.content.where.begdate = '';fllowTableParam.content.where.enddate = '';fllowDate = []
+                          fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()">全部</el-button>
+                        <el-button :type="fllowTableParam.content.dateType === '本年'?'primary':''" size="small" @click="fllowMapParam.content.dateType = '本年';fllowTableParam.content.dateType = '本年';
+                          fllowDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];fllowMapParam.content.where.begdate = new Date().getFullYear() + '-01';fllowMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          fllowTableParam.content.where.begdate = new Date().getFullYear() + '-01';fllowTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="fllowDate"
+                          :clearable="false"
+                          @change="fllowMapParam.content.dateType = '';fllowMapParam.content.where.begdate = fllowDate[0];fllowMapParam.content.where.enddate = fllowDate[1];fllowTableParam.content.dateType = '';fllowTableParam.content.where.begdate = fllowDate[0];fllowTableParam.content.where.enddate = fllowDate[1];
+                          fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="fllowDate"
+                          :clearable="false"
+                          @change="fllowMapParam.content.dateType = '';fllowMapParam.content.where.begdate = fllowDate[0];fllowMapParam.content.where.enddate = fllowDate[1];fllowTableParam.content.dateType = '';fllowTableParam.content.where.begdate = fllowDate[0];fllowTableParam.content.where.enddate = fllowDate[1];
+                          fllowTableParam.content.pageNumber = 1;$refs.customerFllowTable.listData();customerFllowInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="fllowTableParam" :columns="tool.tabelCol($route.name).typeTable.tablecols" fileName="客户跟进情况统计" :dataid="fllowMapParam.content.dataid"></exportFile>
                     </div>
@@ -865,13 +1075,19 @@ export default {
         }
       },
       //客户类型
+      typeDate:[],
       typeMapParam: {
         "id": 20231015203704,
         "content": {
           "depname":'',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
-          "dataid": ''
+          "dataid": '',
+          "dateType":"全部",
+          "where":{
+            "begdate":"",
+            "enddate":""
+          }
         }
       },
       typeTableParam:{
@@ -882,8 +1098,11 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
+          "dateType":"全部",
           "where": {
-              "customerstype":""// 客户各种类型 以及 无类型  ------ 客户类型情况统计列表使用该字段
+              "customerstype":"",// 客户各种类型 以及 无类型  ------ 客户类型情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -893,13 +1112,19 @@ export default {
       },
       //客户等级
       customerGradMap:'',
+      gradDate:[],
       gradMapParam: {
         "id": 20231017140904,
         "content": {
           "depname":'',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
-          "dataid": ''
+          "dataid": '',
+          "dateType":"全部",
+          "where":{
+            "begdate":"",
+            "enddate":""
+          }
         }
       },
       gradTableParam:{
@@ -910,8 +1135,11 @@ export default {
           "pageSize":20,
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageNumber":1,
+          "dateType":"全部",
           "where": {
               "grade": "", // 1 2 3 4 5 无等级  ------客户等级统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -921,13 +1149,19 @@ export default {
       },
       //客户联系人
       customerContactMap:'',
+      contactDate:[],
       contactMapParam: {
         "id": 20231017141904,
         "content": {
           "depname":'',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
-          "dataid": ''
+          "dataid": '',
+          "dateType":"全部",
+          "where":{
+            "begdate":"",
+            "enddate":""
+          }
         }
       },
       contactTableParam:{
@@ -938,8 +1172,11 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
+          "dateType":"全部",
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------客户联系人情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -949,13 +1186,19 @@ export default {
       },
       //客户关联项目
       customerProjectMap:'',
+      projectDate:[],
       projectMapParam: {
         "id": 20231017143504,
         "content": {
           "depname":'',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
-          "dataid": ''
+          "dataid": '',
+          "dateType":"全部",
+          "where":{
+            "begdate":"",
+            "enddate":""
+          }
         }
       },
       projectTableParam:{
@@ -966,8 +1209,11 @@ export default {
           "pageSize":20,
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageNumber":1,
+          "dateType":"全部",
           "where": {
               "isproject": "", //无关联项目 有关联项目  ------客户关联项目情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -977,13 +1223,19 @@ export default {
       },
       //客户跟进情况
       customerFllowMap:'',
+      fllowDate:[],
       fllowMapParam: {
         "id": 20231017151304,
         "content": {
           "depname":'',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
-          "dataid": ''
+          "dataid": '',
+          "dateType":"全部",
+          "where":{
+            "begdate":"",
+            "enddate":""
+          }
         }
       },
       fllowTableParam:{
@@ -994,8 +1246,11 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
+          "dateType":"全部",
           "where": {
               "isfollowup": "", // 有跟进 无跟进------客户跟进情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },

src/HDrpManagement/projectChange/components/del.vue

@@ -5,7 +5,7 @@
       <el-row :gutter="20">
         <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
           <el-col :span="24">
-            <el-form-item label="作废原因" >
+            <el-form-item label="作废原因" prop="deletereason">
               <el-input v-model="form.deletereason" placeholder="请输入作废原因" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
@@ -44,16 +44,20 @@ export default {
   },
   props: ['id',"disabled","rowData"],
   methods: {
-    async submit() {
-      this.form.sa_projectids = [this.id]
-      let res = await this.$api.requested({
-        "id": 20221020144302,
-        "content": this.form
-      })
-      this.tool.showMessage(res,() => {
-        this.$emit('deleteSuccess')
-        this.dialogTableVisible = false
+    submit() {
+      this.$refs.form.validate(async (valid)=>{
+        if (!valid) return false
+        this.form.sa_projectids = [this.id]
+        let res = await this.$api.requested({
+          "id": 20221020144302,
+          "content": this.form
+        })
+        this.tool.showMessage(res,() => {
+          this.$emit('deleteSuccess')
+          this.dialogTableVisible = false
+        })
       })
+
     },
   },
   created () {

src/HDrpManagement/projectData/index.vue

@@ -132,10 +132,46 @@
                     </div>
                     <div class="mt-10 inline-16">
                       <el-button-group>
-                        <el-button type="primary" size="small">全部</el-button>
-                        <el-button type="primary" size="small">本年</el-button>
+                        <el-button :type="typeTableParam.content.dateType === '全部'?'primary':''" size="small" @click="typeMapParam.content.dateType = '全部';typeTableParam.content.dateType = '全部';
+                          typeMapParam.content.where.begdate = '';typeMapParam.content.where.enddate = '';typeTableParam.content.where.begdate = '';typeTableParam.content.where.enddate = '';typeDate = []
+                          typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()">全部</el-button>
+                        <el-button :type="typeTableParam.content.dateType === '本年'?'primary':''" size="small" @click="typeMapParam.content.dateType = '本年';typeTableParam.content.dateType = '本年';
+                          typeDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];typeMapParam.content.where.begdate = new Date().getFullYear() + '-01';typeMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          typeTableParam.content.where.begdate = new Date().getFullYear() + '-01';typeTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()">本年</el-button>
                       </el-button-group>
                     </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="typeDate"
+                          :clearable="false"
+                          @change="typeMapParam.content.dateType = '';typeMapParam.content.where.begdate = typeDate[0];typeMapParam.content.where.enddate = typeDate[1];typeTableParam.content.dateType = '';typeTableParam.content.where.begdate = typeDate[0];typeTableParam.content.where.enddate = typeDate[1];
+                          typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="typeDate"
+                          :clearable="false"
+                          @change="typeMapParam.content.dateType = '';typeMapParam.content.where.begdate = typeDate[0];typeMapParam.content.where.enddate = typeDate[1];typeTableParam.content.dateType = '';typeTableParam.content.where.begdate = typeDate[0];typeTableParam.content.where.enddate = typeDate[1];
+                          typeTableParam.content.pageNumber = 1;$refs.typeTable.listData();typeInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="typeTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目类型分析" :dataid="typeMapParam.content.dataid"></exportFile>
                     </div>
@@ -224,6 +260,48 @@
                         </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 = '全部';
+                          gradMapParam.content.where.begdate = '';gradMapParam.content.where.enddate = '';gradTableParam.content.where.begdate = '';gradTableParam.content.where.enddate = '';gradDate = []
+                          gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()">全部</el-button>
+                        <el-button :type="gradTableParam.content.dateType === '本年'?'primary':''" size="small" @click="gradMapParam.content.dateType = '本年';gradTableParam.content.dateType = '本年';
+                          gradDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];gradMapParam.content.where.begdate = new Date().getFullYear() + '-01';gradMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          gradTableParam.content.where.begdate = new Date().getFullYear() + '-01';gradTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="gradDate"
+                          :clearable="false"
+                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
+                          gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="gradDate"
+                          :clearable="false"
+                          @change="gradMapParam.content.dateType = '';gradMapParam.content.where.begdate = gradDate[0];gradMapParam.content.where.enddate = gradDate[1];gradTableParam.content.dateType = '';gradTableParam.content.where.begdate = gradDate[0];gradTableParam.content.where.enddate = gradDate[1];
+                          gradTableParam.content.pageNumber = 1;$refs.gradTable.listData();gradInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="gradTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目等级分析" :dataid="gradMapParam.content.dataid"></exportFile>
                     </div>
@@ -636,7 +714,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='';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()}}"
+                      @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.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()}}"
                       >
                         <el-option
                             v-for="item in personnelList"
@@ -646,6 +726,48 @@
                         </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 = '全部';
+                          fllowMapParam.content.where.begdate = '';fllowMapParam.content.where.enddate = '';fllowTableParam.content.where.begdate = '';fllowTableParam.content.where.enddate = '';fllowDate = []
+                          fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()">全部</el-button>
+                        <el-button :type="fllowTableParam.content.dateType === '本年'?'primary':''" size="small" @click="fllowMapParam.content.dateType = '本年';fllowTableParam.content.dateType = '本年';
+                          fllowDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];fllowMapParam.content.where.begdate = new Date().getFullYear() + '-01';fllowMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          fllowTableParam.content.where.begdate = new Date().getFullYear() + '-01';fllowTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="fllowDate"
+                          :clearable="false"
+                          @change="fllowMapParam.content.dateType = '';fllowMapParam.content.where.begdate = fllowDate[0];fllowMapParam.content.where.enddate = fllowDate[1];fllowTableParam.content.dateType = '';fllowTableParam.content.where.begdate = fllowDate[0];fllowTableParam.content.where.enddate = fllowDate[1];
+                          fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="fllowDate"
+                          :clearable="false"
+                          @change="fllowMapParam.content.dateType = '';fllowMapParam.content.where.begdate = fllowDate[0];fllowMapParam.content.where.enddate = fllowDate[1];fllowTableParam.content.dateType = '';fllowTableParam.content.where.begdate = fllowDate[0];fllowTableParam.content.where.enddate = fllowDate[1];
+                          fllowTableParam.content.pageNumber = 1;$refs.projectFllowTable.listData();fllowInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile :param="fllowTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目跟进情况统计" :dataid="fllowMapParam.content.dataid"></exportFile>
                     </div>
@@ -732,6 +854,48 @@
                         </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 = '全部';
+                          contactMapParam.content.where.begdate = '';contactMapParam.content.where.enddate = '';contactTableParam.content.where.begdate = '';contactTableParam.content.where.enddate = '';contactDate = []
+                          contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()">全部</el-button>
+                        <el-button :type="contactTableParam.content.dateType === '本年'?'primary':''" size="small" @click="contactMapParam.content.dateType = '本年';contactTableParam.content.dateType = '本年';
+                          contactDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];contactMapParam.content.where.begdate = new Date().getFullYear() + '-01';contactMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          contactTableParam.content.where.begdate = new Date().getFullYear() + '-01';contactTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="contactDate"
+                          :clearable="false"
+                          @change="contactMapParam.content.dateType = '';contactMapParam.content.where.begdate = contactDate[0];contactMapParam.content.where.enddate = contactDate[1];contactTableParam.content.dateType = '';contactTableParam.content.where.begdate = contactDate[0];contactTableParam.content.where.enddate = contactDate[1];
+                          contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="contactDate"
+                          :clearable="false"
+                          @change="contactMapParam.content.dateType = '';contactMapParam.content.where.begdate = contactDate[0];contactMapParam.content.where.enddate = contactDate[1];contactTableParam.content.dateType = '';contactTableParam.content.where.begdate = contactDate[0];contactTableParam.content.where.enddate = contactDate[1];
+                          contactTableParam.content.pageNumber = 1;$refs.projectContactTable.listData();contactInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="contactTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目联系人情况统计" :dataid="contactMapParam.content.dataid"></exportFile>
                     </div>
@@ -818,6 +982,48 @@
                         </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 = '全部';
+                          customerMapParam.content.where.begdate = '';customerMapParam.content.where.enddate = '';customerTableParam.content.where.begdate = '';customerTableParam.content.where.enddate = '';customerDate = []
+                          customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()">全部</el-button>
+                        <el-button :type="customerTableParam.content.dateType === '本年'?'primary':''" size="small" @click="customerMapParam.content.dateType = '本年';customerTableParam.content.dateType = '本年';
+                          customerDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];customerMapParam.content.where.begdate = new Date().getFullYear() + '-01';customerMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          customerTableParam.content.where.begdate = new Date().getFullYear() + '-01';customerTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="customerDate"
+                          :clearable="false"
+                          @change="customerMapParam.content.dateType = '';customerMapParam.content.where.begdate = customerDate[0];customerMapParam.content.where.enddate = customerDate[1];customerTableParam.content.dateType = '';customerTableParam.content.where.begdate = customerDate[0];customerTableParam.content.where.enddate = customerDate[1];
+                          customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="customerDate"
+                          :clearable="false"
+                          @change="customerMapParam.content.dateType = '';customerMapParam.content.where.begdate = customerDate[0];customerMapParam.content.where.enddate = customerDate[1];customerTableParam.content.dateType = '';customerTableParam.content.where.begdate = customerDate[0];customerTableParam.content.where.enddate = customerDate[1];
+                          customerTableParam.content.pageNumber = 1;$refs.projectCustomerTable.listData();customerInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="customerTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目关联客户情况统计" :dataid="customerMapParam.content.dataid"></exportFile>
                     </div>
@@ -904,6 +1110,48 @@
                         </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 = '全部';
+                          scoreMapParam.content.where.begdate = '';scoreMapParam.content.where.enddate = '';scoreTableParam.content.where.begdate = '';scoreTableParam.content.where.enddate = '';scoreDate = []
+                          scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()">全部</el-button>
+                        <el-button :type="scoreTableParam.content.dateType === '本年'?'primary':''" size="small" @click="scoreMapParam.content.dateType = '本年';scoreTableParam.content.dateType = '本年';
+                          scoreDate = [new Date().getFullYear() + '-01',new Date().getFullYear() + '-12'];scoreMapParam.content.where.begdate = new Date().getFullYear() + '-01';scoreMapParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          scoreTableParam.content.where.begdate = new Date().getFullYear() + '-01';scoreTableParam.content.where.enddate = new Date().getFullYear() + '-12';
+                          scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()">本年</el-button>
+                      </el-button-group>
+                    </div>
+                    <div class="mt-10 inline-16">
+                      <el-date-picker
+                          v-show="isFull"
+                          :append-to-body="false"
+                          v-model="scoreDate"
+                          :clearable="false"
+                          @change="scoreMapParam.content.dateType = '';scoreMapParam.content.where.begdate = scoreDate[0];scoreMapParam.content.where.enddate = scoreDate[1];scoreTableParam.content.dateType = '';scoreTableParam.content.where.begdate = scoreDate[0];scoreTableParam.content.where.enddate = scoreDate[1];
+                          scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                      <el-date-picker
+                          v-show="!isFull"
+                          v-model="scoreDate"
+                          :clearable="false"
+                          @change="scoreMapParam.content.dateType = '';scoreMapParam.content.where.begdate = scoreDate[0];scoreMapParam.content.where.enddate = scoreDate[1];scoreTableParam.content.dateType = '';scoreTableParam.content.where.begdate = scoreDate[0];scoreTableParam.content.where.enddate = scoreDate[1];
+                          scoreTableParam.content.pageNumber = 1;$refs.projectScoreTable.listData();projectScoreInit()"
+                          size="small"
+                          format="yyyy-MM"
+                          value-format="yyyy-MM"
+                          type="monthrange"
+                          range-separator="至"
+                          start-placeholder="开始月份"
+                          end-placeholder="结束月份">
+                      </el-date-picker>
+                    </div>
                     <div class="mt-10 inline-15">
                       <exportFile  :param="scoreTableParam" :columns="tool.tabelCol($route.name).projectTable.tablecols" fileName="项目评估情况统计" :dataid="scoreMapParam.content.dataid"></exportFile>
                     </div>
@@ -1241,14 +1489,18 @@ export default {
       person:'',
       //项目类型分析
       typeMap:'',
+      typeDate:[],
       typeMapParam: {
         "id": 20231018140404,
         "content": {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
+          "dateType":'全部',
           "where":{
-              "projecttype":""
+              "projecttype":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1258,13 +1510,16 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":'全部',
           "where": {
               // "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
               // "grade": "", //  项目等级统计列表使用该字段
               // "iscontacts": "", //无联系人 有联系人  ------项目联系人情况统计列表使用该字段
               // "iscustomers": "", //无关联客户 有关联客户  ------项目关联客户情况统计列表使用该字段
               // "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段
-              "projecttype":""//   项目类型分析统计列表使用该最低端
+              "projecttype":"",//   项目类型分析统计列表使用该最低端
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1273,14 +1528,18 @@ export default {
       },
       //项目等级分析
       gradMap:'',
+      gradDate:[],
       gradMapParam: {
         "id": 20231018141804,
         "content": {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":'全部',
           "where":{
-              "grade":""
+              "grade":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1290,8 +1549,11 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":'全部',
           "where": {
               "grade": "", //  项目等级统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1383,15 +1645,19 @@ export default {
       },
       //项目跟进分析
     /*  projectFllowMap:'',*/
+      fllowDate:[],
       fllowMapParam: {
         "id": 20231019085304,
         "content": {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
-          "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
+          "dateType":'全部',
+          // "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
           "where":{
-              "grade":""
+              "grade":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1401,8 +1667,11 @@ export default {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
+          "dateType":'全部',
           "where": {
               "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1411,14 +1680,18 @@ export default {
       },
       //项目联系人分析
       projectFllowMap:'',
+      contactDate:[],
       contactMapParam: {
         "id": 20231019085404,
         "content": {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":'全部',
           "where":{
-              "grade":""
+              "grade":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1428,8 +1701,11 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":'全部',
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------项目联系人情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1438,14 +1714,18 @@ export default {
       },
       //项目关联客户分析
       projectCustomerMap:'',
+      customerDate:[],
       customerMapParam: {
         "id": 20231019085504,
         "content": {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":"全部",
           "where":{
-              "iscustomers":""
+              "iscustomers":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1455,8 +1735,11 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":"全部",
           "where": {
               "iscustomers": "", //无关联客户 有关联客户  ------项目关联客户情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1465,14 +1748,18 @@ export default {
       },
       //项目评估分析
       projectScoreMap:'',
+      scoreDate:[],
       scoreMapParam: {
         "id": 20231019085604,
         "content": {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":"全部",
           "where":{
-              "istask":""
+              "istask":"",
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -1481,9 +1768,12 @@ export default {
         "content": {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
+          "dateType":"全部",
           "dataid": '',
           "where": {
               "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段
+              "begdate":"",
+              "enddate":""
           }
         }
       },
@@ -2868,6 +3158,4 @@ export default {
 .panel-table {
   height: 100%;
 }
-
-
 </style>

src/SDrpManagement/QuotedPrice/detail/components/toVoid.vue

@@ -10,7 +10,7 @@ export default {
   props:['data','disabled'],
   methods:{
     onToVoid(){
-      this.$prompt('请输入作废原因', '提示', {
+      this.$prompt('作废原因', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputValidator: (value => {
@@ -47,4 +47,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/views/salesData/index.vue

@@ -155,6 +155,9 @@ export default {
       this.$refs.orderTrendAnalysis.$refs.departmentSalesperson.personnelList = this.personnelList
       /*订单类型占比分析*/
       this.$refs.orderType.listData(dataid)
+      this.$refs.orderType.$refs.departmentSalesperson.person = userName
+      this.$refs.orderType.$refs.departmentSalesperson.deplist = this.deplist
+      this.$refs.orderType.$refs.departmentSalesperson.personnelList = this.personnelList
       /*出货趋势分析*/
       this.$refs.shippingTrendAnalysis.listData(dataid)
       this.$refs.shippingTrendAnalysis.$refs.departmentSalesperson.person = userName
@@ -246,6 +249,10 @@ export default {
       /*订单类型占比分析*/
       this.$refs.orderType.param.content.type = type
       this.$refs.orderType.queryModel(dataid)
+      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)

src/views/salesData/modules/orderType.vue

@@ -6,8 +6,10 @@
           <div class="div-line div-line-right"></div>
           <div class="title" style="min-width: 220px;"> 订单类型占比分析</div>
         </div>
-
         <div class="in">
+          <div class="inline-16 mt-10">
+            <departmentSalesperson ref="departmentSalesperson" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
+          </div>
           <div class="inline-16 mt-10">
             <el-button-group >
               <el-button size="small" :type="type === '金额'?'primary':''" @click="changeType('金额')">金额</el-button>
@@ -16,6 +18,7 @@
           </div>
           <div class="inline-16 mt-10">
             <el-button-group >
+              <el-button size="small" :type="dateType === '全部'?'primary':''" @click="changeTypeDate('全部')">全部</el-button>
               <el-button size="small" :type="dateType === '本年'?'primary':''" @click="changeTypeDate('本年')">本年</el-button>
               <el-button size="small" :type="dateType === '本月'?'primary':''" @click="changeTypeDate('本月')">本月</el-button>
             </el-button-group>
@@ -86,17 +89,18 @@ import { Pie,G2,measureTextWidth } from '@antv/g2plot';
 import tableTemplate from '@/views/salesData/components/table';
 import fullScreen from "@/views/salesData/components/fullScreen";
 import exportFile from '@/components/export_file/index'
+import departmentSalesperson from "@/views/salesData/components/departmentSalesperson";
 const G = G2.getEngine('canvas');
 export default {
   name: "orderType",
   props:['dataid','scrollHeight','windowWidth'],
-  components:{tableTemplate,fullScreen,exportFile},
+  components:{tableTemplate,fullScreen,exportFile,departmentSalesperson},
   data(){
     return {
       chartPie:null,
       type:'金额',
-      dateType:'本年',
-      monthDate:[new Date().getFullYear() + '-1',new Date().getFullYear() + '-' + (new Date().getMonth() + 1)],
+      dateType:'全部',
+      monthDate:[],
       list:[],
       tablecols:[],
       currentPage:0,
@@ -106,7 +110,7 @@ export default {
         "content": {
           "type": 0,
           "dataid": 54,
-          "dateType": "本年",// 本年 本月 日期筛选时为空
+          "dateType": "",// 本年 本月 日期筛选时为空
           "dataType":"金额",//金额 数量
           "pageSize":20,
           "pageNumber":1,
@@ -127,7 +131,7 @@ export default {
     async listData(val){
       this.param.content.dataid = val || this.dataid
       this.param.content.dataType = this.type
-      this.param.content.dateType = this.dateType
+      this.param.content.dateType = this.dateType === '全部'?'':this.dateType
       const res = await this.$api.requested(this.param)
       if (res.data.length ===1){
         if (res.data.isEmpty === 1){
@@ -163,7 +167,7 @@ export default {
     async queryModel(val){
       this.param.content.dataid = val || this.dataid
       this.param.content.dataType = this.type
-      this.param.content.dateType = this.dateType
+      this.param.content.dateType = this.dateType === '全部'?'':this.dateType
       const res = await this.$api.requested(this.param)
       if (res.data.length === 1){
         if (res.data[0].isEmpty === 1){
@@ -276,11 +280,15 @@ export default {
       this.param.content.where.begdate = ''
       this.param.content.where.enddate = ''
       if (val === '本年'){
-        this.monthDate = [new Date().getFullYear() + '-1',new Date().getFullYear() + '-' + (new Date().getMonth() + 1)]
-      }else {
+        this.monthDate = [new Date().getFullYear() + '-1',new Date().getFullYear() + '-12']
+      }else if (val === '本月'){
         this.monthDate[0] = new Date().getFullYear() + '-' + (new Date().getMonth() + 1)
         this.monthDate[1] = new Date().getFullYear() + '-' + (new Date().getMonth() + 1)
         this.monthDate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1),new Date().getFullYear() + '-' + (new Date().getMonth() + 1)]
+      }else {
+        this.monthDate[0] = ''
+        this.monthDate[1] = ''
+        this.monthDate = []
       }
       this.dateType = val
       this.queryModel(this.param.content.dataid)
@@ -330,7 +338,19 @@ export default {
       this.heightTable = '352px'
       this.isFull = false
       this.$emit('backFull',val)
-    }
+    },
+    /*选择部门*/
+    depSelect(val){
+      this.param.content.type = 1
+      this.param.content.dataid = val
+      this.queryModel(val)
+    },
+    /*选择业务员*/
+    personSelect(val){
+      this.param.content.type = 0
+      this.param.content.dataid = val
+      this.queryModel(val)
+    },
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).orderTypeTable.tablecols