Merge branch 'testToMerge' into allTestUrgent

src/HDrpManagement/dataanalysis/modules/contact.vue

@@ -8,7 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增联系人`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增联系人"></exportFile>
+              <exportFile class="inline-16" :param="paramAdd" :columns="tablecolsAdd" file-name="新增联系人"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="contactAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -48,7 +48,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`更新联系人`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新联系人"></exportFile>
+              <exportFile class="inline-16" :param="paramUpdate" :columns="tablecolsUpdate" file-name="更新联系人"></exportFile>
               <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
               <fullScreen ref="updFullRef" class="inline-16" domId="contactUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
             </div>
@@ -77,7 +77,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`跟进联系人`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进联系人"></exportFile>
+              <exportFile class="inline-16" :param="paramFollow" :columns="tablecolsFollow" file-name="跟进联系人"></exportFile>
               <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
               <fullScreen ref="fowFullRef" class="inline-16" domId="contactFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
             </div>
@@ -162,12 +162,61 @@ export default {
         }
       ],
       isFull:false,
-      disabled:false
+      disabled:false,
+      paramAdd:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramUpdate:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramFollow:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      }
     }
   },
   methods:{
     async queryAdd(type){
       this.$refs.quickAdd.select = type?type:this.selectAdd
+
       this.param.content.dataType = 12
       this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
       this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
@@ -175,6 +224,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramAdd.content.dataType = 12
+      this.paramAdd.content.where.begindate = this.selectAdd ? '' :this.begindate
+      this.paramAdd.content.where.enddate = this.selectAdd ? '' : this.enddate
+      this.paramAdd.content.dateType = type?type:this.selectAdd
+      this.paramAdd.content.dataid = this.dataid
+      this.paramAdd.content.type = this.isDep?1:0
+      this.paramAdd.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -192,6 +250,7 @@ export default {
     },
     async queryUpdate(type){
       this.$refs.quickUpd.select = type?type:this.selectUpd
+
       this.param.content.dataType = 14
       this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
@@ -199,6 +258,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramUpdate.content.dataType = 14
+      this.paramUpdate.content.where.begindate = this.selectUpd ? '' :this.begindate
+      this.paramUpdate.content.where.enddate = this.selectUpd ? '' : this.enddate
+      this.paramUpdate.content.dateType = type?type:this.selectUpd
+      this.paramUpdate.content.dataid = this.dataid
+      this.paramUpdate.content.type = this.isDep?1:0
+      this.paramUpdate.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -216,6 +284,7 @@ export default {
     },
     async queryFollow(type){
       this.$refs.quickFow.select = type?type:this.selectFow
+
       this.param.content.dataType = 13
       this.param.content.where.begindate = this.selectFow ? '' :this.begindate
       this.param.content.where.enddate = this.selectFow ? '' : this.enddate
@@ -223,6 +292,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
+
+      this.paramFollow.content.dataType = 13
+      this.paramFollow.content.where.begindate = this.selectFow ? '' :this.begindate
+      this.paramFollow.content.where.enddate = this.selectFow ? '' : this.enddate
+      this.paramFollow.content.dateType = type?type:this.selectFow
+      this.paramFollow.content.dataid = this.dataid
+      this.paramFollow.content.type = this.isDep?1:0
+      this.paramFollow.content.sort = [this.sort[1]]
+
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -8,7 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增客户`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增客户"></exportFile>
+              <exportFile class="inline-16" :param="paramAdd" :columns="tablecolsAdd" file-name="新增客户"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="customerAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -37,7 +37,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`更新客户`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新客户"></exportFile>
+              <exportFile class="inline-16" :param="paramUpdate" :columns="tablecolsUpdate" file-name="更新客户"></exportFile>
               <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
               <fullScreen ref="updFullRef" class="inline-16" domId="customerUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
             </div>
@@ -66,7 +66,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`跟进客户`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进客户"></exportFile>
+              <exportFile class="inline-16" :param="paramFollow" :columns="tablecolsFollow" file-name="跟进客户"></exportFile>
               <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
               <fullScreen ref="fowFullRef" class="inline-16" domId="customerFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
             </div>
@@ -151,7 +151,55 @@ export default {
         }
       ],
       isFull:false,
