代码整理，优化

CallCenterWeb.UI/RMYY/src/store/modules/user.js

@@ -66,7 +66,7 @@ const user = {
       window.localStorage.setItem('ext', userInfo.extension)
       return new Promise((resolve, reject) => {
         login(username, password).then(response => {
-          console.log(response.data)
+          
           setToken(response.data)
           commit('SET_TOKEN', response.data)
           resolve()

CallCenterWeb.UI/RMYY/src/utils/index.js

@@ -280,7 +280,7 @@ export function formatterContent(strVal) {
 
 // GUID 的格式为“xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx”，其中的 x 是 0-9 或 a-f 范围内的一个32位十六进制数
 export function guid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     const r = Math.random() * 16 | 0
     const v = c === 'x' ? r : (r & 0x3 | 0x8)
     return v.toString(16)
@@ -317,7 +317,7 @@ export function uniqueObjArray(oldArr, attr) {
 // 针对此类高频度触发事件问题（例如页面 scroll ，屏幕 resize，监听用户输入等），有两种常用的解决方法，防抖和节流。
 export function debounce(func, wait, immediate) {
   let timeout, args, context, timestamp, result
-  const later = function() {
+  const later = function () {
     // 据上一次触发时间间隔
     const last = +new Date() - timestamp
 
@@ -333,7 +333,7 @@ export function debounce(func, wait, immediate) {
       }
     }
   }
-  return function(...args) {
+  return function (...args) {
     context = this
     timestamp = +new Date()
     const callNow = immediate && !timeout
@@ -352,31 +352,131 @@ export function firstToUpper(str) {
   return str.replace(/( |^)[a-z]/g, (L) => L.toUpperCase())
 }
 
- // 导出
-export function exportData(response) {
-  const content = response.data
-  const blob = new Blob([content])
-  // let fileName = '报表数据.xls'
-  let fileName = response.headers['content-disposition'].split(';')[1].split('=')[1]
-  var explorer = navigator.userAgent
-  if (explorer.indexOf('MSIE') >= 0 || explorer.indexOf('Chrome') >= 0) { // IE和google浏览器
-    fileName = decodeURIComponent(fileName)
-  } else {
-    fileName = decodeURI(escape(fileName))
+// 导出
+export function exportExcel(exporParams, getListExpt) {
+  return new Promise(resolve => {
+
+    getListExpt(exporParams).then(response => {
+      if (response.headers['content-disposition']) {
+        const content = response.data
+        const blob = new Blob([content])
+        // let fileName = '报表数据.xls'
+        let fileName = response.headers['content-disposition'].split(';')[1].split('=')[1]
+        var explorer = navigator.userAgent
+        if (explorer.indexOf('MSIE') >= 0 || explorer.indexOf('Chrome') >= 0) { // IE和google浏览器
+          fileName = decodeURIComponent(fileName)
+        } else {
+          fileName = decodeURI(escape(fileName))
+        }
+        if ('download' in document.createElement('a')) {
+          // 非IE下载
+          const elink = document.createElement('a')
+          elink.download = fileName
+          elink.style.display = 'none'
+          elink.href = URL.createObjectURL(blob)
+          document.body.appendChild(elink)
+          elink.click()
+          URL.revokeObjectURL(elink.href) // 释放URL 对象
+          document.body.removeChild(elink)
+        } else {
+          // IE10+下载
+          navigator.msSaveBlob(blob, fileName)
+        }
+      } else {
+        this.$message.error(response)
+      }
+    })
+    resolve()
+  })
+
+}
+
+/**
+     * 将一维的扁平数组转换为多层级对象
+     * @param  {[type]} list 一维数组，数组中每一个元素需包含id和pid两个属性
+     * @return {[type]} tree 多层级树状结构
+     */
+export function buildTree(list) {
+  const temp = {}
+  const tree = {}
+  const arr = []
+  for (const j in list) {
+    temp[list[j].id] = list[j]
   }
-  if ('download' in document.createElement('a')) {
-  // 非IE下载
-    const elink = document.createElement('a')
-    elink.download = fileName
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href) // 释放URL 对象
-    document.body.removeChild(elink)
-  } else {
-  // IE10+下载
-    navigator.msSaveBlob(blob, fileName)
+  for (const i in temp) {
+    // if (temp[i].pid !== 'Moudle_000000000000000000000000') {
+    if (temp[i].pid !== 0) {
+      if (!temp[temp[i].pid].children) {
+        temp[temp[i].pid].children = []
+      }
+      temp[temp[i].pid].children[temp[i].id] = temp[i]
+    } else {
+      tree[temp[i].id] = temp[i]
+    }
   }
+
+  return tree
+}
+// 处理菜单树形结构数据格式
+export function filterTreeDatas(tree) {
+  const accessedRouters = []
+  let j = -1
+  for (const i in tree) {
+    j++
+    accessedRouters.push({
+      id: tree[i].id,
+      label: tree[i].name,
+      children: []
+    })
+    if (tree[i].children) {
+      accessedRouters[j].children = filterTreeDatas(tree[i].children)
+    }
+  }
+  return accessedRouters
+}
+export function buildMenuTree(list) {
+  const temp = {}
+  const tree = {}
+  for (const j in list) {
+    temp[list[j].F_MenuId] = list[j]
+  }
+  for (const i in temp) {
+    if (temp[i].F_ParentId !== 0) {
+      if (!temp[temp[i].F_ParentId].childnodes) {
+        temp[temp[i].F_ParentId].childnodes = {}
+      }
+      temp[temp[i].F_ParentId].childnodes[temp[i].F_MenuId] = temp[i]
+    } else {
+      tree[temp[i].F_MenuId] = temp[i]
+    }
+  }
+  return tree
+}
+// 处理菜单数据格式
+export function filterMenuDatas(menudatas) {
+  const accessedRouters = []
+  let j = -1
+  for (const i in menudatas) {
+    j++
+    accessedRouters.push({
+      id: menudatas[i].F_MenuId,
+      path: menudatas[i].F_Url,
+      code: menudatas[i].F_MenuCode,
+      name: menudatas[i].F_MenuName,
+      target: menudatas[i].F_Type, // 菜单类型
+      stateFlag: menudatas[i].F_State, // 是否启用
+      remark: menudatas[i].F_Remark, // 介绍
+      sort: menudatas[i].F_Sort, // 排序
+      children: []
+    })
+
+    if (menudatas[i].childnodes) {
+      accessedRouters[j].children = filterMenuDatas(menudatas[i].childnodes)
+    }
+  }
+  accessedRouters.sort(function (x, y) {
+    return x.sort - y.sort
+  })
+  return accessedRouters
 }
 

CallCenterWeb.UI/RMYY/src/views/callScreen/components/addressNumber.vue

@@ -23,7 +23,12 @@
       </p>
     </el-col>
     <el-col :span="4">
+        
       <div class="callin_btns">
+        <div class="swBtn">
+          <img src="../../../../static/img/dingding.png" alt="">
+          <img src="../../../../static/img/dx.png" alt="">
+        </div>
         <el-tooltip content="点击加入黑名单" placement="top">
           <i v-show="!isBlack" class="callin_btn callinblack" @click="btn_addBlack" />
         </el-tooltip>
@@ -194,6 +199,7 @@ export default {
 			position: absolute;
 			right: 0;
 			top: 0;
+      display: flex;
 		}
 
 		.callin_btn {
@@ -211,5 +217,10 @@ export default {
 		.callincelblack {
 			background: url("~@/assets/imgs/callincelblack.png") center center no-repeat;
 		}
-
+    .swBtn img{
+      width: 38px;
+      height: 38px;
+      margin-right: 5px;
+      display: none;
+    }
 </style>

CallCenterWeb.UI/RMYY/src/views/callScreen/components/callScreen.vue

@@ -23,10 +23,6 @@
         <add-or-edit-order :callid="callinCallid"/>
       </el-card>
     </el-col>
-    <div class="swBtn">
-      <img src="../../../../static/img/dingding.png" alt="">
-      <img src="../../../../static/img/dx.png" alt="">
-    </div>
     <!-- tab切换 -->
     <el-col :span="24">
       <el-card shadow="hover" class="records">
@@ -58,10 +54,10 @@ import { mapGetters } from 'vuex'
 
 // 此处引用的是黑名单管理的添加视图
 import AddressNumber from './AddressNumber'
+import AddOrEditCustomer from './AddOrEditCustomer'
 import CallList from './CallList'
 import OrderList from './OrderList'
 import KnowledgeList from './KnowledgeList'
-import AddOrEditCustomer from './AddOrEditCustomer'
 import AddOrEditOrder from './AddOrEditOrder'
 
 export default {
@@ -276,14 +272,4 @@ export default {
 			padding-right: 15px;
 		}
 	}
-  .swBtn img{
-    width: 38px;
-    height: 38px;
-    margin-right: 5px;
-  }
-  .swBtn{
-    position: absolute;
-    top: 6px;
-    right: 46px;
-  }
 </style>

CallCenterWeb.UI/RMYY/src/views/comDispatch/EquipmentLeasing/EquipmentLeasingReport/index.vue

@@ -44,7 +44,7 @@
   } from '@/api/EquipmentLeasing/EquipmentLeasing.js'
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
   import {
-    exportData
+    exportExcel
   } from '@/utils'
   export default {
     name: 'EquiTableList',
@@ -60,6 +60,7 @@
         state: '',
         rowList: [],
         orderstate: [], // 工单状态数据
+        exporParams: {},
         ruleForm: {
           startTime: '',
           keyword: ''
@@ -82,6 +83,7 @@
             starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
             endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
           }
+          this.exporParams = Object.assign({isdc: 1},params)
           getReportList(params).then((response) => {
             if (response.state.toLowerCase() === 'success') {
               if (response.message === '暂无记录！') {
@@ -106,26 +108,7 @@
         this.getListTask()
       },
       btn_export() {
-        return new Promise(resolve => {
-          const params = {
-            isdc: 1,
-            pageindex: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            type: this.orderId,
-            state: this.state,
-            starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
-            endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
-            keyword: this.ruleForm.keyword.replace(/\s+/g, '')
-          }
-          getListExpt(params).then(response => {
-            if (response.headers['content-disposition']) {
-              exportData(response)
-            } else {
-              this.$message.error(response)
-            }
-          })
-          resolve()
-        })
+        exportExcel(this.exporParams,getListExpt)
       },
       // 工单状态
       getOrderStat() {

CallCenterWeb.UI/RMYY/src/views/comDispatch/Escortservice/EscortserviceReport/index.vue

@@ -47,7 +47,7 @@
   } from '@/api/Escortservice/Escortservice.js'
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
   import {
-    exportData
+    exportExcel
   } from '@/utils'
   export default {
     name: 'EscortsTableList',
@@ -63,6 +63,7 @@
         state: '',
         rowList: [],
         orderstate: [], // 工单状态数据
+        exporParams: {},
         ruleForm: {
           startTime: '',
           keyword: ''
@@ -86,6 +87,7 @@
             starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
             endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
           }
+          this.exporParams = Object.assign({isdc: 1},params)
           getReportList(params).then((response) => {
             if (response.state.toLowerCase() === 'success') {
               if (response.message === '暂无记录！') {
@@ -110,26 +112,7 @@
         this.getListTask()
       },
       btn_export() {
-        return new Promise(resolve => {
-          const params = {
-            isdc: 1,
-            pageindex: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            type: 2008,
-            state: this.state,
-            starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
-            endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
-            keyword: this.ruleForm.keyword.replace(/\s+/g, '')
-          }
-          getListExpt(params).then(response => {
-            if (response.headers['content-disposition']) {
-              exportData(response)
-            } else {
-              this.$message.error(response)
-            }
-          })
-          resolve()
-        })
+        exportExcel(this.exporParams,getListExpt)
       },
       // 工单状态
       getOrderStat() {

CallCenterWeb.UI/RMYY/src/views/comDispatch/Takeblood/TakebloodReport/index.vue

@@ -47,7 +47,7 @@
   } from '@/api/Escortservice/Escortservice.js'
   import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
   import {
-    exportData
+    exportExcel
   } from '@/utils'
   export default {
     name: 'EscortsTableList',
@@ -63,6 +63,7 @@
         state: '',
         rowList: [],
         orderstate: [], // 工单状态数据
+        exporParams: {},
         ruleForm: {
           startTime: '',
           keyword: ''
@@ -86,6 +87,7 @@
             starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
             endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
           }
+          this.exporParams = Object.assign({isdc: 1},params)
           getReportList(params).then((response) => {
             if (response.state.toLowerCase() === 'success') {
               if (response.message === '暂无记录！') {
@@ -110,26 +112,7 @@
         this.getListTask()
       },
       btn_export() {
-        return new Promise(resolve => {
-          const params = {
-            isdc: 1,
-            pageindex: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            type: 2009,
-            state: this.state,
-            starttime: this.ruleForm.startTime && this.ruleForm.startTime[0],
-            endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
-            keyword: this.ruleForm.keyword.replace(/\s+/g, '')
-          }
-          getListExpt(params).then(response => {
-            if (response.headers['content-disposition']) {
-              exportData(response)
-            } else {
-              this.$message.error(response)
-            }
-          })
-          resolve()
-        })
+        exportExcel(this.exporParams,getListExpt)
       },
       // 工单状态
       getOrderStat() {

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/distributionReport.vue

@@ -25,7 +25,7 @@ import bprTableList from '@/views/comDispatch/bloodProductDistribution/bloodProd
 import OrTableList from '@/views/comDispatch/otherDistribution/otherReport/OrTableList'
 import rprTableList from '@/views/comDispatch/redPrescriptionDistribution/redPrescriptionReport/rprTableList'
 import mrTableList from '@/views/comDispatch/salvageMuter/muterReport/mrTableList'
-import { exportData } from '@/utils'
+import { exportExcel } from '@/utils'
 export default {
   name: 'List',
   components: {
@@ -50,6 +50,7 @@ export default {
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
         total: 0
       },
+      exporParams:{},
       dataLists: []
     }
   },
@@ -72,6 +73,7 @@ export default {
           type: this.orderId,
           keyword: this.keyword.replace(/\s+/g, '')
         }
+        this.exporParams = Object.assign({isdc: 1},params)
         getDisList(params).then((response) => {
           this.loading = false
           if (response.rows.length >= 0) {
@@ -87,25 +89,8 @@ export default {
       this.getList()
     },
     // 导出
-
     btn_export() {
-      return new Promise(resolve => {
-        const params = {
-          isdc: 1,
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          type: this.orderId,
-          keyword: this.keyword.replace(/\s+/g, '')
-        }
-        getListExpt(params).then(response => {
-          if (response.headers['content-disposition']) {
-            exportData(response)
-          } else {
-            this.$message.error(response)
-          }
-        })
-        resolve()
-      })
+      exportExcel(this.exporParams,getListExpt)
     }
   }
 }

CallCenterWeb.UI/RMYY/src/views/comDispatch/ebcomponents/escortAddOrEdit.vue

@@ -252,12 +252,14 @@
         this.ruleForm.id = this.rowid
         this.getDetail(this.rowid)
       }
-      if(this.orderTypeData){
+      if(this.orderTypeData&&this.orderTypeData.F_Type2){
+        
         this.orderId=this.orderTypeData.F_Type2
       }
       if (JSON.stringify(this.orderTypeData) === '{}') {
         this.ruleForm.source = ''
       }
+      
       this.getPositon()
     },
     methods: {

CallCenterWeb.UI/RMYY/src/views/comDispatch/materialTransfer/materialTransferReport/index.vue

@@ -28,7 +28,7 @@
 <script>
 import { getListExpt,getListExptIsdc } from '@/api/comDispatch/materialTransfer'
 import Pagination from '@/components/context/Pagination'
-import { exportData } from '@/utils'
+import { exportExcel } from '@/utils'
 
 export default {
   name: 'List',
@@ -39,6 +39,7 @@ export default {
     return {
       loading: false,
       keyword: '',
+      exporParams: {},
       pageParams: {
         pageindex: 1,
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
@@ -68,6 +69,7 @@ export default {
           stime: this.searchDate && this.searchDate[0],
           etime: this.searchDate && this.searchDate[1]
         }
+        this.exporParams = Object.assign({isdc: 1},params)
         getListExpt(params).then((response) => {
           this.loading = false
           if (response.rows.length > 0) {
@@ -83,23 +85,7 @@ export default {
       this.getList()
     },
     btn_export() {
-      return new Promise(resolve => {
-        const params = {
-          isdc: 1,
-          pageindex: this.pageParams.pageindex, // 第几页
-          pagesize: this.pageParams.pagesize, // 每页几条信息
-          type: this.orderId,
-          keyword: this.keyword.replace(/\s+/g, '')
-        }
-        getListExptIsdc(params).then(response => {
-          if (response.headers['content-disposition']) {
-            exportData(response)
-          } else {
-            this.$message.error(response)
-          }
-        })
-        resolve()
-      })
+     exportExcel(this.exporParams,getListExptIsdc)
     }
     
   }

CallCenterWeb.UI/RMYY/src/views/reportForm/operationEvaluationForm/index.vue

@@ -15,7 +15,7 @@
         <select-order-type :third-order-type="thirdOrderTypeParam" @post-third-order-type="getthirdOrderType" />
       </el-form-item>
       <el-form-item label="工单状态：">
-        <el-input v-model="ruleForm.keyword" placeholder="请输入关键字" size="medium" />
+        <el-input v-model="ruleForm.keyword" placeholder="请输入工单状态" size="medium" />
       </el-form-item>
       <el-form-item label="时间范围：">
         <el-col :span="16">

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/menuSetup/index.vue

@@ -61,6 +61,7 @@ import { getMenuLists, deleteMenu } from '@/api/systemSetup/roleSetting/menuSetu
 import treeToArray from './customEval'
 import addOrEditMenu from './components/addOrEditMenu'
 import menuBtn from './menuBtn'
+import {buildMenuTree,filterMenuDatas } from '@/utils'
 export default {
   name: 'MenuSetup',
   data() {
@@ -87,7 +88,7 @@ export default {
       const keyword = this.keyword.replace(/\s+/g, '')
       getMenuLists(keyword).then((response) => {
         this.loading = false
-        this.menuData = this.$options.methods.buildTree(response.data)
+        this.menuData = filterMenuDatas(buildMenuTree(response.data))
       })
     },
     formatterTarget(row, column) {
@@ -171,68 +172,7 @@ export default {
           this.$message.info('已取消删除')
         })
     },
-    /**
-     * 将一维的扁平数组转换为多层级对象
-     * @param  {[type]} list 一维数组，数组中每一个元素需包含id和parent_id两个属性
-     * @return {[type]} tree 多层级树状结构
-     */
-    buildTree(list) {
-      const temp = {}
-      const tree = {}
-      for (const j in list) {
-        temp[list[j].F_MenuId] = list[j]
-      }
-      for (const i in temp) {
-        if (temp[i].F_ParentId !== 0) {
-          if (!temp[temp[i].F_ParentId].childnodes) {
-            temp[temp[i].F_ParentId].childnodes = {}
-          }
-          temp[temp[i].F_ParentId].childnodes[temp[i].F_MenuId] = temp[i]
-        } else {
-          tree[temp[i].F_MenuId] = temp[i]
-        }
-      }
-      return this.filterMenuDatas(tree)
-    },
-    // 处理数据格式
-    filterMenuDatas(menudatas) {
-      const accessedRouters = []
-      let j = -1
-      for (const i in menudatas) {
-        j++
-        if (menudatas[i].F_ParentId === '000000000000000000000000') {
-          accessedRouters.push({
-            id: menudatas[i].F_MenuId,
-            path: menudatas[i].F_Url,
-            code: menudatas[i].F_MenuCode,
-            name: menudatas[i].F_MenuName,
-            target: menudatas[i].F_Type, // 菜单类型
-            stateFlag: menudatas[i].F_State, // 是否启用
-            remark: menudatas[i].F_Remark, // 介绍
-            sort: menudatas[i].F_Sort, // 排序
-            children: []
-          })
-        } else {
-          accessedRouters.push({
-            id: menudatas[i].F_MenuId,
-            path: menudatas[i].F_Url,
-            code: menudatas[i].F_MenuCode,
-            name: menudatas[i].F_MenuName,
-            target: menudatas[i].F_Type, // 菜单类型
-            stateFlag: menudatas[i].F_State, // 是否启用
-            remark: menudatas[i].F_Remark, // 介绍
-            sort: menudatas[i].F_Sort // 排序
-          })
-        }
-        if (menudatas[i].childnodes) {
-          accessedRouters[j].children = this.filterMenuDatas(menudatas[i].childnodes)
-        }
-      }
-      accessedRouters.sort(function(x, y) {
-        return x.sort - y.sort
-      })
-      return accessedRouters
-    },
+
     // 获取父级id
     getParents(poptions) {
       this.parentids.unshift(poptions.id)

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/roleSetup/index.vue

@@ -32,7 +32,7 @@
 <script>
 import { getRoleLists, deleteRole, saveRoleList, getRoleTree } from '@/api/systemSetup/roleSetting/roleSetup'
 import addOrEditRole from './addOrEditRole'
-import { pickerOptions } from '@/utils'
+import { pickerOptions,buildTree,filterTreeDatas } from '@/utils'
 import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
 
 export default {
@@ -175,7 +175,7 @@ export default {
       return new Promise((resolve) => {
         getRoleTree(this.role_id).then((response) => {
           if (response.state.toLowerCase() === 'success') {
-            this.treelists = this.buildTree(response.data)
+            this.treelists = filterTreeDatas(buildTree(response.data))
             if (this.role_id) {
               // 获取ischecked数组 设置选中
               const checkedKeys = this.getIsChecked(response.data)
@@ -196,48 +196,7 @@ export default {
       }
       return checkedArr
     },
-    /**
-     * 将一维的扁平数组转换为多层级对象
-     * @param  {[type]} list 一维数组，数组中每一个元素需包含id和pid两个属性
-     * @return {[type]} tree 多层级树状结构
-     */
-    buildTree(list) {
-      const temp = {}
-      const tree = {}
-      const arr = []
-      for (const j in list) {
-        temp[list[j].id] = list[j]
-      }
-      for (const i in temp) {
-        // if (temp[i].pid !== 'Moudle_000000000000000000000000') {
-        if (temp[i].pid !== 0) {
-          if (!temp[temp[i].pid].children) {
-            temp[temp[i].pid].children = []
-          }
-          temp[temp[i].pid].children[temp[i].id] = temp[i]
-        } else {
-          tree[temp[i].id] = temp[i]
-        }
-      }
-      return this.filterTreeDatas(tree)
-    },
-    // 处理数据格式
-    filterTreeDatas(treeDatas) {
-      const accessedRouters = []
-      let j = -1
-      for (const i in treeDatas) {
-        j++
-        accessedRouters.push({
-          id: treeDatas[i].id,
-          label: treeDatas[i].name,
-          children: []
-        })
-        if (treeDatas[i].children) {
-          accessedRouters[j].children = this.filterTreeDatas(treeDatas[i].children)
-        }
-      }
-      return accessedRouters
-    }
+    
   }
 }
 </script>

CallCenterWeb.UI/RMYY/src/views/trafficData/callRecord/index.vue

@@ -207,12 +207,12 @@ export default {
       this.getList()
     },
     // 导出
-
     btn_export() {
       window.location.href = this.$store.getters.serverConfig.BASE_API + 'Callrecords/GetList?isdc=1' +
 			'&pageindex=' + this.pageParams.pageindex +
       '&pagesize=' + this.pageParams.pagesize +
       '&type=' + this.orderId +
+      '&token=' + localStorage.getItem("Admin-Token").split(' ')[1] +
       '&keyword=' + this.keyword.replace(/\s+/g, '')
     },
     // 播放录音

CallCenterWeb.UI/RMYY/src/views/vehicleDispatch/vehicleScheduling/vehicleSchedulingReport/index.vue

@@ -44,7 +44,7 @@
   } from '@/api/vehicleDispatch/vehicleScheduling.js'
   import Pagination from '@/components/context/Pagination'
   import {
-    exportData
+    exportExcel
   } from '@/utils'
 
   export default {
@@ -58,6 +58,7 @@
         keyword: '',
         startTime: '',
         orderId: '',
+        exporParams:{},
         pageParams: {
           pageindex: 1,
           pagesize: Number(this.$store.getters.serverConfig.PAGESIZE),
@@ -86,6 +87,7 @@
             pagesize: this.pageParams.pagesize, // 每页几条信息
             keyword: this.keyword.replace(/\s+/g, '')
           }
+          this.exporParams = Object.assign({isdc: 1},params)
           getListExpt(params).then((response) => {
             this.loading = false
             if (response.rows.length > 0) {
@@ -101,24 +103,7 @@
         this.getList()
       },
       btn_export() {
-        return new Promise(resolve => {
-          const params = {
-            isdc: 1,
-            pageindex: this.pageParams.pageindex, // 第几页
-            pagesize: this.pageParams.pagesize, // 每页几条信息
-            keyword: this.keyword.replace(/\s+/g, ''),
-            starttime: this.startTime && this.startTime[0],
-            endtime: this.startTime && this.startTime[1]
-          }
-          getListExptIsdc(params).then(response => {
-            if (response.headers['content-disposition']) {
-              exportData(response)
-            } else {
-              this.$message.error(response)
-            }
-          })
-          resolve()
-        })
+        exportExcel(this.exporParams,getListExpt)
       }
 
     }