-      disabled:false
+      disabled:false,
+      paramAdd:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramUpdate:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramFollow:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      }
     }
   },
   methods:{
@@ -164,6 +212,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramAdd.content.dataType = 4
+      this.paramAdd.content.where.begindate = this.selectAdd ? '' :this.begindate
+      this.paramAdd.content.where.enddate = this.selectAdd ? '' : this.enddate
+      this.paramAdd.content.dateType = type?type:this.selectAdd
+      this.paramAdd.content.dataid = this.dataid
+      this.paramAdd.content.type = this.isDep?1:0
+      this.paramAdd.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -181,6 +238,7 @@ export default {
     },
     async queryUpdate(type){
       this.$refs.quickUpd.select = type?type:this.selectUpd
+
       this.param.content.dataType = 5
       this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
@@ -188,6 +246,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramUpdate.content.dataType = 5
+      this.paramUpdate.content.where.begindate = this.selectUpd ? '' :this.begindate
+      this.paramUpdate.content.where.enddate = this.selectUpd ? '' : this.enddate
+      this.paramUpdate.content.dateType = type?type:this.selectUpd
+      this.paramUpdate.content.dataid = this.dataid
+      this.paramUpdate.content.type = this.isDep?1:0
+      this.paramUpdate.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -205,6 +272,7 @@ export default {
     },
     async queryFollow(type){
       this.$refs.quickFow.select = type?type:this.selectFow
+
       this.param.content.dataType = 6
       this.param.content.where.begindate = this.selectFow ? '' :this.begindate
       this.param.content.where.enddate = this.selectFow ? '' : this.enddate
@@ -212,6 +280,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
+
+      this.paramFollow.content.dataType = 6
+      this.paramFollow.content.where.begindate = this.selectFow ? '' :this.begindate
+      this.paramFollow.content.where.enddate = this.selectFow ? '' : this.enddate
+      this.paramFollow.content.dateType = type?type:this.selectFow
+      this.paramFollow.content.dataid = this.dataid
+      this.paramFollow.content.type = this.isDep?1:0
+      this.paramFollow.content.sort = [this.sort[1]]
+
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber

src/HDrpManagement/dataanalysis/modules/documents.vue

@@ -8,7 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t('报价单')}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="quotationTablecols" file-name="报价单"></exportFile>
+              <exportFile class="inline-16" :param="paramQuotation" :columns="quotationTablecols" file-name="报价单"></exportFile>
               <quickDate class="inline-16" @selectQuick="selectQuickQuotation"></quickDate>
               <fullScreen ref="quotationFullRef" class="inline-16" domId="quotationFull" @onFull="onFull('报价')" @backFull="backFull('报价')"></fullScreen>
             </div>
@@ -43,7 +43,7 @@
              <span style="font-size: 16px;color: #333">{{$t('合同')}}</span>
            </div>
            <div>
-             <exportFile class="inline-16" :param="param" :columns="contractTablecols" file-name="合同"></exportFile>
+             <exportFile class="inline-16" :param="paramContract" :columns="contractTablecols" file-name="合同"></exportFile>
              <quickDate class="inline-16" @selectQuick="selectQuickContract"></quickDate>
              <fullScreen ref="contractFullRef" class="inline-16" domId="contractFull" @onFull="onFull('合同')" @backFull="backFull('合同')"></fullScreen>
            </div>
@@ -116,7 +116,39 @@ export default {
         }
       ],
       isFull:false,
-      disabled:false
+      disabled:false,
+      paramQuotation:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramContract:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      }
     }
   },
   methods: {
@@ -130,6 +162,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
+
+      this.paramQuotation.content.dataType = 10
+      this.paramQuotation.content.where.begindate = this.quotationSelect ? '' :this.begindate
+      this.paramQuotation.content.where.enddate = this.quotationSelect ? '' : this.enddate
+      this.paramQuotation.content.dateType = this.quotationSelect
+      this.paramQuotation.content.dataid = this.dataid
+      this.paramQuotation.content.type = this.isDep?1:0
+      this.paramQuotation.content.sort = [this.sort[1]]
+
       const res = await this.$api.requested(this.param)
       this.quotationList = res.data
       this.quotationCurrentPage = res.pageNumber
@@ -155,6 +196,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
+
+      this.paramContract.content.dataType = 11
+      this.paramContract.content.where.begindate = this.contractSelect ? '' :this.begindate
+      this.paramContract.content.where.enddate = this.contractSelect ? '' : this.enddate
+      this.paramContract.content.dateType = this.contractSelect
+      this.paramContract.content.dataid = this.dataid
+      this.paramContract.content.type = this.isDep?1:0
+      this.paramContract.content.sort = [this.sort[1]]
+
       const res = await this.$api.requested(this.param)
       this.contractList = res.data
       this.contractCurrentPage = res.pageNumber

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -8,7 +8,7 @@
               <span style="font-size: 16px;color: #333">{{$t(`新增项目`)}}</span>
             </div>
             <div>
-              <exportFile class="inline-16" :param="param" :columns="tablecolsAdd" file-name="新增项目"></exportFile>
+              <exportFile class="inline-16" :param="paramAdd" :columns="tablecolsAdd" file-name="新增项目"></exportFile>
               <quickDate class="inline-16" ref="quickAdd" @selectQuick="selectQuickAdd" :disabled="disabled"></quickDate>
               <fullScreen ref="addFullRef" class="inline-16" domId="projectAddFull" @onFull="onFull('新增')" @backFull="backFull('新增')"></fullScreen>
             </div>
@@ -37,7 +37,7 @@
              <span style="font-size: 16px;color: #333">{{$t(`更新项目`)}}</span>
            </div>
            <div>
-             <exportFile class="inline-16" :param="param" :columns="tablecolsUpdate" file-name="更新项目"></exportFile>
+             <exportFile class="inline-16" :param="paramUpdate" :columns="tablecolsUpdate" file-name="更新项目"></exportFile>
              <quickDate class="inline-16"  ref="quickUpd" @selectQuick="selectQuickUpd"></quickDate>
              <fullScreen ref="updFullRef" class="inline-16" domId="projectUpdFull" @onFull="onFull('更新')" @backFull="backFull('更新')"></fullScreen>
            </div>
@@ -66,7 +66,7 @@
              <span style="font-size: 16px;color: #333">{{$t(`跟进项目`)}}</span>
            </div>
            <div>
-             <exportFile class="inline-16" :param="param" :columns="tablecolsFollow" file-name="跟进项目"></exportFile>
+             <exportFile class="inline-16" :param="paramFollow" :columns="tablecolsFollow" file-name="跟进项目"></exportFile>
              <quickDate class="inline-16" ref="quickFow" @selectQuick="selectQuickFow" :disabled="disabled"></quickDate>
              <fullScreen ref="fowFullRef" class="inline-16" domId="projectFowFull" @onFull="onFull('跟进')" @backFull="backFull('跟进')"></fullScreen>
            </div>
@@ -152,12 +152,61 @@ export default {
         }
       ],
       isFull:false,
-      disabled:false
+      disabled:false,
+      paramAdd:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramUpdate:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      },
+      paramFollow:{
+        "id": 20230617143104,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 10,
+          "dataType":"",//1 线索新增列表 2 线索更新列表 3 线索跟进列表4 客户新增列表 5 客户更新列表 6 客户跟进列表 7 项目新增列表8 项目更新列表 9 项目跟进列表 10 报价单列表 11 合同列表 12 联系人新增 13 联系人更进 14 联系人更新
+          "type":'',//0 按人搜素 1 按部门搜索
+          "dataid":"",// 人员id或部门id
+          "dateType":'',
+          "where":{
+            "begindate":"",
+            "enddate":"",
+            "isleave":"1"
+          }
+        }
+      }
     }
   },
   methods:{
     async queryAdd(type){
       this.$refs.quickAdd.select = type?type:this.selectAdd
+
       this.param.content.dataType = 7
       this.param.content.where.begindate = this.selectAdd ? '' :this.begindate
       this.param.content.where.enddate = this.selectAdd ? '' : this.enddate
@@ -165,6 +214,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramAdd.content.dataType = 7
+      this.paramAdd.content.where.begindate = this.selectAdd ? '' :this.begindate
+      this.paramAdd.content.where.enddate = this.selectAdd ? '' : this.enddate
+      this.paramAdd.content.dateType = type?type:this.selectAdd
+      this.paramAdd.content.dataid = this.dataid
+      this.paramAdd.content.type = this.isDep?1:0
+      this.paramAdd.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -182,6 +240,7 @@ export default {
     },
     async queryUpdate(type){
       this.$refs.quickUpd.select = type?type:this.selectUpd
+
       this.param.content.dataType = 8
       this.param.content.where.begindate = this.selectUpd ? '' :this.begindate
       this.param.content.where.enddate = this.selectUpd ? '' : this.enddate
@@ -189,6 +248,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[0]]
+
+      this.paramUpdate.content.dataType = 8
+      this.paramUpdate.content.where.begindate = this.selectUpd ? '' :this.begindate
+      this.paramUpdate.content.where.enddate = this.selectUpd ? '' : this.enddate
+      this.paramUpdate.content.dateType = type?type:this.selectUpd
+      this.paramUpdate.content.dataid = this.dataid
+      this.paramUpdate.content.type = this.isDep?1:0
+      this.paramUpdate.content.sort = [this.sort[0]]
+
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -206,6 +274,7 @@ export default {
     },
     async queryFollow(type){
       this.$refs.quickFow.select = type?type:this.selectFow
+
       this.param.content.dataType = 9
       this.param.content.where.begindate = this.selectFow ? '' :this.begindate
       this.param.content.where.enddate = this.selectFow ? '' : this.enddate
@@ -213,6 +282,15 @@ export default {
       this.param.content.dataid = this.dataid
       this.param.content.type = this.isDep?1:0
       this.param.content.sort = [this.sort[1]]
+
+      this.paramFollow.content.dataType = 9
+      this.paramFollow.content.where.begindate = this.selectFow ? '' :this.begindate
+      this.paramFollow.content.where.enddate = this.selectFow ? '' : this.enddate
+      this.paramFollow.content.dateType = type?type:this.selectFow
+      this.paramFollow.content.dataid = this.dataid
+      this.paramFollow.content.type = this.isDep?1:0
+      this.paramFollow.content.sort = [this.sort[1]]
+
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber