医院代码整理

CallCenterWeb.UI/RMYY/config/dev.env.js

@@ -6,8 +6,6 @@ module.exports = {
   BASE_API: '"http://192.168.8.20:1028/"', // 这里放测试API
   SOCKET_IP: '"192.168.5.41"', // WebSocket通讯ip
   SOCKET_PORT: '"28822"', // WebSocket通讯端口
-  LineChat_SOCKET_IP: '"192.168.5.42"', // 在线客服WebSocket通讯ip
-  LineChat_SOCKET_PORT: '"28300"', // 在线客服WebSocket通讯端口
   PAGESIZES: '[10, 20, 50, 100]', // number[] 表格每页显示个数选择器的选项设置
   PAGESIZE: '10', // number 表格每页显示条目个数
   monitorPlatformTime: '5000', // 自动外呼监控  坐席监控  数据刷新间隔

CallCenterWeb.UI/RMYY/config/prod.env.js

@@ -3,11 +3,9 @@
 module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"prod"',
-  BASE_API: '"http://192.168.1.37:8000/"', // 生产环境API
-  SOCKET_IP: '"36.99.169.138"', // WebSocket通讯ip
-  SOCKET_PORT: '"9000"', // WebSocket通讯端口
-  LineChat_SOCKET_IP: '"192.168.5.42"', // 在线客服WebSocket通讯ip
-  LineChat_SOCKET_PORT: '"28300"', // 在线客服WebSocket通讯端口
+  BASE_API: '"http://172.16.10.21:8889/"', // 生产环境API
+  SOCKET_IP: '"172.16.10.21"', // WebSocket通讯ip
+  SOCKET_PORT: '"8081"', // WebSocket通讯端口
   PAGESIZES: '[10, 20, 50, 100]', // number[] 表格每页显示个数选择器的选项设置
   PAGESIZE: '10', // number 表格每页显示条目个数
   monitorPlatformTime: '5000', // 自动外呼监控  坐席监控  数据刷新间隔

CallCenterWeb.UI/RMYY/config/sit.env.js

@@ -4,11 +4,9 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
   // BASE_API: '"http://192.168.8.20:1028/"', // API地址
-  BASE_API: '"http://117.160.241.16:1028/"', // API地址
+  BASE_API: '"http://192.168.1.37:8000/"', // API地址
   SOCKET_IP: '"36.99.169.138"', // WebSocket通讯ip
   SOCKET_PORT: '"9000"', // WebSocket通讯端口
-  LineChat_SOCKET_IP: '"192.168.5.42"', // 在线客服WebSocket通讯ip
-  LineChat_SOCKET_PORT: '"28300"', // 在线客服WebSocket通讯端口
   PAGESIZES: '[10, 20, 50, 100]', // number[] 表格每页显示个数选择器的选项设置
   PAGESIZE: '10', // number 表格每页显示条目个数
   monitorPlatformTime: '5000', // 自动外呼监控  坐席监控  数据刷新间隔

CallCenterWeb.UI/RMYY/src/api/callScreen/callScreen.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 获取客户数据
+export function getCusUser(phoneNum) {
+  return request({
+    url: 'api/customer/getcusbyphonenum',
+    method: 'get',
+    params: {
+      phoneNum
+    }
+  })
+}
+
+// 获取来电归属地数据
+export function getPhoneLocation(tel) {
+  return request({
+    url: 'api/CallFunction/GetTelLocation',
+    method: 'post',
+    params: {
+      tel
+    }
+  })
+}
+
+// 拉黑
+export function addBlack(data) {
+  return request({
+    url: 'callcenterapi/api/callinscreen/addblack',
+    method: 'post',
+    data
+  })
+}
+
+// 取消拉黑
+export function cancelBlack(phone) {
+  return request({
+    url: 'callcenterapi/api/callinscreen/delblack',
+    method: 'post',
+    data: {
+      phone
+    }
+  })
+}

CallCenterWeb.UI/RMYY/src/api/commonAPI.js

@@ -59,10 +59,11 @@ export function getSeatGroup() {
 }
 
 // 获取角色
-export function getRoleSelect() {
+export function getRoleSelect(params) {
   return request({
-    url: 'api/roleinfo/getlistdrop',
-    method: 'get'
+    url: 'Role/GetList',
+    method: 'get',
+    params
   })
 }
 

CallCenterWeb.UI/RMYY/src/api/customerManagement/customerList.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+// 客户列表
+export function getCustomerList(params) {
+  return request({
+    url: 'Customer/GetList',
+    method: 'post',
+    params
+  })
+}
+// 客户新增修改
+export function addOrEditCustomerList(data) {
+  return request({
+    url: 'Customer/AddCustomer',
+    method: 'post',
+    data
+  })
+}
+// 客户详情
+export function getCusDetail(data) {
+  return request({
+    url: 'Customer/GetCustomer',
+    method: 'post',
+    data
+  })
+}
+// 客户删除
+export function deleteCustomerList(ids) {
+  return request({
+    url: 'Customer/DelCustomer',
+    method: 'post',
+    data: {
+      ids
+    }
+  })
+}
+

CallCenterWeb.UI/RMYY/src/api/systemSetup/roleSetting/department.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 // 获取分类树
 export function getTreeList() {
   return request({
-    url: 'api/deptment/getall',
+    url: 'Department/GetTreeList',
     method: 'get'
   })
 }
 // 添加
 export function addType(data) {
   return request({
-    url: 'api/deptment/adddept',
+    url: 'Department/Insert',
     method: 'post',
     data
   })
@@ -17,36 +17,37 @@ export function addType(data) {
 // 编辑
 export function editType(data) {
   return request({
-    url: 'api/deptment/editdept',
+    url: 'Department/Update',
     method: 'post',
     data
   })
 }
 // 删除分类
-export function deleteType(ids) {
+export function deleteType(id) {
   return request({
-    url: 'api/deptment/deldept',
+    url: 'Department/Delete',
     method: 'post',
     data: {
-      ids
+      id
     }
   })
 }
 // 获取详情
 export function getTypeDetail(deptid) {
   return request({
-    url: 'api/deptment/getdeptsingle',
+    url: 'Department/GetModel',
     method: 'get',
     params: {
       deptid
     }
   })
 }
-// 获取分类树
-export function getDepartmentList() {
+// 获取列表数据
+export function getDepartmentList(params) {
   return request({
-    url: 'api/deptment/getallloop',
-    method: 'get'
+    url: 'Department/GetList',
+    method: 'get',
+    params
   })
 }
 

CallCenterWeb.UI/RMYY/src/api/systemSetup/roleSetting/userManage.js

@@ -12,13 +12,11 @@ export function getUserAccountLists(params) {
 }
 
 // 获取用户数据
-export function getUserAccount(id) {
+export function getUserAccount(params) {
   return request({
     url: 'UserAccount/GetModel',
     method: 'get',
-    params: {
-      id
-    }
+    params
   })
 }
 

CallCenterWeb.UI/RMYY/src/api/systemSetup/sysSetting/teamManagement.js

@@ -50,9 +50,9 @@ export function deleteTeam(ids) {
 }
 // 获取职位数据
 export function getPositionData(params) {
-  return request({
-    url: 'api/position/getlistdrop',
-    method: 'get',
-    params
-  })
-}
+    return request({
+      url: 'api/position/getlistdrop',
+      method: 'get',
+      params
+    })
+  }

CallCenterWeb.UI/RMYY/src/api/trafficData/trafficData.js

@@ -0,0 +1,91 @@
+import request from '@/utils/request'
+
+// 获取坐席外呼列表数据
+export function getCallOutList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAgentCalloutRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取坐席三方通话列表数据
+export function getThreeCallList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAgentConferenceRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取坐席状态列表数据
+export function getCallStateList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAgentStateRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取坐席转移列表数据
+export function getCallTransferList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAgentTransferRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取分机呼入列表数据
+export function getExtCallinList(params) {
+  return request({
+    url: 'callcenterapi/api/MWExtCallinRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取中继呼入列表数据
+export function getMwtCallinList(params) {
+  return request({
+    url: 'callcenterapi/api/MWTrunkCallinRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取自动外呼列表数据
+export function getAutoCallOutList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAutocallCallRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取坐席小休列表数据
+export function getSeatRestList(params) {
+  return request({
+    url: 'callcenterapi/api/MWAgentReposeRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}
+
+// 获取通话记录数据
+export function getCallRecords(params) {
+  return request({
+    url: 'Callrecords/GetList',
+    method: 'post',
+    params
+  })
+}
+
+// 获取IVR呼出数据
+export function getIVRCalloutRecord(params) {
+  return request({
+    url: 'callcenterapi/api/MWIVRCalloutRecord/getlistbypage',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/components/Teloperation/index.vue

@@ -138,7 +138,7 @@ export default {
         Type: 'Login',
         AgentID: this.usercode,
         AgentExten: this.extension,
-        AgentGroup: window.localStorage.getItem('groupCode'), // 坐席组id
+        AgentGroup: '364', // 坐席组id window.localStorage.getItem('groupCode')
         AgentType: '0',
         DisposeTime: '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
       }

CallCenterWeb.UI/RMYY/src/components/audioPlayer/index.vue

@@ -0,0 +1,102 @@
+
+<template>
+  <div>
+    <div class="audio_player">
+      <!-- <audio style="width: 100%;" :src='recFiles'
+			controls="controls"></audio> -->
+      <aplayer
+        :music="musicList"
+        autoplay
+        theme="#41b883"
+      />
+      <el-button class="audio_btn" size="mini" plain type="primary" @click="btn_downlaod()">下载</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { mapGetters } from 'vuex'
+import VueAplayer from 'vue-aplayer'
+import download from 'downloadjs'
+
+export default {
+  name: 'AudioPlayer',
+  components: {
+    // 别忘了引入组件
+    'aplayer': VueAplayer
+  },
+  props: {
+    recFiles: {
+      type: String,
+      default: ''
+    },
+    artists: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      musicList: {
+        title: '坐席', // 歌曲名称
+        artist: ' ', // 演唱者
+        src: '', // 音频文件的 URL
+        pic: 'https://moeplayer.b0.upaiyun.com/aplayer/secretbase.jpg'// 封面图片 URL
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'avatar'
+    ])
+  },
+  beforeCreate() {
+    // 禁用在控制台打印出当前的版本标识
+    const vaplayer = VueAplayer
+    vaplayer.disableVersionBadge = true
+  },
+  created() {
+    this.musicList.artist = this.artists == "" ? "未知坐席" : this.artists
+    this.musicList.src = this.recFiles
+    this.musicList.pic = this.avatar
+    console.log(this.musicList.src)
+    console.log("musicList", this.musicList)
+  },
+  methods: {
+    btn_downlaod() {
+      window.location.href = this.recFiles
+      // const strFileName = this.recFiles.substring((this.recFiles.lastIndexOf('/') + 1))
+      // this.downloadUrl(this.recFiles, strFileName)
+    },
+    // 下载文件
+    downloadUrl(audioUrl, strFileName) {
+      const x = new XMLHttpRequest()
+      x.open('GET', audioUrl, true)
+      x.responseType = 'blob'
+      x.onload = function(e) {
+        download(x.response, strFileName)
+      }
+      x.send()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+	.audio_player{
+		padding:10px 0;
+		text-align: center;
+		.audio_btn{
+			margin-top: 16px;
+			width: 120px;
+		}
+		.aplayer-controller .aplayer-time .aplayer-volume-wrap+.aplayer-icon{
+			display: none;
+		}
+	}
+</style>

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

@@ -49,6 +49,18 @@ export const constantRouterMap = [
   {
     path: '',
     component: Layout,
+    name: '来电弹屏',
+    children: [{
+      path: 'callScreen',
+      component: () => import('@/views/callScreen/index'),
+      name: 'callScreen',
+      meta: { title: '来电弹屏', noCache: true }
+    }],
+    hidden: true
+  },
+  {
+    path: '',
+    component: Layout,
     redirect: 'dashboard', // 重定向地址，在面包屑中点击会重定向去的地址
     name: '首页',
     children: [{

CallCenterWeb.UI/RMYY/src/store/getters.js

@@ -30,6 +30,7 @@ const getters = {
   telTopRightState: state => state.telWebsocket.telTopRightState, // 右上角状态信息
   telTopRightLamp: state => state.telWebsocket.telTopRightLamp, // 右上角指示灯状态
   telCallNum: state => state.telWebsocket.telCallNum, // 电话号码
+  screenState: state => state.telWebsocket.screenState, // 电话号码
   telTrunkNumber: state => state.telWebsocket.telTrunkNumber, // 中继号
   telCallType: state => state.telWebsocket.telCallType, // 通话类型
   telIsVisCallout: state => state.telWebsocket.telIsVisCallout, // 外呼操作面板是否显示

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

@@ -6,7 +6,6 @@ import user from './modules/user'
 import telWebsocket from './modules/telWebsocket'
 import tagsView from './modules/tagsView'
 import permission from './modules/permission'
-import lineChatSocket from './modules/lineChatSocket'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -18,7 +17,6 @@ const store = new Vuex.Store({
     user,
     telWebsocket,
     tagsView,
-    lineChatSocket,
     permission
   },
   getters

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

@@ -1,114 +0,0 @@
-const lineChatSocket = {
-  state: {
-    linesConnected: false, // 是否连接
-    errorMsg: '', // 错误信息
-    messageCon: '', // 消息内容
-    isActive: false, // 聊天列表是否选中
-    noticeMsg: '', // 注意提示信息
-    listCode: '', // 客户code
-    userList: [], // 聊天成员信息
-    currentSessionId: null, // 当前选中的会话id
-    collUserCode: '', // 当前同事code
-    chatUserCode: '', // 客服code
-    currentName: '' // 当前选中的会话name
-  },
-  mutations: {
-    lineChatSOCKET_CONNECT(state) {
-      state.linesConnected = true
-    },
-    lineChatSOCKET_ERRORMSG(state, message) {
-      state.errorMsg = message
-    },
-
-    lineChatSOCKET_MESSAGECON(state, message) {
-      state.messageCon = message
-    },
-    lineChatSOCKET_LISTCODE(state, message) {
-      state.listCode = message
-    },
-    lineChatSOCKET_NOTICEMSG(state, message) {
-      state.noticeMsg = message
-    },
-    lineChatSOCKET_USERLIST(state, message) {
-      let ishasuser = false
-      for (const i of state.userList) {
-        if (i.sessionid === message.sessionid) {
-          ishasuser = true
-        }
-      }
-      if (!ishasuser) {
-        state.userList.push(message)
-      }
-      if (state.userList.length > 0) {
-        state.currentSessionId = state.userList[0].sessionid
-        state.currentName = state.userList[0].user.name
-        state.messageCon = state.userList[0]
-      }
-    },
-    lineChatSOCKET_CURRENTSESSIONID(state, message) {
-      state.currentSessionId = message.id
-      state.currentName = message.name
-    },
-    lineChatSOCKET_CHATUSERCODE(state, message) {
-      state.chatUserCode = message
-    },
-    lineChatSOCKET_COLLUSERCODE(state, message) {
-      state.collUserCode = message.code
-      state.currentName = message.name
-    }
-  },
-  actions: {
-    // 连接
-    IsConnectWs({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_CONNECT', msg)
-    },
-    // 错误消息
-    errorMsg({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_ERRORMSG', msg)
-    },
-    // 消息记录
-    appendMsg({
-      commit
-    }, msg) {
-      // commit('lineChatSOCKET_SELF',msg[0]);
-      commit('lineChatSOCKET_MESSAGECON', msg)
-      // commit('lineChatSOCKET_LISTCODE',msg[2]);
-    },
-    getNoticeMsg({
-      commit
-    }, msg) { // 返回提示信息
-      commit('lineChatSOCKET_NOTICEMSG', msg)
-    },
-    // 获取聊天成员信息
-    getUserList({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_USERLIST', msg)
-    },
-    // 获取选择的会话id
-    getSelectSessionId({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_CURRENTSESSIONID', msg)
-    },
-    // 获取客服code
-    getChatUserCode({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_CHATUSERCODE', msg)
-    },
-    // 获取同事code
-    getCollUsercode({
-      commit
-    }, msg) {
-      commit('lineChatSOCKET_COLLUSERCODE', msg)
-    }
-
-  }
-}
-
-export default lineChatSocket

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

@@ -39,13 +39,14 @@ function filterAsyncRouter(menudatas) {
       mflag = menudatas[i].F_MenuCode
       if (cpath && mflag) {
         if (menudatas[i].children && menudatas[i].children.length > 0 && cpath) {
-          // redirect = 'noredirect'
-          // fpath = ''
-          // furl = 'layout/Layout'
+          redirect = 'noredirect'
+          fpath = ''
+          furl = cpath
           accessedRouters.push({
-            path: '',
-            redirect: 'noredirect',
+            path: `${fpath}`,
+            redirect: redirect,
             name: firstToUpper(menudatas[i].F_MenuCode),
+            // component: () => import(`@/views/${furl}/index`),
             component: () => import('@/views/layout/Layout'),
             id: menudatas[i].F_Id,
             meta: {
@@ -123,7 +124,7 @@ const permission = {
         buttonDatas = data.buttonDatas
         const accessedRouters = filterAsyncRouter(menuDatas)
         accessedRouters.push({ path: '*', redirect: '/404', hidden: true })
-        console.log(accessedRouters[0])
+        console.log(accessedRouters)
         commit('SET_ROUTERS', accessedRouters)
         resolve()
       })

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

@@ -9,6 +9,7 @@ const telWebsocket = {
     telTopRightState: '未签入', // 右上角 状态提示信息
     telTopRightLamp: false, // 右上角 状态灯(默认 红色)
     telCallNum: '', // 顶部电话号码
+    screenState: '',
     telTrunkNumber: '', // 终极号
     telCallType: 'MakeCall', // 发送的通话类型（默认是外呼）
     telIsVisCallout: false, // 外呼操作面板是否显示
@@ -95,6 +96,9 @@ const telWebsocket = {
     },
     SOCKET_TELTASKISREFRESH(state, message) {
       state.telTaskIsRefresh = message
+    },
+    SOCKET_SCREENPOPUP(state, message) {
+      state.screenState = message
     }
   },
   actions: {

CallCenterWeb.UI/RMYY/src/styles/sidebar.scss

@@ -4,7 +4,7 @@
     height: 100%;
     transition: margin-left .28s;
 
-    margin-left: 85px;
+    margin-left: 170px;
   }
   // 侧边栏
   .sidebar-container {

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

@@ -194,7 +194,7 @@ function signIn() {
     'Type': 'Login',
     'AgentID': store.getters.usercode,
     'AgentExten': store.getters.extension,
-    'AgentGroup': window.localStorage.getItem('groupCode'), // 坐席组id
+    'AgentGroup': '364', // 坐席组id window.localStorage.getItem('groupCode')
     'AgentType': '0',
     'DisposeTime': '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
   }
@@ -399,7 +399,7 @@ function LineStateAgentBack(linedata) {
 function IncomingBack(inComingData) {
   const inComingCallId = inComingData.CallID
   let inComingNumber = inComingData.Number
-  // store.dispatch('screenPopUpBoole', 1)
+  store.dispatch('screenPopUpBoole', 1)
   // inComingNumber = inComingData.Number
   // console.log('xxxx', inComingNumber)
   if (inComingNumber.length > 11) {
@@ -431,7 +431,7 @@ function IncomingBack(inComingData) {
 function DropCallBack() {
   store.dispatch('ChangeCallNum', '') // 顶部电话号码（''）
   store.dispatch('ChangeCallType', 'MakeCall') // 发送的通话类型（默认是外呼）
-  // store.dispatch('screenPopUpBoole', 0)
+  store.dispatch('screenPopUpBoole', 0)
   // 当前在坐席监控中需要 更新坐席监控内坐席的状态
   const curentViews = store.state.tagsView.visitedViews
   for (let i = 0, len = curentViews.length; i < len; i++) {

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

@@ -0,0 +1,306 @@
+<template>
+  <div v-loading="loading">
+    <el-row :gutter="5">
+      <el-col :span="20">
+
+        <el-form
+          ref="ruleForm"
+          :model="ruleForm"
+          label-width="100px"
+          style="font-size: 14px"
+          class="order_form">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="客户代码" prop="code">
+                <el-input v-model="ruleForm.code" placeholder="请输入客户代码" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="客户名称" prop="name">
+                <el-input v-model="ruleForm.name" placeholder="请输入客户名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="级别" prop="layer">
+                <el-input v-model="ruleForm.layer" type="number" placeholder="请输入客户级别" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="手机" prop="mobile">
+                <el-input v-model="ruleForm.mobile" placeholder="请输入手机号码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="电话" prop="telphone">
+                <el-input v-model="ruleForm.telphone" placeholder="请输入客户电话" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="传真" prop="fax">
+                <el-input v-model="ruleForm.fax" placeholder="请输入客户传真" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮编" prop="postcode">
+                <el-input v-model="ruleForm.postcode" placeholder="请输入客户邮编" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="邮件" prop="email">
+                <el-input v-model="ruleForm.email" placeholder="请输入客户邮件" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="性别" prop="sex">
+                <el-input v-model="ruleForm.sex" placeholder="请输入性别" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+
+              <el-form-item label="省" prop="province">
+                <el-input v-model="ruleForm.province" placeholder="请输入省" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="市" prop="city">
+                <el-input v-model="ruleForm.city" placeholder="请输入市" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="区县" prop="county">
+                <el-input v-model="ruleForm.county" placeholder="请输入区县" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="客户住址" prop="adddress">
+                <el-input v-model="ruleForm.adddress" placeholder="请输入客户住址" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item>
+            <el-button type="primary" @click="submitForm">保存</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { addOrEditCustomerList, getCustomerList } from '@/api/customerManagement/customerList'
+import { validateTel } from '@/utils/validate'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'AddOrEdit',
+  props: {
+    callinNum: {
+      type: String,
+      default: ''
+    }
+  },
+
+  data() {
+    var phoneNumbersinput = (rule, value, callback) => {
+      if (value !== '') { // 不为空的时候进行验证
+        validateTel(value) ? callback() : callback(new Error('联系电话格式错误'))
+      } else { // 为空的时候就直接放过去（这里一定要写，不然既不报错也不会往下走【应该和router的next()相同】）
+        callback()
+      }
+    }
+    return {
+      rowid: 0,
+      ruleForm: {
+        id: 0, // 客户id
+        code: '', // 客户代码
+        name: '', // 客户名称
+        layer: '', // 客户等级
+        mobile: '', // 客户手机
+        telphone: '', // 客户电话
+        fax: '', // 客户传真
+        postcode: '', // 客户邮编
+        email: '', // 客户邮件
+        sex: '', // 性别
+        province: '', // 省
+        city: '', // 市
+        county: '', // 区县
+        adddress: '' // 客户住址
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: '请输入客户名称!'
+          }
+        ],
+        code: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入客户代码!'
+        }],
+        mobile: [
+          {
+            required: false,
+            validator: phoneNumbersinput,
+            trigger: 'blur'
+
+          }
+        ]
+      },
+      loading: false,
+      isButton: true
+    }
+  },
+  computed: {
+    ...mapGetters(['screenState'])
+  },
+  watch: {
+    screenState: function() {
+      console.log('watch---' + this.screenState)
+      console.log('watch---' + this.callinNum)
+      // if (this.callinNum.length === 4) {
+      //   return
+      // }
+      if (this.screenState && this.callinNum) {
+        this.getList()
+      }
+    }
+  },
+  created() {
+    // if (this.callinNum.length === 4) {
+    //   return
+    // }
+    console.log(this.callinNum + '--121212121212')
+    if (this.callinNum) {
+      this.getList()
+    }
+  },
+
+  methods: {
+    submitForm() {
+      this.$emit('fromChild', this.ruleForm.cusName)
+      console.log(this.rowid)
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          const data = {
+            id: this.rowid,
+            code: this.ruleForm.code, // 客户代码 string
+            name: this.ruleForm.name, // 客户名称 string
+            layer: this.ruleForm.layer, // 客户级别 string
+            mobile: this.ruleForm.mobile, // 客户手机 string
+            telphone: this.ruleForm.telphone, // 客户电话 string
+            fax: this.ruleForm.fax, // 客户传真 string
+            postcode: this.ruleForm.postcode, // 客户邮编 string
+            email: this.ruleForm.email, // 客户邮件 string
+            sex: this.ruleForm.sex, // 客户性别 string
+            province: this.ruleForm.province, // 省 string
+            city: this.ruleForm.city, // 市 string
+            county: this.ruleForm.county, // 区 string
+            adddress: this.ruleForm.adddress // 客户住址 string
+          }
+          // 添加
+          if (!this.rowid) {
+            addOrEditCustomerList(data)
+              .then((response) => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$message({
+                    message: '恭喜你，添加成功！',
+                    type: 'success',
+                    duration: 1000
+                  })
+                  // this.$emit('cus-info-list', res)
+                } else {
+                  this.$message({
+                    message: '添加失败，该客户已存在！',
+                    type: 'success',
+                    duration: 1000
+                  })
+                }
+              })
+              .catch((response) => {
+                this.loading = false
+              })
+            return
+          }
+          // 编辑
+          addOrEditCustomerList(data)
+            .then((response) => {
+              this.loading = false
+              if (response.state.toLowerCase() === 'success') {
+                this.$message({
+                  message: '恭喜你，客户信息编辑成功！',
+                  type: 'success',
+                  duration: 1000
+                })
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          this.$message({
+            type: 'error',
+            message: '请输入有效的必填项信息!',
+            offset: 50,
+            duration: 1000
+          })
+          return false
+        }
+      })
+    },
+    // 获取详情
+    getList() {
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: 1, // int 第几页
+          pagesize: 99, // int 每页几条信息
+          telephone: this.callinNum.toString() // 联系电话
+        }
+        getCustomerList(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            const res = response.rows[0]
+            console.log(res)
+            this.rowid = res.F_CustomerId
+            this.ruleForm.code = res.F_CustomerCode // 客户代码
+            this.ruleForm.name = res.F_CustomerName // 客户名称
+            this.ruleForm.layer = res.F_Layer // 客户级别
+            this.ruleForm.mobile = res.F_Mobile // 客户手机
+            this.ruleForm.telphone = res.F_Telephone // 客户电话
+            this.ruleForm.fax = res.F_Fax // 客户传真
+            this.ruleForm.postcode = res.F_PostCode // 客户邮编
+            this.ruleForm.email = res.F_Email // 客户邮件
+            this.ruleForm.sex = res.F_Sex // 性别
+            this.ruleForm.province = res.F_Province // 省
+            this.ruleForm.city = res.F_City // 市
+            this.ruleForm.county = res.F_County // 区
+            this.ruleForm.adddress = res.F_Address // 客户住址
+            this.$emit('cus-info-list', res)
+          }
+        })
+        resolve()
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+	.order_form {
+		.form_select {
+			width: 100%;
+		}
+
+		.form_date {
+			width: 100%;
+		}
+	}
+</style>

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

@@ -0,0 +1,165 @@
+<template>
+  <div v-loading="loading">
+    <el-table :data="dataLists" border stripe>
+      <el-table-column prop="callSerialNo" label="流水号" align="center" min-width />
+      <el-table-column prop="customerName" label="来电人" align="center" min-width />
+      <el-table-column prop="callerNumber" label="来电号码" align="center" min-width />
+      <el-table-column prop="ringStartTime" label="来电时间" align="center" min-width />
+      <el-table-column prop="periodTalking" label="通话时长" align="center" min-width />
+      <el-table-column prop="employeeName" label="坐席名称" align="center" min-width />
+      <!-- <el-table-column label="录音" align="center" min-width>
+        <template slot-scope="scope">
+          <svg-icon
+            v-if="scope.row.FilePath"
+            class="rec_file"
+            icon-class="bofangluyin"
+            @click.native="playSound(scope.row.FilePath, scope.row.agent_code)"
+          />
+          <span v-else>-</span>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      :auto-scroll="false"
+      class="pagination"
+      @pagination="getList"
+    />
+    <!-- @pagination="getList" -->
+  </div>
+</template>
+
+<script>
+
+import { getCallRecords } from '@/api/trafficData/trafficData'
+import audioPlayer from '@/components/audioPlayer'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+export default {
+  name: 'CallRecordList',
+  components: {
+    Pagination
+  },
+  filters: {
+    // 呼叫类型
+    calltypeFilter(status) {
+      const statusMap = {
+        0: '呼入',
+        1: '呼出'
+      }
+      return statusMap[status]
+    },
+    // 呼叫状态
+    statusFilter(status) {
+      const statusMap = {
+        0: '未接通',
+        1: '已接通'
+      }
+      return statusMap[status]
+    },
+    // 外呼类型
+    callopttypeFilter(status) {
+      const statusMap = {
+        0: '拨号外呼',
+        1: '回访外呼'
+      }
+      return statusMap[status]
+    },
+    // 处理方式
+    dealtypeFilter(status) {
+      const statusMap = {
+        0: 'IVR处理',
+        1: '骚扰电话',
+        2: '自助服务',
+        3: '转值班电话',
+        4: '留言',
+        5: '呼损',
+        6: '人工处理'
+      }
+      return statusMap[status]
+    },
+    // 时间格式化
+    timesFilter(tm) {
+      if (tm === '1970-01-01 08:00:00') {
+        return '-'
+      } else {
+        return tm
+      }
+    }
+  },
+  props: {
+    callinNum: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      callNum: '', // 来电号码
+      loading: false,
+      recordpath: '', // 录音的路径
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [] // 列表数据
+    }
+  },
+  created() {
+    if (this.callinNum === '') {
+      this.callNum = '-1'
+    } else {
+      this.callNum = this.callinNum
+    }
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          callerNumber: this.callNum, //	否	string	模糊查询（呼叫号码）
+          employeeName: '', //	否	string	模糊查询（呼叫号码） CallNumber
+          callType: '', // 呼叫类型
+          beginTime: '',
+          endTime: ''
+        }
+        getCallRecords(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            this.recordpath = response.data.recordpath
+            if (response.total == null) {
+              this.pageParams.total = 0
+            } else {
+              this.pageParams.total = response.total
+            }
+            this.dataLists = response.data
+          }
+        })
+        resolve()
+      })
+    },
+    // 播放录音
+    playSound(rec_file, artist) {
+      this.$layer.iframe({
+        content: {
+          content: audioPlayer, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { 'recFiles': rec_file, 'artists': artist }// props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['600px', '230px'],
+        shadeClose: true,
+        title: '录音详情'
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

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

@@ -0,0 +1,111 @@
+<template>
+  <div v-loading="loading">
+    <el-table :data="dataLists" border stripe>
+      <el-table-column prop="CallNumber" label="电话号码" align="center" min-width />
+      <el-table-column label="呼叫状态" align="center" min-width>
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.CallState === 1 ? 'success' : 'danger'" size="mini" disable-transitions>{{ scope.row.CallState | statusFilter }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
+      <el-table-column prop="UserName" label="坐席姓名" align="center" min-width />
+      <el-table-column prop="TalkStartTime" label="通话开始时间" align="center" min-width />
+      <el-table-column prop="TalkEndTime" label="通话结束时间" align="center" min-width />
+    </el-table>
+    <pagination
+      v-show="pageParams.total > 0"
+      :total="pageParams.total"
+      :pageindex.sync="pageParams.pageindex"
+      :pagesize.sync="pageParams.pagesize"
+      :auto-scroll="false"
+      class="pagination"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+
+import { getCallRecords } from '@/api/trafficData/trafficData'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+export default {
+  name: 'CallRecordList',
+  components: {
+    Pagination
+  },
+  filters: {
+    // 呼叫状态
+    statusFilter(status) {
+      const statusMap = {
+        0: '未接通',
+        1: '已接通'
+      }
+      return statusMap[status]
+    },
+    // 时间格式化
+    timesFilter(tm) {
+      if (tm === '1970-01-01 08:00:00') {
+        return '-'
+      } else {
+        return tm
+      }
+    }
+  },
+  props: {
+    callinNum: {
+      type: String,
+      default: ''
+    }
+  },
+
+  data() {
+    return {
+      callNum: '', // 来电号码
+      loading: false,
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [] // 列表数据
+    }
+  },
+  created() {
+    if (this.callinNum === '') {
+      this.callNum = '-1'
+    } else {
+      this.callNum = this.callinNum
+    }
+    console.log(this.callinNum)
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          callerNumber: this.callNum, //	否	string	模糊查询（呼叫号码）
+          callType: 1 // 呼叫类型
+        }
+        getCallRecords(params).then(response => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            if (response.total == null) {
+              this.pageParams.total = 0
+            } else {
+              this.pageParams.total = response.total
+            }
+            this.dataLists = response.rows
+          }
+        })
+        resolve()
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+</style>

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

@@ -0,0 +1,416 @@
+<template>
+  <div>
+    <el-col :md="24" class="right_wrap">
+      <el-card shadow="hover" class="callin_header">
+        <el-row style="padding: 8px 0 !important; ">
+
+          <el-col style="width:110px">
+            <p class="callin_con">
+              <span class="callin_num">{{ callinNum }}</span>
+            </p>
+          </el-col>
+          <!-- <el-col :span="5">
+            <p class="callin_con">
+              <span class="callin_address">归属地：{{ phoneData }}</span>
+            </p>
+          </el-col> -->
+          <el-col :span="6">
+            <h5 class="callin_name">
+              {{ cusInfo.cusname }}
+            </h5>
+          </el-col>
+          <el-col :span="4">
+            <p class="callin_con callin_time">
+              <time v-show="!dropoff">当前通话时长：{{ telCallTime.hh }}:{{ telCallTime.mm }}:{{
+                telCallTime.ss
+              }}</time>
+              <time v-show="dropoff">当前通话时长：{{ callinTime }}</time>
+            </p>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-col>
+    <!-- 客户信息 -->
+    <el-col :span="24">
+      <div class="msgbox">客户信息</div>
+      <el-card class="customer_info">
+        <AddOrEditCustomer
+          :callin-num="callinNum"
+          @cus-info-list="getCusInfos"
+          @fromChild="getChild"/>
+      </el-card>
+    </el-col>
+    <!-- tab切换 -->
+    <el-col :span="24">
+      <el-card shadow="hover" class="records">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="历史通话记录" name="first">
+            <div class="tab_body">
+              <OrderList ref="callListEl" :callin-num="callinNum" :callid="callinCallid" />
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </el-card>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import OrderList from './OrderList'
+import AddOrEditCustomer from './AddOrEditCustomer'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'CallScreenComponent',
+  components: {
+    OrderList,
+    AddOrEditCustomer
+  },
+  data() {
+    return {
+      phoneData: '', // 归属地
+      // 咨询类型级联
+      activeName: 'first', // tab切换默认显示来电历史工单
+      callinNum: '', // 来电号码
+      callinTime: '00:00:00', // 通话时长
+      telTimer: null, // 时间定时器
+      callinCallid: '', // 来电id
+      dropoff: false, // 是否挂断
+      cusInfo: {
+        // 客户信息
+        cusname: '未知', // 客户姓名
+        customertype: '潜在客户', // 客户类型
+        customerCode: '' // 客户代码
+      }
+    }
+  },
+
+  computed: {
+    ...mapGetters([
+      'zxbh',
+      'telCallNum', // 顶部显示号码
+      'telCallTime',
+      'telLineState'
+    ])
+  },
+  watch: {
+    telLineState: function(newT, oldT) {
+      this.watchTelLineState(newT, oldT)
+    }
+  },
+  created() {
+    this.callinNum = this.telCallNum // 来电号码  $route.params.telInNumber
+    this.callinCallid = this.inComingCallId
+
+    if (this.callinNum) {
+      this.calladdress()
+    }
+  },
+  methods: {
+    // 同步客户信息
+    getChild(v) { },
+    // 归属地
+    calladdress() {
+      // getCallOutprefix(this.callinNum).then((response) => {
+      //   if (response.state.toLowerCase() === 'success') {
+      //     const res = response.data
+
+      //     if (res && res.mobileData) {
+      //       this.phoneData = res.mobileData.cityDes
+      //     }
+      //   }
+      // })
+    },
+    // 通话时间
+    callTimeFun() {
+      // 通话时间重置为00:00:00
+      // 时间 计时
+      let _n = 0
+      if (this.telTimer) {
+        clearInterval(this.telTimer)
+      }
+      this.telTimer = setInterval(() => {
+        _n++
+        this.callTime = {
+          hh: this.toDub(parseInt((_n / 60 / 60) % 60)), // 小时
+          mm: this.toDub(parseInt((_n / 60) % 60)), // 分钟
+          ss: this.toDub(parseInt(_n % 60)) // 秒
+        }
+      }, 1000)
+    },
+    toDub(i) {
+      return i < 10 ? '0' + i : '' + i
+    },
+
+    // 清除定时器
+    clearInter() {
+      clearInterval(this.telTimer)
+    },
+    // 监听 线路状态
+    watchTelLineState(newT, oldT) {
+      if (newT === 1) {
+        if (this.telTimer) {
+          clearInterval(this.telTimer)
+          this.telTimer = null
+        }
+        this.dropoff = true // 是否挂断
+        this.callinTime = `${this.telCallTime.hh}:${this.telCallTime.mm}:${this.telCallTime.ss}`
+      }
+    },
+    changeGateway(data) {
+    },
+    // tab 切换
+    handleClick(tab, event) {
+      if (tab.name === 'first') {
+        this.getHistoryList(tab.name)
+      } else if (tab.name === 'second') {
+        this.getOrderList(tab.name)
+      } else if (tab.name === 'third') {
+        this.getCusProList(tab.name)
+      }
+    },
+    // 获取历史工单列表
+    getHistoryList(acname) {
+      if (!acname) {
+        this.activeName = 'first'
+      }
+      this.$refs.callListEl.getList()
+    },
+    // 获取历史通话记录
+    getOrderList(acname) {
+      if (!acname) {
+        this.activeName = 'second'
+      }
+      this.$refs.orderListEl.getList()
+    },
+    // 获取客户历史通话记录
+    getCusProList(acname) {
+      if (!acname) {
+        this.activeName = 'third'
+      }
+      this.$refs.cutomerListEl.getList()
+    },
+    // 获取毫秒数
+    getTime() {
+      const timer = new Date()
+      const timer2 = timer.getTime()
+      return timer2
+    },
+    // 获取客户信息
+    getCusInfos(data) {
+      console.log(data)
+      if (data) {
+        this.cusInfo.cusname = data.F_CustomerName
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+	.order_form .el-form-item--mini.el-form-item,
+	.el-form-item--small.el-form-item {
+		margin-bottom: 5px !important;
+	}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped="scoped">
+	.el-tabs__header {
+		margin: 0;
+	}
+
+	.te .el-textarea__inner {
+		line-height: 1 !important;
+	}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.app-container {
+		margin: 0;
+		padding: 0;
+	}
+
+	.msgbox {
+		width: 100%;
+		height: 25px;
+		line-height: 25px;
+		border-radius: 5px;
+		padding-left: 5px;
+		color: #f5f5f6;
+		background-color: #409eff;
+	}
+
+	.text {
+		font-size: 14px;
+	}
+
+	.callin_custype {
+		color: red;
+		font-size: 14px;
+	}
+
+	.callin_btn {
+		width: 36px;
+		height: 36px;
+		display: inline-block;
+		margin-left: 10px;
+		cursor: pointer;
+	}
+
+	.callin_header {
+		margin-top: 15px;
+
+		.incall_avatar {
+			width: 106px;
+			height: 106px;
+			vertical-align: middle;
+			border-radius: 50%;
+		}
+
+		.callin_name {
+			font-size: 16px;
+			color: #333333;
+			margin: 0;
+			font-weight: 400;
+
+			.callin_custype {
+				color: #5092e1;
+				font-size: 14px;
+			}
+		}
+
+		.callin_con {
+			margin: 0;
+			padding: 0;
+			font-size: 14px;
+			color: #4c4c4c;
+		}
+
+		.callin_num {
+			font-size: 16px;
+			color: #5092e1;
+		}
+
+		.callin_address {
+			color: rgb(214, 113, 18);
+		}
+
+		.callin_time {
+			color: #808080;
+		}
+
+		.callin_btns {
+			position: absolute;
+			right: 0;
+			top: 0;
+		}
+
+		.callin_btn {
+			width: 36px;
+			height: 36px;
+			display: inline-block;
+			margin-left: 10px;
+			cursor: pointer;
+		}
+
+		.callinorder {
+			background: url(../../../assets/imgs/callinorder.png) center center no-repeat;
+		}
+
+		.callinuser {
+			background: url(../../../assets/imgs/callinuser.png) center center no-repeat;
+		}
+
+		.callinpro {
+			background: url(../../../assets/imgs/xiangmu.png) center center no-repeat;
+		}
+
+		.callinblack {
+			background: url(../../../assets/imgs/callinblack.png) center center no-repeat;
+		}
+
+		.callincelblack {
+			background: url(../../../assets/imgs/callincelblack.png) center center no-repeat;
+		}
+
+		.callinivr {
+			background: url(../../../assets/imgs/callinivr.png) center center no-repeat;
+		}
+	}
+
+	.customer_info {
+		margin-top: 15px;
+
+		.customer_title {
+			font-size: 14px;
+			color: #333333;
+			font-weight: 400;
+			margin-top: 0;
+			margin-bottom: 20px;
+		}
+
+		.customer_cons {
+			background-color: #f5f5f6;
+			padding: 15px;
+			font-size: 12px;
+			color: #666666;
+
+			.customer_item {
+				line-height: 12px;
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+	.customer_info {
+		width: 99%;
+		margin: 15px auto 0 auto;
+		border-radius: 4px;
+
+		.makeOrder {
+			margin-bottom: 15px;
+			line-height: 40px;
+			height: 40px;
+			font-size: 12px;
+			border-bottom: 1px solid #8a8686;
+		}
+
+		.customer_title {
+			font-size: 14px;
+			color: #333333;
+			font-weight: 400;
+			margin-top: 0;
+			margin-bottom: 20px;
+		}
+
+		.customer_cons {
+			background-color: #f5f5f6;
+			padding: 15px;
+			font-size: 12px;
+			color: #666666;
+
+			.customer_item {
+				line-height: 12px;
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+	.records {
+		width: 99%;
+		margin: 15px auto 0 auto;
+		border-radius: 4px;
+	}
+
+	.order_form {
+		.form_select {
+			width: 100%;
+		}
+
+		.form_date {
+			width: 100%;
+		}
+
+		.col_select_text {
+			text-align: right;
+			padding-right: 15px;
+		}
+	}
+</style>

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

@@ -0,0 +1,117 @@
+<template>
+  <keep-alive>
+    <div class="app-container tanping">
+      <el-tabs v-model="editableTabsValue" type="card" closable @tab-remove="removeTab">
+        <el-tab-pane v-for="item in editableTabs" :key="item.name" :label="item.title" :name="item.name">
+          <CallScreenComponent @childByValue="childByValue" />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </keep-alive>
+</template>
+
+<script>
+import CallScreenComponent from './components/callScreen'
+import {
+  mapGetters
+} from 'vuex'
+export default {
+  name: 'CallScreen',
+  components: {
+    CallScreenComponent
+  },
+  data() {
+    return {
+      editableTabsValue: '1',
+      editableTabs: [{
+        title: '来电弹屏',
+        name: '1'
+      }],
+      editableTabs2: [],
+      callinNum: '',
+      chulidval: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'zxbh',
+      'telCallNum', // 顶部显示号码
+      'screenState',
+      'telCallTime'
+    ])
+  },
+  watch: {
+    telCallNum: function() {
+      console.log(this.screenState)
+      if (this.telCallNum && this.screenState) {
+        this.addTab()
+      }
+    }
+  },
+  created() {
+    if (this.telCallNum) {
+      this.editableTabs[0].title = this.telCallNum
+      this.editableTabs[0].name = this.telCallNum
+      this.editableTabsValue = this.telCallNum
+      this.callinNum = this.telCallNum
+    }
+  },
+  mounted() {},
+  methods: {
+    // 获取值
+
+    childByValue(childValue) {
+      this.chulidval = childValue
+      console.log('6.7', this.chulidval)
+      this.removeTab(this.chulidval)
+    },
+    addTab() {
+      if (this.editableTabs.some(v => v.name === this.telCallNum)) return
+      const newTabName = this.telCallNum
+      this.editableTabs.push({
+        title: newTabName,
+        name: newTabName
+        // content: newTabName%2 == 0 ? 'test' : 'test2'
+      })
+      this.editableTabsValue = newTabName
+    },
+    removeTab(targetName) {
+      if (this.chulidval) {
+        targetName = this.chulidval
+      }
+      const tabs = this.editableTabs
+      let activeName = this.editableTabsValue
+      console.log(1, activeName)
+      if (activeName === targetName) {
+        tabs.forEach((tab, index) => {
+          if (tab.name === targetName) {
+            const nextTab = tabs[index + 1] || tabs[index - 1]
+            if (nextTab) {
+              activeName = nextTab.name
+            }
+          }
+        })
+      }
+      this.editableTabsValue = activeName
+      this.editableTabs = tabs.filter(tab => tab.name !== targetName)
+    }
+  }
+}
+</script>
+
+<!-- 需要注意的是，修改elementUI的默认样式的css不能使用scoped. -->
+<style rel="stylesheet/scss" lang="scss">
+	.el-form-item--mini.el-form-item,
+	.el-form-item--small.el-form-item {
+		margin-bottom: 18px;
+	}
+
+	.tanping .el-card__body {
+		padding: 5px;
+	}
+</style>
+<style>
+	.app-container {
+		padding: 0px;
+	}
+</style>

CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/components/addOrEdit.vue

@@ -0,0 +1,279 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="85px" class="order_form">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="客户代码" prop="code">
+            <el-input v-model="ruleForm.code" placeholder="请输入客户代码" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="客户名称" prop="name">
+            <el-input v-model="ruleForm.name" placeholder="请输入客户名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="级别" prop="layer">
+            <el-input v-model="ruleForm.layer" type="number" placeholder="请输入客户级别" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机" prop="mobile">
+            <el-input v-model="ruleForm.mobile" placeholder="请输入手机号码" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="电话" prop="telphone">
+            <el-input v-model="ruleForm.telphone" placeholder="请输入客户电话" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="传真" prop="fax">
+            <el-input v-model="ruleForm.fax" placeholder="请输入客户传真" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="邮编" prop="postcode">
+            <el-input v-model="ruleForm.postcode" placeholder="请输入客户邮编" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="邮件" prop="email">
+            <el-input v-model="ruleForm.email" placeholder="请输入客户邮件" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="性别" prop="sex">
+            <el-input v-model="ruleForm.sex" placeholder="请输入性别" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+
+          <el-form-item label="省" prop="province">
+            <el-input v-model="ruleForm.province" placeholder="请输入省" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="市" prop="city">
+            <el-input v-model="ruleForm.city" placeholder="请输入市" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="区县" prop="county">
+            <el-input v-model="ruleForm.county" placeholder="请输入区县" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="客户住址" prop="adddress">
+            <el-input v-model="ruleForm.adddress" placeholder="请输入客户住址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { addOrEditCustomerList, getCusDetail } from '@/api/customerManagement/customerList'
+import { validateTel } from '@/utils/validate'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'AddOrEdit',
+  props: {
+    rowid: {
+      type: Number,
+      default: 0
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    var phoneNumbersinput = (rule, value, callback) => {
+      if (value !== '') { // 不为空的时候进行验证
+        validateTel(value) ? callback() : callback(new Error('联系电话格式错误'))
+      } else { // 为空的时候就直接放过去（这里一定要写，不然既不报错也不会往下走【应该和router的next()相同】）
+        callback()
+      }
+    }
+    return {
+      ruleForm: {
+        id: '', // 客户id
+        code: '', // 客户代码
+        name: '', // 客户名称
+        layer: '', // 客户等级
+        mobile: '', // 客户手机
+        telphone: '', // 客户电话
+        fax: '', // 客户传真
+        postcode: '', // 客户邮编
+        email: '', // 客户邮件
+        sex: '', // 性别
+        province: '', // 省
+        city: '', // 市
+        county: '', // 区县
+        adddress: '' // 客户住址
+      },
+      rules: {
+        name: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: '请输入客户名称!'
+          }
+        ],
+        code: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入客户代码!'
+        }],
+        mobile: [
+          {
+            required: false,
+            validator: phoneNumbersinput,
+            trigger: 'blur'
+
+          }
+        ]
+      },
+      loading: false
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.id = this.rowid
+      const data = {
+        id: this.rowid
+      }
+      this.getDetail(data)
+    }
+  },
+  methods: {
+    submitForm() {
+      // if (this.ruleForm.mobile) {
+      //   if (!validateTel(this.ruleForm.mobile)) {
+      //     this.$message.error('请输入正确的手机号码格式')
+      //   }
+      // }
+
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          const data = {
+            id: this.rowid,
+            code: this.ruleForm.code, // 客户代码 string
+            name: this.ruleForm.name, // 客户名称 string
+            layer: this.ruleForm.layer, // 客户级别 string
+            mobile: this.ruleForm.mobile, // 客户手机 string
+            telphone: this.ruleForm.telphone, // 客户电话 string
+            fax: this.ruleForm.fax, // 客户传真 string
+            postcode: this.ruleForm.postcode, // 客户邮编 string
+            email: this.ruleForm.email, // 客户邮件 string
+            sex: this.ruleForm.sex, // 客户性别 string
+            province: this.ruleForm.province, // 省 string
+            city: this.ruleForm.city, // 市 string
+            county: this.ruleForm.county, // 区 string
+            adddress: this.ruleForm.adddress // 客户住址 string
+          }
+          // 添加
+          if (!this.rowid) {
+            addOrEditCustomerList(data)
+              .then((response) => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$parent.$layer.close(this.layerid)
+                  this.$parent.getListTask() // 重新加载父级数据
+                  this.$message({
+                    message: '恭喜你，添加成功！',
+                    type: 'success',
+                    duration: 1000
+                  })
+                } else {
+                  this.$message({
+                    message: '添加失败，该客户已存在！',
+                    type: 'success',
+                    duration: 1000
+                  })
+                }
+              })
+              .catch((response) => {
+                this.loading = false
+              })
+            return
+          }
+          // 编辑
+          addOrEditCustomerList(data)
+            .then((response) => {
+              this.loading = false
+              if (response.state.toLowerCase() === 'success') {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getListTask() // 重新加载父级数据
+                this.$message({
+                  message: '恭喜你，客户信息编辑成功！',
+                  type: 'success',
+                  duration: 1000
+                })
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        } else {
+          // this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+    // 获取详情
+    getDetail(data) {
+      getCusDetail(data).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          console.log(res)
+          this.ruleForm.code = res.F_CustomerCode // 客户代码
+          this.ruleForm.name = res.F_CustomerName // 客户名称
+          this.ruleForm.layer = res.F_Layer // 客户级别
+          this.ruleForm.mobile = res.F_Mobile // 客户手机
+          this.ruleForm.telphone = res.F_Telephone // 客户电话
+          this.ruleForm.fax = res.F_Fax // 客户传真
+          this.ruleForm.postcode = res.F_PostCode // 客户邮编
+          this.ruleForm.email = res.F_Email // 客户邮件
+          this.ruleForm.sex = res.F_Sex // 性别
+          this.ruleForm.province = res.F_Province // 省
+          this.ruleForm.city = res.F_City // 市
+          this.ruleForm.county = res.F_County // 区
+          this.ruleForm.adddress = res.F_Address // 客户住址
+        }
+      })
+    }
+
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+	.order_form {
+		.form_select {
+			width: 100%;
+		}
+
+		.form_date {
+			width: 100%;
+		}
+	}
+</style>

CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/components/detail.vue

@@ -0,0 +1,295 @@
+<template>
+  <div class="order_detail">
+    <el-card shadow="hover">
+      <el-row :gutter="20">
+        <el-col :md="24" class="order_detail_body">
+
+          <el-col :md="24" class="order_detail_content">
+            <el-col :md="12" class="order_detail_item">
+              客户代码：{{ ruleForm.code }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户名称：{{ ruleForm.name }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户等级：{{ ruleForm.layer }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户手机：{{ ruleForm.mobile }}
+
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户电话：{{ ruleForm.telphone }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户传真：{{ ruleForm.fax }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户邮编：{{ ruleForm.postcode }}
+
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户邮件：{{ ruleForm.email }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              性别：{{ ruleForm.sex }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              省：{{ ruleForm.province }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              市：{{ ruleForm.city }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              区县：{{ ruleForm.county }}
+            </el-col>
+            <el-col :md="12" class="order_detail_item">
+              客户住址：{{ ruleForm.adddress }}
+            </el-col>
+          </el-col>
+
+        </el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getCusDetail } from '@/api/customerManagement/customerList'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'Detail',
+  filters: {
+    cusSignFilter(status) {
+      const statusMap = {
+        101: '军品业务',
+        102: '民品业务',
+        103: '新能源业务',
+        104: '外贸业务',
+        105: '华亿业务'
+      }
+      return statusMap[status]
+    },
+    CusCcFilter(status) {
+      const statusMap = {
+        A: '按固定比例定期结算',
+        B: '货到验收合格后，较好催收',
+        C: '货到验收合格后，较难催收',
+        D: '款到发货',
+        E: '款到后合同生效'
+      }
+      return statusMap[status]
+    }
+  },
+  props: {
+    rowid: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      checked: false, // 是否关闭
+      activeName: 'first',
+      ruleForm: {
+        id: '', // 客户id
+        code: '', // 客户代码
+        name: '', // 客户名称
+        layer: '', // 客户登记
+        mobile: '', // 客户手机
+        telphone: '', // 客户电话
+        fax: '', // 客户传真
+        postcode: '', // 客户邮编
+        email: '', // 客户邮件
+        sex: '', // 性别
+        province: '', // 省
+        city: '', // 市
+        county: '', // 区县
+        adddress: '' // 客户住址
+      }
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.ruleForm.id = this.rowid
+      const data = {
+        id: this.rowid
+      }
+      this.getDetail(data)
+    }
+  },
+  methods: {
+
+    // 详情
+    getDetail(data) {
+      getCusDetail(data).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          console.log(res)
+          this.ruleForm.code = res.F_CustomerCode // 客户代码
+          this.ruleForm.name = res.F_CustomerName // 客户名称
+          this.ruleForm.layer = res.F_Layer // 客户级别
+          this.ruleForm.mobile = res.F_Mobile // 客户手机
+          this.ruleForm.telphone = res.F_Telephone // 客户电话
+          this.ruleForm.fax = res.F_Fax // 客户传真
+          this.ruleForm.postcode = res.F_PostCode // 客户邮编
+          this.ruleForm.email = res.F_Email // 客户邮件
+          this.ruleForm.sex = res.F_Sex // 性别
+          this.ruleForm.province = res.F_Province // 省
+          this.ruleForm.city = res.F_City // 市
+          this.ruleForm.county = res.F_County // 区
+          this.ruleForm.adddress = res.F_Address // 客户住址
+        }
+      })
+    }
+
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_detail {
+  .el-col {
+    margin-bottom: 20px;
+  }
+  .el-icon-time {
+    color: #d81e06;
+  }
+  .el-card__header {
+    padding-top: 14px;
+    padding-bottom: 14px;
+    background-color: #f5f5f6;
+  }
+  .order_file {
+    .el-card__body {
+      padding: 22px 0 0 0;
+      text-align: center;
+    }
+  }
+  .order_steps {
+    .el-step__icon-inner {
+      display: none;
+    }
+  }
+  .order_record {
+    .el-card__body {
+      padding: 0;
+    }
+    .el-tabs__header {
+      padding: 0px 20px;
+      background-color: #f5f5f6;
+      .el-tabs__item {
+        font-size: 16px;
+        height: 47px;
+        line-height: 47px;
+      }
+    }
+  }
+}
+</style>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.order_detail {
+  .order_detail_body {
+    margin-bottom: 20px;
+    .round_img {
+      width: 90px;
+      height: 90px;
+      border-radius: 50%;
+      overflow: hidden;
+      margin: 14px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .title {
+      font-size: 20px;
+      .title_icon {
+        color: #d81e06;
+        font-size: 18px;
+        margin-right: 20px;
+      }
+    }
+    .title_sub {
+      font-size: 16px;
+      color: #666666;
+    }
+    .order_detail_content {
+      background-color: #f5f5f6;
+      padding-top: 20px;
+      color: #4c4c4c;
+      font-size: 16px;
+      .order_detail_item {
+        margin-bottom: 10px;
+        .order_content {
+          margin-top: 10px;
+        }
+        .order_file {
+          position: relative;
+          cursor: pointer;
+          .img_mask {
+            display: none;
+            position: absolute;
+            left: 0px;
+            top: 0px;
+            background-color: rgba(0, 0, 0, 0.3);
+            width: 100%;
+            height: 22px;
+            text-align: right;
+            z-index: 1;
+            i {
+              font-size: 20px;
+              line-height: 22px;
+              display: inline-block;
+              margin-right: 15px;
+              color: #fff;
+            }
+          }
+          p {
+            margin-top: 8px;
+            padding-left: 14px;
+            padding-right: 14px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .file_icon {
+            height: 68px;
+            line-height: 68px;
+            font-size: 68px;
+            color: #409eff;
+          }
+        }
+        .order_file:hover .img_mask {
+          display: block;
+        }
+      }
+    }
+  }
+  .green {
+    color: #00c1de;
+  }
+  .done {
+    color: #198120;
+  }
+  .red {
+    color: #d81e06;
+  }
+  .yellow {
+    color: #e6a23c;
+  }
+  .order_steps {
+    // height: 240px;
+    .el-step__icon-inner {
+      display: none;
+    }
+  }
+  .tab_body {
+    padding: 0 20px 20px 20px;
+  }
+  .phoneIcon {
+    cursor: pointer;
+  }
+}
+</style>

CallCenterWeb.UI/RMYY/src/views/customerManagement/customerList/index.vue

@@ -0,0 +1,361 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <el-col :md="24">
+        <el-row :gutter="5">
+          <el-col :span="3">
+            <el-input
+              v-model="searchData.cusName"
+              placeholder="请输入客户名称"
+              class="filter-item"
+            />
+          </el-col>
+          <el-col :span="3">
+            <el-input
+              v-model="searchData.cusTel"
+              placeholder="请输入联系电话"
+              class="filter-item"
+            />
+          </el-col>
+          <el-col :span="4">
+            <el-button
+              type="primary"
+              class="filter-item"
+              size="mini"
+              icon="el-icon-search"
+              @click="btn_search_task"
+            >搜索</el-button
+            >
+            <el-button
+              type="primary"
+              class="filter-item"
+              size="mini"
+              @click="btn_add"
+            >添加</el-button
+            >
+          </el-col>
+        </el-row>
+
+        <el-table
+          v-loading="loading"
+          :data="taskDataLists"
+          border
+          stripe
+          highlight-current-row
+        >
+          <el-table-column
+            :show-overflow-tooltip="true"
+            fixed
+            prop="F_CustomerCode"
+            label="客户代码"
+            align="center"
+            min-width="200"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            fixed
+            prop="F_CustomerName"
+            label="客户名称"
+            align="center"
+            min-width="200"
+          />
+          <el-table-column
+            prop="F_Layer"
+            label="级别"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Telephone"
+            label="电话"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Mobile"
+            label="手机"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Fax"
+            label="传真"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_PostCode"
+            label="邮编"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Email"
+            label="邮件"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Sex"
+            label="性别"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Province"
+            label="省"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_City"
+            label="市"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_County"
+            label="区县"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_Address"
+            label="客户住址"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_CreateBy"
+            label="创建人"
+            align="center"
+            min-width="140"
+          />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="F_CreatedOn"
+            label="创建时间"
+            align="center"
+            min-width="140"
+          />
+
+          <el-table-column
+            label="操作"
+            width="240"
+            align="center"
+            class-name="oparate_btn"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                plain
+                type="primary"
+                @click.stop="btn_edit(scope.row.F_CustomerId)"
+              >编辑</el-button
+              >
+              <el-button
+                size="mini"
+                plain
+                type="primary"
+                @click.stop="btn_detail(scope.row.F_CustomerId)"
+              >详情</el-button
+              >
+              <el-button
+                size="mini"
+                plain
+                type="danger"
+                @click.stop="btn_delete_task(scope.row.F_CustomerId)"
+              >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="pageParams.total > 0"
+          :total="pageParams.total"
+          :pageindex.sync="pageParams.pageindex"
+          :pagesize.sync="pageParams.pagesize"
+          class="pagination"
+          @pagination="getListTask"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getCustomerList, deleteCustomerList } from '@/api/customerManagement/customerList'
+import addOrEdit from './components/addOrEdit'
+import detail from './components/detail'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import { pickerOptions, formatterContent } from '@/utils'
+export default {
+  name: 'MyTask',
+  components: {
+    Pagination
+  },
+  filters: {
+    CusCcFilter(status) {
+      const statusMap = {
+        A: '按固定比例定期结算',
+        B: '货到验收合格后，较好催收',
+        C: '货到验收合格后，较难催收',
+        D: '款到发货',
+        E: '款到后合同生效'
+      }
+      return statusMap[status]
+    },
+    isFilter(status) {
+      const statusMap = {
+        1: '是',
+        0: '否'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      pickerOptions,
+      keyword: '', // 联系人模糊查询关键字
+      loading: false,
+      searchData: {
+        cusName: '', // 客户名称
+        cusTel: ''// 联系电话
+      },
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      taskDataLists: [] // 客户信息列表数据
+    }
+  },
+  computed: {},
+  created() {
+    this.getListTask()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getListTask()
+      }
+    }
+  },
+  methods: {
+    getListTask() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // int 第几页
+          pagesize: this.pageParams.pagesize, // int 每页几条信息
+          name: this.searchData.cusName, // 客户名称
+          telephone: this.searchData.cusTel.toString() // 联系电话
+        }
+        getCustomerList(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            if (response.total == null) {
+              this.pageParams.total = 0
+            } else {
+              this.pageParams.total = response.total
+            }
+            this.taskDataLists = response.rows
+          }
+        })
+        resolve()
+      })
+    },
+    btn_search_task() {
+      this.getListTask()
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: 0 } // props
+        },
+        area: ['50%', '65%'],
+        title: '添加客户信息'
+      })
+    },
+    //  编辑客户信息
+    btn_edit(F_CustomerId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: Number(F_CustomerId) } // props
+        },
+        area: ['50%', '65%'],
+        title: '编辑客户信息'
+      })
+    },
+    // 客户详情信息
+    btn_detail(F_CustomerId) {
+      this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: Number(F_CustomerId) } // props
+        },
+        area: ['40%', '40%'],
+        title: '客户详情信息'
+      })
+    },
+    // 删除
+    btn_delete_task(F_CustomerId) {
+      this.$confirm('确定要删除吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          deleteCustomerList(F_CustomerId).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.getListTask()
+              this.$message({ message: '删除成功！', type: 'success', duration: 1000 })
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info('已取消删除')
+        })
+    }
+  }
+}
+</script>
+
+<style >
+.el {
+  cursor: pointer;
+}
+.filter-container {
+  padding-top: 15px;
+}
+.el-table--mini,
+.el-table--small,
+.el-table__expand-icon {
+  font-size: 14px;
+}
+.el-table--small td,
+.el-table--small th {
+  padding: 2px 0 !important;
+}
+.filter-date {
+  width: 388px !important;
+}
+.el-table {
+  color: #000;
+}
+</style>

CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar.vue

@@ -8,7 +8,7 @@
         <span class="personalInfoText">姓名:{{ username }}</span>
       </div>
       <div class="personalInfoLine">
-        <span class="personalInfoText">小组:{{ groupName }}</span>
+        <!-- <span class="personalInfoText">小组:{{ groupName }}</span> -->
         <span class="personalInfoText">分机号:{{ extension }}</span>
       </div>
     </div>

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/department/component/addOrEdit.vue

@@ -0,0 +1,148 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class>
+      <el-form-item label="父级分类" prop="parentids">
+        <el-cascader
+          v-model="parentids"
+          :options="typeDropDatas"
+          :props="props"
+          :disabled="addEditJudgment"
+          placeholder="请选择父级分类,默认是顶级分类"
+          clearable
+          filterable
+          change-on-select
+          style="width: 100%;"
+        />
+      </el-form-item>
+      <el-form-item label="分类名称" prop="name">
+        <el-input v-model="ruleForm.name" placeholder="请输入分类名称" />
+      </el-form-item>
+      <el-form-item label="分类编码" prop="code">
+        <el-input v-model="ruleForm.code" placeholder="请输入分类编码" />
+      </el-form-item>
+      <el-form-item label="排列序号" prop="sort">
+        <el-input v-model.number="ruleForm.sort" maxlength="20" placeholder="请输入排列序号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getTreeList, addType, editType, getTypeDetail } from '@/api/systemSetup/roleSetting/department'
+export default {
+  name: 'AddOrEditKnowledge',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    },
+    listPid: {
+      type: Number,
+      default: 0
+    },
+    addPid: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      parentids: [],
+      ruleForm: {
+        pid: 0, // 父节点id
+        id: '', // 当前节点id
+        code: '',
+        sort: '', // 序号
+        name: '' // 分类名称 name
+      },
+      rules: {
+        sort: [
+          { required: true, message: '排列序号不能为空' },
+          { type: 'number', message: '排列序号必须为数字' }
+        ],
+        name: [
+          { required: true, message: '分类名称不能为空' }
+        ]
+      },
+      typeDropDatas: [], // 下拉分类
+      // 自定义菜单下拉数据的key值
+      props: {
+        value: 'id',
+        label: 'text'
+      },
+      addEditJudgment: true, // 添加flase 编辑true
+      addEditLock: true // 添加true 编辑false
+    }
+  },
+  created() {
+    if (this.rowid) {
+      this.addEditJudgment = true
+      this.addEditLock = false
+      this.ruleForm.id = this.rowid
+      this.getTypeDetails(this.rowid)
+    }
+  },
+  methods: {
+    // 获取菜单详情
+    getTypeDetails(rid) {
+      getTypeDetail(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.ruleForm.name = res.F_DeptName // 分类名称
+          this.ruleForm.pid = res.F_ParentId // 父节点id
+          this.ruleForm.sort = res.F_Sort // 排序
+          this.ruleForm.code = res.F_DeptCode
+          const levelid = response.data.F_ParentId
+        }
+      })
+    },
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          if (!this.rowid) {
+            // 添加
+            if (this.addPid) { this.ruleForm.pid = this.addPid }
+            addType(this.ruleForm).then(response => {
+              this.loading = false
+              if (response.state.toLowerCase() === 'success') {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getDepList() // 重新加载父级数据
+                this.$message.success('恭喜你，添加成功!')
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+            return
+          }
+          // 编辑
+          editType(this.ruleForm).then(response => {
+            this.loading = false
+            if (response.state.toLowerCase() === 'success') {
+              this.$parent.$layer.close(this.layerid)
+              this.$parent.getDepList(this.listPid) // 重新加载父级数据this.listPid
+              this.$message.success('恭喜你，编辑成功!')
+            }
+          }).catch(() => {
+            this.loading = false
+          })
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>
+

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

@@ -0,0 +1,281 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="24">
+        <div class="filter-container">
+          <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add()">添加</el-button>
+        </div>
+        <el-alert :closable="false" title="部门分类" type="success" />
+        <!-- @current-change="handleCurrentChange" -->
+        <el-table v-loading="loading" :data="departmentDataLists" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" highlight-current-row border row-key="F_DeptId" default-expand-all >
+          <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
+          <el-table-column prop="F_DeptCode" label="部门编码" align="center" min-width />
+          <el-table-column prop="F_Sort" label="序号" align="center" min-width />
+          <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
+            <template slot-scope="scope">
+              <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_DeptId.toString())">编辑</el-button>
+              <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_DeptId.toString())">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getDepList" />
+      </el-col>
+      <!-- <el-col :span="8">
+        <div>
+          <div class="filter-container search">
+            <el-input v-model="keyword" placeholder="请输入关键字" class="filter-item" />
+            <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+            <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add()">添加</el-button>
+          </div>
+          <el-alert :closable="false" title="中心分类" type="success" />
+          <el-table v-loading="loading" :data="dataLists" border stripe highlight-current-row @row-click="handleTableClick">
+            <el-table-column type="index" label="编号" align="center" fixed width="60" />
+            <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
+            <el-table-column prop="F_Name" label="中心名称" align="center" min-width />
+            <el-table-column prop="F_Des" label="描述说明" align="center" min-width />
+            <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
+              <template slot-scope="scope">
+                <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_DeptId.toString())">编辑</el-button>
+                <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_DeptId.toString())">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="pageParamsSecond.total > 0" :total="pageParamsSecond.total" :pageindex.sync="pageParamsSecond.pageindex" :pagesize.sync="pageParamsSecond.pagesize" class="pagination" @pagination="getDepList" />
+        </div>
+      </el-col> -->
+      <!-- <el-col :span="8">
+        <div>
+          <div class="filter-container search">
+            <el-input v-model="teamkeyword" placeholder="请输入关键字" class="filter-item" />
+            <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+            <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+          </div>
+          <el-alert :closable="false" title="小组分类" type="success" />
+          <el-table v-loading="loading" :data="teamLists" border stripe highlight-current-row>
+            <el-table-column type="index" label="编号" align="center" fixed width="50" />
+            <el-table-column prop="F_DeptName" label="部门名称" align="center" min-width />
+            <el-table-column prop="F_Name" label="小组名称" align="center" min-width />
+            <el-table-column prop="F_Des" label="描述说明" align="center" min-width />
+            <el-table-column label="操作" width="160" align="center" class-name="oparate_btn" fixed="right">
+              <template slot-scope="scope">
+                <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_DeptId.toString())">编辑</el-button>
+                <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_DeptId.toString())">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="pageParamsThird.total > 0" :total="pageParamsThird.total" :pageindex.sync="pageParamsThird.pageindex" :pagesize.sync="pageParamsThird.pagesize" class="pagination" @pagination="getDepList" />
+        </div>
+      </el-col> -->
+    </el-row>
+  </div>
+</template>
+<script>
+import { getScoreList, deleteType, deleteScore, getDepartmentList } from '@/api/systemSetup/roleSetting/department'
+import addOrEditDepartment from './component/addOrEdit'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+export default {
+  name: 'Department',
+  components: {
+    Pagination
+  },
+  filters: {
+    judgmentLockName(status) {
+      const statusMap = {
+        0: '未锁定',
+        1: '锁定'
+      }
+      return statusMap[status]
+    },
+    judgmentTargetMoney(status) {
+      if (status === 0) {
+        return ''
+      } else {
+        return status
+      }
+    }
+  },
+  data() {
+    return {
+      keyword: '',
+      teamkeyword: '',
+      selectedId: '',
+      listGrade: 1,
+      listPid: 0,
+      addPid: 0,
+      depId: 0, // 最后一级部门id
+      loading: false,
+      clickId: '', // 中心点击id
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      pageParamsSecond: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      pageParamsThird: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 中心管理列表数据
+      teamLists: [], // 小组列表数据
+      departmentDataLists: [] // 部门列表数据
+    }
+  },
+  created() {
+    this.getDepList() // 部门列表
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        // this.getList()
+      }
+    }
+  },
+  mounted: function() {},
+  methods: {
+    // 部门分类
+    getDepList(listPid) {
+      if (listPid != null) {
+        this.depId = listPid
+        this.listGrade--
+      }
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          pid: this.depId,
+          keyword: this.keyword.trim()
+        }
+        getDepartmentList(params)
+          .then((response) => {
+            this.loading = false
+            this.departmentDataLists = response.rows
+            this.pageParams.total = response.total
+
+            // if (this.listGrade === 1) {
+            //   this.departmentDataLists = response.rows
+            //   this.pageParams.total = response.total
+            // } else if (this.listGrade === 1) {
+            //   this.dataLists = response.rows
+            //   this.pageParamsSecond.total = response.total
+            // } else if (this.listGrade === 3) {
+            //   this.teamLists = response.rows
+            //   this.pageParamsSecond.total = response.total
+            // }
+          })
+          .catch((result) => {
+            this.loading = false
+            this.departmentDataLists = []
+          })
+        resolve()
+      })
+    },
+    // 添加
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEditDepartment, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: '', addPid: this.addPid } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['80%', '90%'],
+        shadeClose: false,
+        title: '添加部门分类'
+      })
+    },
+
+    btn_edit(F_DeptId) {
+      this.F_DeptId = F_DeptId
+      if (F_DeptId === '') {
+        this.$message({
+          message: '请选择一行编辑！',
+          type: 'warning'
+        })
+        return
+      }
+      this.$layer.iframe({
+        content: {
+          content: addOrEditDepartment, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: F_DeptId, listPid: this.listPid } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['80%', '90%'],
+        shadeClose: false,
+        title: '编辑部门分类'
+      })
+      this.F_DeptId = ''
+    },
+    // 删除
+    btn_delete(F_DeptId) {
+      this.F_DeptId = F_DeptId
+      if (this.F_DeptId === '') {
+        this.$message({
+          message: '没有可删除的选项！',
+          type: 'warning'
+        })
+      } else {
+        const id = F_DeptId
+        this.deleteType(F_DeptId)
+      }
+      this.F_DeptId = ''
+    },
+    // 删除
+    deleteType(id) {
+      this.$confirm('您确定要删除吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          deleteType(id).then((response) => {
+            if (response.state.toLowerCase() === 'success') {
+              this.listGrade = 1
+              this.depId = 0
+              this.getDepList()
+              this.$message.success('删除成功!')
+            }
+          })
+        })
+        .catch(() => {
+          this.$message.info('已取消删除')
+        })
+    },
+    // handleCurrentChange(data) {
+    //   if (data.F_DeptId !== 0) {
+    //     this.depId = data.F_DeptId
+    //     this.listGrade = 2
+    //     this.addPid = this.depId
+    //     this.getDepList()
+    //   } else {
+    //     this.depId = 0
+    //   }
+    //   this.teamLists = []
+    // },
+    // 搜索
+    btn_search() {
+      this.pageParams.pageindex = 1
+      // this.getList()
+    }
+    //  点击某一行中心
+    // handleTableClick(row, event, column) {
+    //   if (row.F_DeptId !== 0) {
+    //     this.teamLists = []
+    //     this.clickId = row.F_Id
+    //     this.listGrade = 3
+    //     this.getDepList()
+    //   } else {
+    //     this.depId = 0
+    //   }
+    // }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.search {
+  text-align: right !important;
+}
+</style>

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

@@ -15,7 +15,7 @@
           <el-table-column type="index" label="编号" align="center" fixed width="80" />
           <el-table-column prop="F_RoleName" label="用户角色" align="center" min-width="" />
           <el-table-column prop="F_RoleCode" label="角色代码" align="center" min-width="" />
-          <el-table-column prop="F_CreateTime" label="创建时间" align="center" min-width="" />
+          <el-table-column prop="F_CreateTime" label="创建时间" align="center" width="200" />
           <el-table-column prop="F_CreateUser" label="创建人" align="center" min-width="" />
           <el-table-column prop="F_Remark" label="备注" align="center" min-width="" />
         </el-table>

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/addOrEdit.vue

@@ -3,18 +3,19 @@
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="120px" class="userAccount_form">
       <el-row :gutter="20">
         <el-col :md="12" class="col_item">
-          <el-form-item label="工号" prop="usercode">
-            <el-input v-model="ruleForm.usercode" auto-complete="off" placeholder="请输入工号" />
+          <el-form-item label="姓名" prop="Username">
+            <el-input v-model="ruleForm.Username" auto-complete="off" placeholder="请输入姓名" />
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="姓名" prop="username">
-            <el-input v-model="ruleForm.username" auto-complete="off" placeholder="请输入姓名" />
+          <el-form-item label="工号" prop="Usercode">
+            <el-input v-model="ruleForm.Usercode" auto-complete="off" placeholder="请输入工号" />
           </el-form-item>
         </el-col>
+        <!-- v-if="!rowid" -->
         <el-col v-if="!rowid" :md="12" class="col_item">
-          <el-form-item label="密码" prop="passwordEnter">
-            <el-input v-model="ruleForm.passwordEnter" type="password" auto-complete="off" placeholder="请输入密码" />
+          <el-form-item label="密码" prop="Password">
+            <el-input v-model="ruleForm.Password" type="password" auto-complete="off" placeholder="请输入密码" />
           </el-form-item>
         </el-col>
         <el-col v-if="!rowid" :md="12" class="col_item">
@@ -23,66 +24,41 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="分机号" prop="extensionnumber">
-            <el-input v-model="ruleForm.extensionnumber" placeholder="请输入分机号" />
+          <el-form-item label="分机号" prop="Extno">
+            <el-input v-model="ruleForm.Extno" placeholder="请输入分机号" />
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="所属部门" prop="deptid">
-            <el-cascader ref="myCascader" v-model="parentids" :options="departmentDropDatas" :props="props" :placeholder="departmentPlaceholder" :class="{ form_cascader: is_form_cascader }" clearable filterable change-on-select style="width: 100%" @change="handledepartment" />
+          <el-form-item label="所属部门" prop="DeptId">
+            <el-cascader
+              ref="myCascader"
+              v-model="parentids"
+              :options="departmentDropDatas"
+              :props="props"
+              :placeholder="departmentPlaceholder"
+              :class="{ form_cascader: is_form_cascader }"
+              clearable
+              filterable
+              change-on-select
+              style="width: 100%"
+              @change="handledepartment" />
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="中心" prop="deptteam">
-            <el-select v-model="ruleForm.deptteam" class="form_select" filterable clearable placeholder="请选择中心" @change="handleteam">
-              <el-option v-for="item in teamData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="小组" prop="group ">
-            <el-select v-model="ruleForm.group" class="form_select" filterable clearable placeholder="请选择小组" @change="handlegrop">
-              <el-option v-for="item in gropData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="职位" prop="dutyid">
-            <el-select v-model="ruleForm.dutyid" class="form_select" filterable clearable placeholder="请选择职位">
-              <el-option v-for="item in positoinData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="入职日期" prop="entrydate">
-            <el-date-picker v-model="ruleForm.entrydate" type="date" value-format="yyyy-MM-dd" class="form_date" placeholder="请选择入职日期" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="转正日期" prop="fulldate">
-            <el-date-picker v-model="ruleForm.fulldate" type="date" value-format="yyyy-MM-dd" class="form_date" placeholder="请选择转正日期" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="离职日期" prop="termdate">
-            <el-date-picker v-model="ruleForm.termdate" type="date" value-format="yyyy-MM-dd" class="form_date" placeholder="请选择离职日期" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="用户角色" prop="roleid">
-            <el-select v-model="ruleForm.roleid" class="form_select" filterable clearable placeholder="请选择用户角色">
+          <el-form-item label="用户角色" prop="RoleId">
+            <el-select v-model="ruleForm.RoleId" class="form_select" filterable clearable placeholder="请选择用户角色">
               <el-option v-for="item in roleOptions" :key="item.F_RoleId" :label="item.F_RoleName" :value="item.F_RoleId" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="坐席等级" prop="seatlevel">
-            <el-input v-model="ruleForm.seatlevel" placeholder="请输入坐席等级" />
+          <el-form-item label="电话" prop="Phon">
+            <el-input v-model="ruleForm.Phon" placeholder="请输入电话" />
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="性别" prop="sexflag">
-            <el-radio-group v-model="ruleForm.sexflag">
+          <el-form-item label="性别" prop="sex">
+            <el-radio-group v-model="ruleForm.sex">
               <el-radio label="男">男</el-radio>
               <el-radio label="女">女</el-radio>
               <el-radio label="未知">未知</el-radio>
@@ -90,68 +66,13 @@
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="电话" prop="telephone">
-            <el-input v-model="ruleForm.telephone" placeholder="请输入电话" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="手机" prop="mobile">
-            <el-input v-model="ruleForm.mobile" placeholder="请输入手机" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="家庭电话" prop="homephone">
-            <el-input v-model="ruleForm.homephone" placeholder="请输入家庭电话" />
+          <el-form-item label="备注" prop="Remark">
+            <el-input v-model="ruleForm.Remark" placeholder="备注" />
           </el-form-item>
         </el-col>
         <el-col :md="12" class="col_item">
-          <el-form-item label="外线号码" prop="wxno">
-            <el-input v-model="ruleForm.wxno" placeholder="请输入外线号码" />
-          </el-form-item>
-        </el-col>
-        <el-col :md="12" class="col_item">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="ruleForm.remark" placeholder="备注" />
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :md="12" class="col_item">
-          <el-form-item label="提醒标志" prop="remindflag">
-            <el-switch v-model="ruleForm.remindflag" active-value="true" inactive-value="false" @change="changeRemindFlag"/>
-          </el-form-item>
-        </el-col> -->
-        <el-col :md="12" class="col_item">
-          <el-form-item label="话务标志" prop="seatflag">
-            <el-switch v-model="ruleForm.seatflag" active-value="true" inactive-value="false" @change="changeSeatFlag" />
-          </el-form-item>
-        </el-col>
-        <el-col v-show="seatFlag" :md="12" class="col_item">
-          <el-form-item label="坐席组" prop="seartgroupiD">
-            <el-select v-model="ruleForm.seartgroupiD" class="form_select" filterable clearable placeholder="请选择坐席组">
-              <el-option v-for="item in seatOptions" :key="item.F_ZXZID" :label="item.F_ZXZName" :value="item.F_ZXZID" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col v-show="seatFlag" :md="12" class="col_item">
-          <el-form-item label="坐席组权限" prop="seatright">
-            <el-radio-group v-model="ruleForm.seatright">
-              <el-radio label="0">普通坐席</el-radio>
-              <el-radio label="1">班长坐席</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :md="24">
-          <el-form-item label="头像">
-            <el-col :md="8">
-              <el-button type="primary" plain @click="toggleShow">点击上传头像</el-button>
-              <p class="tips">提示：预览头像见右侧(上传成功后记得保存)</p>
-              <avatar-upload v-model="uploadAvatar.show" :url="uploadUrl" :params="uploadAvatar.params" :width="200" :height="200" :no-rotate="false" :headers="uploadData.uploadHeader" img-format="png" @crop-success="cropSuccess" @crop-upload-success="cropUploadSuccess" />
-            </el-col>
-            <el-col v-show="uploadAvatar.imgDataUrl" :md="8">
-              <img :src="uploadAvatar.imgDataUrl" alt="头像预览图" class="avatar_img_square" />
-            </el-col>
-            <el-col v-show="uploadAvatar.imgDataUrl" :md="8">
-              <img :src="uploadAvatar.imgDataUrl" alt="头像预览图" class="avatar_img_round" />
-            </el-col>
+          <el-form-item label="话务标志" prop="IsSeat">
+            <el-switch v-model="ruleForm.IsSeat" active-value="1" inactive-value="0" @change="changeSeatFlag" />
           </el-form-item>
         </el-col>
         <el-col :md="24">
@@ -165,34 +86,36 @@
 </template>
 
 <script>
-import md5 from "js-md5"
-import avatarUpload from "vue-image-crop-upload"
-import { mapGetters } from "vuex"
-import { getRoleSelect, getDictionary, getSeatGroup, getPro } from "@/api/commonAPI"
-import { getUserAccount, addUserAccount, editUserAccount, getPositionData, getTeamData } from "@/api/systemSetup/roleSetting/userManage"
-import { validUsername, validName, validPassword, validateTel, validIdCard, validEmail, validExtension } from "@/utils/validate"
-import { getTreeList } from "@/api/systemSetup/roleSetting/department"
-import { delFiles } from "@/utils"
-import { getTeamLists } from "@/api/systemSetup/sysSetting/teamManagement"
+import md5 from 'js-md5'
+import avatarUpload from 'vue-image-crop-upload'
+import { mapGetters } from 'vuex'
+import { getRoleSelect } from '@/api/commonAPI'
+import { getUserAccount, addUserAccount, editUserAccount } from '@/api/systemSetup/roleSetting/userManage'
+import { validUsername, validName, validPassword, validateTel, validExtension } from '@/utils/validate'
+import { getTreeList } from '@/api/systemSetup/roleSetting/department'
 export default {
-  name: "AddOrEdit",
+  name: 'AddOrEdit',
   components: {
-    "avatar-upload": avatarUpload,
+    'avatar-upload': avatarUpload
   },
   props: {
     rowid: {
       type: String,
-      default: "",
+      default: ''
     },
-    layerid: {
+    usercodeList: {
       type: String,
-      default: "",
+      default: ''
     },
+    layerid: {
+      type: String,
+      default: ''
+    }
   },
   data() {
     const validUsernameRule = (rule, value, callback) => {
       if (!validUsername(value)) {
-        callback(new Error("请输入有效的账号（4-20个字符只能是字母、下划线、数字）！"))
+        callback(new Error('请输入有效的账号（4-20个字符只能是字母、下划线、数字）！'))
       } else {
         callback()
       }
@@ -200,7 +123,7 @@ export default {
 
     const validNameRule = (rule, value, callback) => {
       if (!validName(value)) {
-        callback(new Error("请输入有效的姓名（2-20位汉字和·•的组合）！"))
+        callback(new Error('请输入有效的姓名（2-20位汉字和·•的组合）！'))
       } else {
         callback()
       }
@@ -208,10 +131,10 @@ export default {
 
     const validatePass = (rule, value, callback) => {
       if (!validPassword(value)) {
-        callback(new Error("请输入有效的密码（6-32个字符只能是字母、下划线、数字）！"))
+        callback(new Error('请输入有效的密码（6-32个字符只能是字母、下划线、数字）！'))
       } else {
-        if (this.checkPass !== "") {
-          this.$refs.ruleForm.validateField("checkPass")
+        if (this.checkPass !== '') {
+          this.$refs.ruleForm.validateField('checkPass')
         }
         callback()
       }
@@ -219,10 +142,10 @@ export default {
 
     const validatePass2 = (rule, value, callback) => {
       if (!validPassword(this.checkPass)) {
-        callback(new Error("请输入有效的确认密码（6-32个字符只能是字母、下划线、数字）！"))
+        callback(new Error('请输入有效的确认密码（6-32个字符只能是字母、下划线、数字）！'))
       } else {
-        if (this.checkPass !== this.ruleForm.passwordEnter) {
-          callback(new Error("两次输入密码不一致!"))
+        if (this.checkPass !== this.ruleForm.Password) {
+          callback(new Error('两次输入密码不一致!'))
         }
         callback()
       }
@@ -230,7 +153,7 @@ export default {
 
     const validateTelRule = (rule, value, callback) => {
       if (!validateTel(value)) {
-        callback(new Error("请输入有效的手机号码!"))
+        callback(new Error('请输入有效的手机号码!'))
       } else {
         callback()
       }
@@ -239,7 +162,7 @@ export default {
     const validGroupRule = (rule, value, callback) => {
       if (this.seatFlag) {
         if (!value) {
-          callback(new Error("请选择坐席组!"))
+          callback(new Error('请选择坐席组!'))
         } else {
           callback()
         }
@@ -249,9 +172,9 @@ export default {
     }
 
     const validateExt = (rule, value, callback) => {
-      if (value != "") {
+      if (value !== '') {
         if (!validExtension(value)) {
-          callback(new Error("分机号格式(4-20个字符只能是数字)！"))
+          callback(new Error('分机号格式(4-20个字符只能是数字)！'))
         } else {
           callback()
         }
@@ -261,144 +184,92 @@ export default {
     }
 
     return {
-      uploadUrl: this.$store.getters.serverConfig.BASE_API + "Api/Upload",
-      uploadData: {
-        uploadHeader: {
-          Authorization: "",
-        },
-      },
-      uploadAvatar: {
-        show: false,
-        params: {
-          uploadtype: "avatar",
-        },
-        imgDataUrl: "", // 头像剪切后生成的 datebase64格式的url
-      },
       roleOptions: [], // 角色下拉数据
       parentids: [], // 部门下拉数据
-      seatOptions: [], // 坐席组下拉数据
-      positoinData: [], // 职位下拉数据
-      teamData: [], // 中心下拉数据
-      gropData: [], // 小组下拉数据
       seatFlag: false, // 话务标识
-      checkPass: "", // 确认密码
-      departmentteamid: "", // 中心的部门id
-      deptteamid: "", // 中心的部门id(详情)
+      checkPass: '', // 确认密码
       ruleForm: {
-        userid: "",
-        usercode: "",
-        username: "",
-        password: "",
-        passwordEnter: "",
-        extensionnumber: "", // 分机号
-        deptid: "", // 所属部门id
-        dept: "", // 部门名称
-        roleid: "", // 角色
-        dutyid: "", // 职位信息
-        deptteamid: "", // 中心id
-        deptteam: "", // 中心姓名
-        groupid: "", // 小组信息
-        group: "", // 小组名称
-        entrydate: "", // 入职日期
-        fulldate: "", // 转正日期
-        termdate: "", // 离职日期
-        seatlevel: "", // 坐席等级
-        sexflag: "男", // 性别
-        remindflag: false, // 提醒标志
-        telephone: "", // 电话
-        mobile: "", // 手机号码
-        homephone: "", // 家庭电话
-        wxno: "", // 外线电话
-        headimg: "", // 头像大图
-        head_small_img: "", // 头像缩略图
-        remark: "",
+        userid: '',
+        Usercode: '',
+        Username: '',
+        // password: '',
+        Password: '',
+        Extno: '', // 分机号
+        sex: '男', // 性别
+        DeptId: '', // 所属部门id
+        RoleId: '', // 角色
+        Phon: '', // 电话
+        Remark: '',
+        SeatGroup: 1,
         // 话务相关
-        seatflag: "false", // 标志
-        seartgroupiD: "", // 坐席组id
-        seatright: "0", // 坐席组权限
+        IsSeat: 0 // 标志
       },
       rules: {
-        usercode: [
+        Usercode: [
           {
             required: true,
-            trigger: "blur",
-            validator: validUsernameRule,
-          },
+            trigger: 'blur',
+            validator: validUsernameRule
+          }
         ],
-        username: [
+        Username: [
           {
             required: true,
-            trigger: "blur",
-            validator: validNameRule,
-          },
+            trigger: 'blur',
+            validator: validNameRule
+          }
         ],
-        passwordEnter: [
+        Password: [
           {
             required: true,
-            trigger: "blur",
-            validator: validatePass,
-          },
+            trigger: 'blur',
+            validator: validatePass
+          }
         ],
         checkPass: [
           {
             required: true,
-            trigger: "blur",
-            validator: validatePass2,
-          },
+            trigger: 'blur',
+            validator: validatePass2
+          }
         ],
         type: [
           {
             required: true,
-            message: "请选择用户类型",
-            trigger: "change",
-          },
-        ],
-        roleid: [
-          {
-            required: true,
-            message: "请选择用户角色",
-            trigger: "change",
-          },
+            message: '请选择用户类型',
+            trigger: 'change'
+          }
         ],
-        // mobile: [{
-        //   required: true,
-        //   trigger: 'blur',
-        //   validator: validateTelRule
-        // }],
-        seartgroupiD: [
+        RoleId: [
           {
             required: true,
-            trigger: "change",
-            validator: validGroupRule,
-          },
-        ],
-        // extensionnumber: [{
-        //   required: false,
-        //   trigger: 'blur',
-        //   validator: validateExt
-        // }]
+            message: '请选择用户角色',
+            trigger: 'change'
+          }
+        ]
       },
       loading: false,
       departmentDropDatas: [], // 下拉分类
       // 自定义菜单下拉数据的key值
       props: {
-        value: "id",
-        label: "text",
+        value: 'id',
+        label: 'text'
       },
-      departmentPlaceholder: "请选择部门", // 部门提示
-      is_form_cascader: false,
+      departmentPlaceholder: '请选择部门', // 部门提示
+      is_form_cascader: false
     }
   },
   computed: {
-    ...mapGetters(["token", "avatar", "usercode"]),
+    ...mapGetters(['token', 'avatar', 'usercode'])
   },
   created() {
-    this.uploadData.uploadHeader.Authorization = this.token
-    Promise.all([this.getRoleSelects(), this.getTypeDrop(), this.getPosition(), this.getSeatGroupSelects()]).then(() => {
+    // , this.getTypeDrop()
+    Promise.all([this.getRoleSelects(), this.getTypeDrop()]).then(() => {
       if (this.rowid) {
         this.ruleForm.userid = this.rowid
+        this.ruleForm.Usercode = this.usercodeList
         this.is_form_cascader = true
-        this.getDetail(this.rowid)
+        this.getDetail(this.rowid, this.usercodeList)
       }
     })
   },
@@ -408,16 +279,17 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.loading = true
+          // this.ruleForm.Password = md5(this.ruleForm.Password)
           // 添加
           if (!this.rowid) {
-            this.ruleForm.password = md5(this.ruleForm.passwordEnter)
+            this.ruleForm.Password = md5(this.ruleForm.Password)
             addUserAccount(this.ruleForm)
               .then((response) => {
                 this.loading = false
-                if (response.state.toLowerCase() === "success") {
+                if (response.state.toLowerCase() === 'success') {
                   this.$parent.$layer.close(this.layerid)
                   this.$parent.getList() // 重新加载父级数据
-                  this.$message.success("恭喜你，用户信息添加成功!")
+                  this.$message.success('恭喜你，用户信息添加成功!')
                 }
               })
               .catch(() => {
@@ -426,78 +298,50 @@ export default {
             return
           }
           // 编辑
-          this.ruleForm.password = null
           editUserAccount(this.ruleForm)
             .then((response) => {
-              // 更新头像
-              if (this.ruleForm.usercode === this.usercode && this.ruleForm.head_small_img) {
-                this.$store.dispatch("SetAvatar", this.ruleForm.head_small_img)
-              }
               this.loading = false
-              if (response.state.toLowerCase() === "success") {
+              if (response.state.toLowerCase() === 'success') {
                 this.$parent.$layer.close(this.layerid)
                 this.$parent.getList() // 重新加载父级数据
-                this.$message.success("恭喜你，用户信息编辑成功!")
+                this.$message.success('恭喜你，用户信息编辑成功!')
               }
             })
             .catch(() => {
               this.loading = false
             })
         } else {
-          this.$message.error("请输入有效的必填项信息!")
+          this.$message.error('请输入有效的必填项信息!')
           return false
         }
       })
     },
     // 详情
-    getDetail(rid) {
-      getUserAccount(rid).then((response) => {
-        if (response.state.toLowerCase() === "success") {
+    getDetail() {
+      const params = {
+        userid: this.rowid, // 第几页 Usercode
+        usercode: this.usercodeList
+
+      }
+      getUserAccount(params).then((response) => {
+        if (response.state.toLowerCase() === 'success') {
           const res = response.data
-          // headimg: '', // 头像大图
-          // head_small_img: '', // 头像缩略图
-          this.ruleForm.usercode = res.F_UserCode // 工号
-          this.ruleForm.username = res.F_UserName // 姓名
-          this.ruleForm.extensionnumber = res.F_ExtensionNumber // 分机号
-          this.ruleForm.roleid = res.F_RoleId // 角色
-          this.ruleForm.dutyid = res.F_DutyId && res.F_DutyId + "" // 职位
-          this.ruleForm.deptid = res.F_DeptId // 所属部门
-          this.ruleForm.dept = res.F_Dept
-          this.ruleForm.deptteamid = res.F_DeptTeamId // 中心
-          this.ruleForm.deptteam = res.F_Team
-          this.ruleForm.groupid = res.F_GroupId // 小组信息
-          this.ruleForm.group = res.F_Group
-          this.ruleForm.entrydate = res.F_EntryDate // 入职日期
-          this.ruleForm.fulldate = res.F_FullDate // 转正日期
-          this.ruleForm.termdate = res.F_TermDate // 离职日期
-          this.ruleForm.seatlevel = res.F_SeatLevel // 坐席等级
-          this.ruleForm.sexflag = res.F_SexFlag && res.F_SexFlag + "" //
-          this.ruleForm.remindflag = res.F_RemindFlag && res.F_RemindFlag + "" // 提醒标志
-          this.ruleForm.telephone = res.F_Telephone // 电话
-          this.ruleForm.mobile = res.F_Mobile // 手机号码
-          this.ruleForm.homephone = res.F_HomePhone // 家庭电话
-          this.ruleForm.wxno = res.F_WXNo // 外线电话
-          this.uploadAvatar.imgDataUrl = res.head_small_img // 头像预览图
-          this.ruleForm.headimg = res.F_HeadImg // 头像大图
-          // this.ruleForm.head_small_img = res.head_small_img // 头像缩略图
-          this.ruleForm.remark = res.F_Remark
-          this.departmentPlaceholder = res.F_Dept
-          // 话务相关
-          this.ruleForm.seatflag = res.F_SeatFlag && res.F_SeatFlag + "" // 话务标志
-          this.seatFlag = res.F_SeatFlag
-          this.ruleForm.seartgroupiD = res.F_SeartGroupID // 坐席组id
-          this.ruleForm.seatright = res.F_SeatRight === null ? res.F_SeatRight : res.F_SeatRight + "" // 坐席类型 默认普通坐席
+          this.ruleForm.Usercode = res.F_UserCode // 工号
+          this.ruleForm.Username = res.F_UserName // 姓名 Phon
+          this.ruleForm.Extno = res.F_ExtensionNumber // 分机号
+          this.ruleForm.RoleId = res.F_RoleId // 角色
+          this.ruleForm.DeptId = res.F_DeptId // 所属部门
+          // this.ruleForm.Password = res.F_Password // 密码
+          // this.checkPass = res.F_Password // 密码
+          // this.ruleForm.dept = res.F_Dept
+          this.ruleForm.Phon = res.F_Telephone // 电话
+          this.ruleForm.sex = res.F_Sex && res.F_Sex + '' //
+          this.ruleForm.Remark = res.F_Remark
+          this.departmentPlaceholder = res.F_DeptName
+          this.ruleForm.IsSeat = res.F_SeatFlag.toString()
         }
-        // if (this.ruleForm.deptid) {
-        //   this.getTeam(this.ruleForm.deptid)
-        //   this.ruleForm.deptteamid = this.deptteamid
-        // }
       })
     },
-    // 话务提醒标识切换
-    changeRemindFlag() {
-      this.remindflag = !this.remindflag
-    },
     // 话务标识切换
     changeSeatFlag() {
       this.seatFlag = !this.seatFlag
@@ -505,135 +349,35 @@ export default {
     // 获取角色下拉数据
     getRoleSelects() {
       return new Promise((resolve) => {
-        getRoleSelect().then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.roleOptions = response.data
+        const params = {
+          pageindex: 1, // 第几页
+          pagesize: 9999 // 每页几条信息
+        }
+        getRoleSelect(params).then((response) => {
+          console.log(response.rows)
+          if (response.rows.length > 0) {
+            this.roleOptions = response.rows
           }
         })
         resolve()
       })
     },
-    // 获取部门下拉数据
+    // 获取部门下拉数据  getTreeList
     getTypeDrop() {
       return new Promise((resolve) => {
         getTreeList().then((response) => {
-          if (response.state.toLowerCase() === "success") {
+          if (response.state.toLowerCase() === 'success') {
             this.departmentDropDatas = response.data
           }
         })
         resolve()
       })
     },
-    // 获取职位数据
-    getPosition() {
-      getPositionData().then((response) => {
-        if (response.state.toLowerCase() == "success") {
-          this.positoinData = response.data
-        }
-      })
-    },
     // 部门选择信息
     handledepartment(e) {
-      this.ruleForm.deptid = e[e.length - 1]
-      console.log(this.ruleForm.deptid)
-      this.ruleForm.deptteamid = ""
-      this.ruleForm.dept = this.$refs["myCascader"].currentLabels[this.$refs["myCascader"].currentLabels.length - 1] // label
-      this.getTeam()
-    },
-    // 获取中心数据
-    getTeam() {
-      const params = {
-        pageindex: 1, // 第几页
-        pagesize: 500, // 每页几条信息
-        deptid: this.ruleForm.deptid, // 部门id
-        type: 0,
-      }
-      getTeamLists(params).then((response) => {
-        if (response.state.toLowerCase() === "success") {
-          this.teamData = response.data.Rows
-        }
-      })
-    },
-    // 中心选择
-    handleteam(e) {
-      this.ruleForm.deptteamid = e
-      console.log(e)
-      var obj = {}
-      obj = this.teamData.find((item) => {
-        // 这里的teamData就是上面遍历的数据源
-        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
-      })
-      this.ruleForm.deptteam = obj.F_Name //  这里的label就是对应label的
-      this.getteamList()
-      this.ruleForm.groupid = ""
-    },
-    // 获取小组列表数据
-    getteamList() {
-      this.loading = true
-      return new Promise((resolve) => {
-        const params = {
-          pageindex: 1, // 第几页
-          pagesize: 500, // 每页几条信息
-          type: 1,
-          deptid: this.ruleForm.deptid, // 部门id
-          parentid: this.ruleForm.deptteamid,
-        }
-        getTeamLists(params).then((response) => {
-          this.loading = false
-          if (response.state.toLowerCase() === "success") {
-            this.gropData = response.data.Rows
-          }
-        })
-        resolve()
-      })
-    },
-    // 小组选择
-    handlegrop(e) {
-      this.ruleForm.groupid = e
-      var obj = {}
-      obj = this.gropData.find((item) => {
-        // 这里的teamData就是上面遍历的数据源
-        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
-      })
-
-      this.ruleForm.group = obj.F_Name //  这里的label就是对应label的
-    },
-    // 获取坐席组下拉数据
-    getSeatGroupSelects() {
-      return new Promise((resolve) => {
-        getSeatGroup().then((response) => {
-          if (response.state.toLowerCase() === "success") {
-            this.seatOptions = response.data
-          }
-        })
-        resolve()
-      })
-    },
-
-    // 头像
-    toggleShow() {
-      this.uploadAvatar.show = !this.uploadAvatar.show
-    },
-    cropSuccess(imgDataUrl, field) {
-      this.uploadAvatar.imgDataUrl = imgDataUrl
-    },
-    cropUploadSuccess(jsonData, field) {
-      if (jsonData.state.toLowerCase() === "success") {
-        this.ruleForm.headimg = jsonData.data[0].fileurl
-        // this.ruleForm.head_small_img = jsonData.data[0].filesmallurl// 头像缩略图
-      }
-    },
-    // 重置 上传文件
-    resetUploads(rEl, pEl) {
-      if (this.ruleForm[rEl].length > 0) {
-        for (let i = this.ruleForm[rEl].length - 1; i >= 0; i--) {
-          delFiles(this.ruleForm[rEl][i].filesmallurl, this.ruleForm[rEl][i].fileurl)
-          this.ruleForm[rEl].splice(i, 1)
-        }
-      }
-      this.$refs[pEl].clearFiles() // 清空已上传的文件列表（该方法不支持在 before-upload 中调用）
-    },
-  },
+      this.ruleForm.DeptId = e[e.length - 1]
+    }
+  }
 }
 </script>
 

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

@@ -1,60 +1,34 @@
 <template>
   <div class="app-container usermanage">
     <div class="filter-container">
-      <el-cascader ref="myCascader" v-model="parentids" :options="departmentDropDatas" :props="props" class="filter-item" placeholder="请选择部门" clearable filterable change-on-select @change="handledepartment" />
-      <el-select v-model="deptteam" class="filter-item form_select" filterable clearable placeholder="请选择中心" @change="handleteam" @clear="clearTeam">
-        <el-option v-for="item in teamData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
-      </el-select>
-      <el-select v-model="group" class="filter-item form_select" filterable clearable placeholder="请选择小组" @change="handlegrop" @clear="clearGroup">
-        <el-option v-for="item in gropData" :key="item.F_Id" :label="item.F_Name" :value="item.F_Id" />
-      </el-select>
-      <el-select v-model="roleId" class="filter-item" filterable clearable placeholder="请选择角色">
-        <el-option v-for="item in roleOptions" :key="item.F_RoleId" :label="item.F_RoleName" :value="item.F_RoleId" />
-      </el-select>
       <el-input v-model="keyword" placeholder="请输入工号，姓名，电话，手机" class="filter-item" />
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
-      <el-button v-permission="'HY_import'" type="primary" class="filter-item" @click="btn_import">导入</el-button>
-      <el-button v-permission="'HY_deletes'" type="primary" class="filter-item" icon="el-icon-delete" @click="btn_deletes">批量删除</el-button>
+      <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <!-- <el-button type="primary" class="filter-item" icon="el-icon-delete" @click="btn_deletes">批量删除</el-button> -->
     </div>
-
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
       <el-table-column type="selection" width="40" />
-      <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
       <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
-      <el-table-column prop="F_Dept" label="部门" align="center" min-width="" />
-      <el-table-column prop="F_Group" label="小组" align="center" min-width="" />
-      <el-table-column prop="F_Role" label="角色" align="center" min-width="" />
-      <el-table-column prop="F_SeartGroup" label="坐席组" align="center" min-width="" />
+      <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
+      <el-table-column prop="F_ExtensionNumber" label="工号" align="center" min-width="" />
+      <el-table-column prop="F_DeptName" label="部门" align="center" min-width="" />
+      <el-table-column prop="F_RoleName" label="角色" align="center" min-width="" />
+      <el-table-column prop="F_Sex" label="性别" align="center" min-width="" />
       <el-table-column label="标志" align="center" min-width="">
         <template slot-scope="scope">
           {{ scope.row.F_SeatFlag | userSeatFlagFilter }}
         </template>
       </el-table-column>
-      <el-table-column label="坐席权限组" align="center" min-width="">
-        <template slot-scope="scope">
-          {{ scope.row.F_SeatRight | userSeatRightFilter }}
-        </template>
-      </el-table-column>
       <el-table-column prop="F_Telephone" label="电话" align="center" min-width="" />
-      <el-table-column prop="F_Mobile" label="手机" align="center" min-width="" />
       <el-table-column label="启用禁用状态" align="center" min-width="">
         <template slot-scope="scope">
           {{ scope.row.F_DeleteFlag | userDeleteFlagFilter }}
         </template>
       </el-table-column>
-      <el-table-column prop="F_Duty" label="职位" align="center" min-width="" />
-      <el-table-column prop="F_EntryDate" label="入职日期" align="center" min-width="" />
-      <el-table-column prop="F_FullDate" label="转正日期" align="center" min-width="" />
-      <el-table-column prop="F_TermDate" label="离职日期" align="center" min-width="" />
       <el-table-column prop="F_CreateOn" label="添加日期" align="center" min-width="" />
-      <el-table-column prop="F_LastActiveTime" label="最后活跃时间" align="center" min-width="" />
       <el-table-column label="操作" width="320" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button size="mini" plain type="primary" @click="btn_modifyPass(scope.row.F_UserId)">修改密码</el-button>
-          <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_UserId.toString())">编辑</el-button>
-          <!-- <el-button v-if="scope.row.F_DeleteFlag == 2" size="mini" type="primary" @click="btn_start(scope.row.F_UserId)">启用</el-button>
-          <el-button v-else size="mini" type="danger" @click="btn_end(scope.row.F_UserId)">禁用</el-button> -->
+          <el-button size="mini" plain type="primary" @click="btn_edit(scope.row.F_UserId.toString(),scope.row.F_UserCode.toString())">编辑</el-button>
           <el-button size="mini" plain type="danger" @click="btn_delete(scope.row.F_UserId)">删除</el-button>
         </template>
       </el-table-column>
@@ -69,8 +43,6 @@ import { getUserAccountLists, deleteUserAccount } from '@/api/systemSetup/roleSe
 // import { getTreeList } from '@/api/systemSetup/roleSetting/department'
 // import { getTeamLists } from '@/api/systemSetup/sysSetting/teamManagement'
 import addOrEdit from './addOrEdit'
-import modifyPass from './modifyPass'
-import importUser from './importUser'
 import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
 
 export default {
@@ -86,13 +58,6 @@ export default {
       }
       return statusMap[status]
     },
-    userSeatRightFilter(status) {
-      const statusMap = {
-        0: '普通坐席',
-        1: '班长坐席'
-      }
-      return statusMap[status]
-    },
     userDeleteFlagFilter(status) {
       const statusMap = {
         0: '启用',
@@ -105,17 +70,7 @@ export default {
     return {
       loading: false,
       roleId: '',
-      parentids: [],
-      roleOptions: [],
       keyword: '',
-      deptid: '', // 所属部门id
-      dept: '', // 部门名称
-      deptteamid: '', // 中心id
-      deptteam: '', // 中心姓名
-      groupid: '', // 小组信息
-      group: '', // 小组名称
-      teamData: [], // 中心下拉数据
-      gropData: [], // 小组下拉数据
       pageParams: {
         pageindex: 1, // 当前第几页
         pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
@@ -123,7 +78,6 @@ export default {
       },
       multipleSelection: [], // 选中的数据
       dataLists: [], // 列表数据
-      departmentDropDatas: [], // 下拉分类
       // 自定义菜单下拉数据的key值
       props: {
         value: 'id',
@@ -132,9 +86,7 @@ export default {
     }
   },
   created() {
-    this.getRoleSelects()
     this.getList()
-    this.getTypeDrop()
     document.onkeyup = (e) => {
       if (e.keyCode === 13) {
         this.getList()
@@ -146,35 +98,20 @@ export default {
       this.loading = true
       return new Promise((resolve) => {
         const params = {
-          pageindex: this.pageParams.pageindex, // 第几页
+          page: this.pageParams.pageindex, // 第几页
           pagesize: this.pageParams.pagesize, // 每页几条信息
-          keyword: this.keyword.replace(/\s+/g, ''), // 否	string	模糊查询
-          roleid: this.roleId, // 否	string	角色id
-          deptid: this.parentids[this.parentids.length - 1], // array  部门id
-          groupid: this.groupid, // 中心
-          teamId: this.deptteamid // 小组
+          keyword: this.keyword.replace(/\s+/g, '') // 否	string	模糊查询
         }
         getUserAccountLists(params).then((response) => {
           this.loading = false
           if (response.rows.length > 0) {
-            this.pageParams.total = response.Totals
+            this.pageParams.total = response.total
             this.dataLists = response.rows
           }
         })
         resolve()
       })
     },
-    // 获取部门下拉
-    getTypeDrop() {
-      // return new Promise((resolve) => {
-      //   getTreeList().then((response) => {
-      //     if (response.state.toLowerCase() === 'success') {
-      //       this.departmentDropDatas = response.data
-      //     }
-      //   })
-      //   resolve()
-      // })
-    },
     // 复选框状态改变
     changeSelects(val) {
       this.multipleSelection = val
@@ -194,28 +131,17 @@ export default {
         title: '添加用户信息'
       })
     },
-    btn_edit(editId) {
+    btn_edit(editId, usercode) {
       this.$layer.iframe({
         content: {
           content: addOrEdit, // 传递的组件对象
           parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
+          data: { rowid: editId, usercodeList: usercode } // props
         },
         area: ['60%', '90%'],
         title: '编辑用户信息'
       })
     },
-    btn_modifyPass(editId) {
-      this.$layer.iframe({
-        content: {
-          content: modifyPass, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: editId } // props
-        },
-        area: ['40%', '360px'],
-        title: '修改密码'
-      })
-    },
     btn_delete(id) {
       this.$confirm('您确定要将此用户信息删除吗?', '提示', {
         confirmButtonText: '确定',
@@ -237,168 +163,19 @@ export default {
         .catch(() => {
           this.$message.info('已取消删除')
         })
-    },
-    btn_deletes() {
-      const ids = []
-      for (let i = 0, len = this.multipleSelection.length; i < len; i++) {
-        ids.push(this.multipleSelection[i].F_UserId)
-      }
-      if (ids.length <= 0) {
-        this.$message.warning('没有可删除的选项')
-        return
-      }
-      this.btn_delete(ids)
-    },
-    // 导入
-    btn_import() {
-      this.$layer.iframe({
-        content: {
-          content: importUser, // 传递的组件对象
-          parent: this, // 当前的vue对象
-          data: { rowid: '' } // props
-        },
-        area: ['30%', '30%'],
-        title: '导入'
-      })
-    },
-    // 获取角色下拉
-    getRoleSelects() {
-      // getRoleSelect().then((response) => {
-      //   if (response.state.toLowerCase() === 'success') {
-      //     this.roleOptions = response.data
-      //   }
-      // })
-    },
-    // 部门选择信息
-    handledepartment(e) {
-      this.deptid = e[e.length - 1]
-      this.deptteamid = ''
-      this.dept = this.$refs['myCascader'].currentLabels[this.$refs['myCascader'].currentLabels.length - 1] // label
-      this.getTeam()
-    },
-    // 获取中心数据
-    getTeam() {
-      // const params = {
-      //   pageindex: 1, // 第几页
-      //   pagesize: 500, // 每页几条信息
-      //   deptid: this.deptid, // 部门id
-      //   type: 0
-      // }
-      // getTeamLists(params).then((response) => {
-      //   if (response.state.toLowerCase() === 'success') {
-      //     this.teamData = response.data.Rows
-      //   }
-      // })
-    },
-    // 中心选择
-    handleteam(e) {
-      this.deptteamid = e
-      console.log(e)
-      var obj = {}
-      obj = this.teamData.find((item) => {
-        // 这里的teamData就是上面遍历的数据源
-        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
-      })
-      this.deptteam = obj.F_Name //  这里的label就是对应label的
-      this.getteamList()
-      this.groupid = ''
-    },
-    // 获取小组列表数据
-    getteamList() {
-      // this.loading = true
-      // return new Promise((resolve) => {
-      //   const params = {
-      //     pageindex: 1, // 第几页
-      //     pagesize: 500, // 每页几条信息
-      //     type: 1,
-      //     deptid: this.deptid, // 部门id
-      //     parentid: this.deptteamid
-      //   }
-      //   getTeamLists(params).then((response) => {
-      //     this.loading = false
-      //     if (response.state.toLowerCase() === 'success') {
-      //       this.gropData = response.data.Rows
-      //     }
-      //   })
-      //   resolve()
-      // })
-    },
-    // 启用
-    btn_start(id) {
-      this.$confirm('您确定启用吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          return new Promise((resolve) => {
-            const params = {
-              ids: id,
-              state: 0 // 0启用1删除2禁用
-            }
-            deleteUserAccount(params).then((response) => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('启用成功!')
-              }
-            })
-            resolve()
-          })
-        })
-        .catch(() => {
-          this.$message.info('已取消启用')
-        })
-    },
-    // 禁用
-    btn_end(id) {
-      this.$confirm('您确定禁用吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          return new Promise((resolve) => {
-            const params = {
-              ids: id, //
-              state: 2 // 0启用1删除2禁用
-            }
-            deleteUserAccount(params).then((response) => {
-              this.loading = false
-              if (response.state.toLowerCase() === 'success') {
-                this.getList()
-                this.$message.success('禁用成功!')
-              }
-            })
-            resolve()
-          })
-        })
-        .catch(() => {
-          this.$message.info('已取消禁用')
-        })
-    },
-    // 小组选择
-    handlegrop(e) {
-      this.groupid = e
-      var obj = {}
-      obj = this.gropData.find((item) => {
-        // 这里的teamData就是上面遍历的数据源
-        return item.F_Id === e // 筛选出匹配数据，这里的value是你遍历数组每一项的value，如果没有对后台返回的数据做处理，一般为id
-      })
-      this.group = obj.F_Name //  这里的label就是对应label的
-    },
-    // 中心清空
-    clearTeam() {
-      this.teamData = []
-      this.deptteamid = '' // 中心id
-      this.deptteam = '' // 中心姓名
-    },
-    // 小组清空
-    clearGroup() {
-      this.gropData = []
-      this.groupid = '' // 小组信息
-      this.group = '' // 小组名称
     }
+    // btn_deletes() {
+    //   const ids = []
+    //   for (let i = 0, len = this.multipleSelection.length; i < len; i++) {
+    //     ids.push(this.multipleSelection[i].F_UserId)
+    //   }
+    //   if (ids.length <= 0) {
+    //     this.$message.warning('没有可删除的选项')
+    //     return
+    //   }
+    //   this.btn_delete(ids)
+    // }
+
   }
 }
 </script>

CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/modifyPass.vue

@@ -1,151 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="120px" class="modifyPass_form">
-      <el-form-item label="账号">
-        <el-alert
-          :title="ruleForm.usercode"
-          :closable="false"
-          class="user_item"
-          type="success"/>
-      </el-form-item>
-      <el-form-item label="姓名">
-        <el-alert
-          :title="username"
-          :closable="false"
-          class="user_item"
-          type="success"/>
-      </el-form-item>
-      <el-form-item label="新密码" prop="password">
-        <el-input v-model="ruleForm.password" type="password" auto-complete="off" placeholder="请输入新密码"/>
-      </el-form-item>
-      <el-form-item label="确认密码" prop="surepassword">
-        <el-input v-model="ruleForm.surepassword" type="password" auto-complete="off" placeholder="请再次输入密码" @keyup.enter.native="submitForm"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="submitForm">保存</el-button>
-        <el-button @click="resetForm">重置</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import md5 from 'js-md5'
-import { getUserAccount, updatePassword } from '@/api/systemSetup/roleSetting/userManage'
-import { validPassword } from '@/utils/validate'
-
-export default {
-  name: 'ModifyPass',
-  props: {
-    rowid: {
-      type: Number,
-      default: 0
-    },
-    ispersonal: {
-      type: Boolean,
-      default: false
-    },
-    layerid: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    const validatePass = (rule, value, callback) => {
-      if (!validPassword(value)) {
-        callback(new Error('请输入有效的密码（6-32个字符只能是字母、下划线、数字）！'))
-      } else {
-        if (this.ruleForm.surepassword !== '') {
-          this.$refs.ruleForm.validateField('surepassword')
-        }
-        callback()
-      }
-    }
-
-    const validatePass2 = (rule, value, callback) => {
-      if (!validPassword(value)) {
-        callback(new Error('请输入有效的确认密码（6-32个字符只能是字母、下划线、数字）！'))
-      } else {
-        if (value !== this.ruleForm.password) {
-          callback(new Error('两次输入密码不一致!'))
-        }
-        callback()
-      }
-    }
-
-    return {
-      username: '', //	string	姓名
-      ruleForm: {
-        usercode: '', //	string	工号
-        password: '', //	string	密码
-        surepassword: '' //	string	确认密码
-      },
-      rules: {
-        password: [{
-          required: true,
-          trigger: 'change',
-          validator: validatePass
-        }],
-        surepassword: [{
-          required: true,
-          trigger: 'change',
-          validator: validatePass2
-        }]
-      },
-      loading: false
-    }
-  },
-  created() {
-    if (this.rowid) {
-      this.getDetail(this.rowid)
-    }
-  },
-  methods: {
-    submitForm() {
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.ruleForm.password = md5(this.ruleForm.password)
-          this.ruleForm.surepassword = md5(this.ruleForm.surepassword)
-          updatePassword(this.ruleForm).then(response => {
-            this.loading = false
-            if (response.state.toLowerCase() === 'success') {
-              this.$parent.$layer.close(this.layerid)
-              if (!this.ispersonal) {
-                this.$parent.getList() // 重新加载父级数据
-              }
-              this.$message.success(`恭喜你，密码修改成功!`)
-            }
-          }).catch(() => {
-            this.loading = false
-          })
-        } else {
-          this.$message.error('请输入有效的必填项信息!')
-          return false
-        }
-      })
-    },
-    resetForm() {
-      this.$refs.ruleForm.resetFields()
-    },
-    // 详情
-    getDetail(rid) {
-      getUserAccount(rid).then(response => {
-        if (response.state.toLowerCase() === 'success') {
-          const res = response.data
-          this.ruleForm.usercode = res.F_UserCode
-          this.username = res.F_UserName
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-	.modifyPass_form{
-		.user_item{
-			height: 32px;
-		}
-	}
-</style>

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

@@ -0,0 +1,308 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="外呼任务">
+        <el-radio-group v-model="outboundTaskRadio" @change="radioChangeTask">
+          <el-radio :label="1">已有任务</el-radio>
+          <el-radio :label="2">新建任务</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="任务人" prop="F_TaskUser">
+        <el-select v-model="ruleForm.F_TaskUser" class="form_select" clearable filterable>
+          <el-option v-for="item in roleOptions" :key="item.F_UserCode" :label="item.F_UserCode" :value="item.F_UserCode"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务状态" prop="F_State">
+        <el-select v-model="ruleForm.F_State" class="form_select" clearable filterable>
+          <el-option label="未启动" value="0"/>
+          <el-option label="启动" value="1"/>
+          <el-option label="暂停" value="2"/>
+          <el-option label="终止" value="3"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任务名称" prop="F_Name">
+        <el-input v-model="ruleForm.F_Name" placeholder="请输入任务名称" />
+      </el-form-item>
+      <el-form-item label="任务时间" prop="F_Time">
+        <el-date-picker v-model="ruleForm.F_Time" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" class="form_date"/>
+      </el-form-item>
+      <el-form-item label="外呼类型" prop="F_Type">
+        <el-select v-model="ruleForm.F_Type" class="form_select" clearable filterable @change="handleChangeType">
+          <el-option label="语音外呼" value="1"/>
+          <el-option label="坐席外呼" value="2"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-show="displayContent" label="外呼内容" prop="F_Content">
+        <el-input v-model="ruleForm.F_Content" placeholder="请输入外呼内容" />
+      </el-form-item>
+      <el-form-item label="任务说明" prop="F_Remarks">
+        <el-input v-model="ruleForm.F_Remarks" placeholder="请输入任务说明" />
+      </el-form-item>
+      <el-form-item v-show="displayOutboundTask" label="外呼任务" prop="productName">
+        <el-table v-loading="loading" :data="taskDataLists" border stripe highlight-current-row @current-change="handleCurrentChangeTask">
+          <el-table-column type="index" label="编号" align="center" fixed width="80" />
+          <el-table-column prop="F_TaskUser" label="任务人" align="center" min-width />
+          <el-table-column prop="F_State" label="任务状态" align="center">
+            <template slot-scope="scope">{{ scope.row.F_State | judgmentState }}</template>
+          </el-table-column>
+          <el-table-column prop="F_Name" label="任务名称" align="center" />
+          <el-table-column prop="F_StartTime" label="任务开始时间" align="center" />
+          <el-table-column prop="F_EndTime" label="任务结束时间" align="center" />
+          <el-table-column prop="F_Type" label="外呼类型" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.F_Type | judgmentType }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_Content" label="外呼内容" align="center" />
+          <el-table-column prop="F_Remarks" label="任务说明" align="center" />
+        </el-table>
+        <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getListTask" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+// import { getTaskLists, addOutboundNumberLists } from '@/api/outbound/automaticOutbound'
+// import { validateTel } from '@/utils/validate'
+// import { filterContent, pickerOptions } from '@/utils'
+// import { getUserAccountLists } from '@/api/systemSetup/roleSetting/userManage'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+
+export default {
+  name: 'Add',
+  components: {
+    Pagination
+  },
+  filters: {
+    judgmentState(status) {
+      const statusMap = {
+        0: '未启动',
+        1: '启动',
+        2: '暂停',
+        3: '终止'
+      }
+      return statusMap[status]
+    },
+    judgmentType(status) {
+      const statusMap = {
+        1: '语音外呼',
+        2: '坐席外呼'
+      }
+      return statusMap[status]
+    }
+  },
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+    // rowData: {
+    //   type: Array,
+    //   default: []
+    // }
+  },
+  data() {
+    return {
+      roleOptions: [], // 任务人
+      displayContent: true,
+      props: {
+        // 自定义省市下拉数据的key值
+        value: 'code',
+        label: 'name',
+        children: 'entityJson'
+      },
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      outboundTaskRadio: 1, // 外呼任务单选
+      sourceOptions: [], // 工单来源下拉数据
+      taskDataLists: [], // 外呼任务列表
+      displayOutboundTask: true, // 是否显示外呼任务
+      handleTaskId: '', // 选中行id
+      autoDialsList: [], // 外呼号码
+      ruleForm: {
+        F_ID: 0, // 任务id
+        F_TaskUser: '', // 任务人
+        F_Name: '', // 任务名称
+        F_Remarks: '', // 任务说明
+        F_Time: [], // 时间
+        F_StartTime: '', // 开始时间
+        F_EndTime: '', // 结束时间
+        F_State: '', // 任务状态
+        F_Type: '', // 外呼类型
+        F_Content: '' // 外呼内容
+      },
+      rules: {
+        F_TaskUser: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择任务人'
+          }
+        ],
+        F_State: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择任务状态'
+          }
+        ],
+        F_Name: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: '请输入任务名称'
+          }
+        ],
+        F_Type: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请选择外呼类型'
+          }
+        ]
+      },
+      loading: false
+    }
+  },
+  created() {
+    this.getRoleSelects()
+    this.getListTask()
+  },
+  methods: {
+    submitForm() {
+      // this.$refs.ruleForm.validate((valid) => {
+      //   if (valid) {
+      //     this.ruleForm.F_StartTime = this.ruleForm.F_Time[0]
+      //     this.ruleForm.F_EndTime = this.ruleForm.F_Time[1]
+      //     this.autoDialsList = []
+      //     for (let i = 0; i < this.rowData.length; i++) {
+      //       const data = {
+      //         F_Parentid: '',
+      //         F_CallUser: '',
+      //         F_LastCallid: '',
+      //         F_Tel: '',
+      //         F_ISOutbound: 0
+      //       }
+      //       data.F_Parentid = this.ruleForm.F_ID
+      //       data.F_CallUser = this.rowData[i].UserCode
+      //       data.F_LastCallid = this.rowData[i].Id
+      //       data.F_Tel = this.rowData[i].Caller
+      //       this.autoDialsList.push(data)
+      //     }
+      //     this.loading = true
+      //     const data = {
+      //       F_ID: this.ruleForm.F_ID,
+      //       F_TaskUser: this.ruleForm.F_TaskUser,
+      //       F_Name: this.ruleForm.F_Name,
+      //       F_Remarks: this.ruleForm.F_Remarks,
+      //       F_StartTime: this.ruleForm.F_StartTime,
+      //       F_EndTime: this.ruleForm.F_EndTime,
+      //       F_State: this.ruleForm.F_State,
+      //       F_Type: this.ruleForm.F_Type,
+      //       F_Content: this.ruleForm.F_Content,
+      //       AutoDials: this.autoDialsList
+      //     }
+      //     addOutboundNumberLists(data)
+      //       .then((response) => {
+      //         this.loading = false
+      //         if (response.state.toLowerCase() === 'success') {
+      //           this.$parent.$layer.close(this.layerid)
+      //           this.$parent.getList() // 重新加载父级数据
+      //           this.$message.success('恭喜你，添加成功!')
+      //         }
+      //       })
+      //       .catch(() => {
+      //         this.loading = false
+      //       })
+      //     return
+      //   } else {
+      //     this.$message.error('请输入有效的必填项信息!')
+      //     return false
+      //   }
+      // })
+    },
+    getListTask() {
+      // this.loading = true
+      // return new Promise((resolve) => {
+      //   const params = {
+      //     pageindex: this.pageParams.pageindex, // int 第几页
+      //     pagesize: this.pageParams.pagesize, // int 每页几条信息
+      //     keyword: '' // 关键字
+      //   }
+      //   getTaskLists(params).then((response) => {
+      //     this.loading = false
+      //     if (response.state.toLowerCase() === 'success') {
+      //       this.pageParams.total = response.rows.Totals
+      //       this.taskDataLists = response.rows.Rows
+      //     }
+      //   })
+      //   resolve()
+      // })
+    },
+    radioChangeTask() {
+      if (this.outboundTaskRadio === '1') {
+        this.displayOutboundTask = true
+      } else if (this.outboundTaskRadio === '2') {
+        this.resetForm()
+        this.displayOutboundTask = false
+      }
+    },
+    handleCurrentChangeTask(currentRow, oldCurrentRow) {
+      this.ruleForm.F_ID = currentRow.F_ID // 外呼任务行id
+      this.ruleForm.F_TaskUser = currentRow.F_TaskUser // 任务人
+      this.ruleForm.F_Name = currentRow.F_Name // 任务名称
+      this.ruleForm.F_Remarks = currentRow.F_Remarks // 任务说明
+      this.ruleForm.F_Time.push(currentRow.F_StartTime) // 时间
+      this.ruleForm.F_Time.push(currentRow.F_EndTime) // 时间
+      this.ruleForm.F_State = currentRow.F_State + '' // 任务状态
+      this.ruleForm.F_Type = currentRow.F_Type + '' // 外呼类型
+      this.ruleForm.F_Content = currentRow.F_Content // 外呼内容
+      if (currentRow.F_Type === 2) {
+        this.displayContent = false
+      } else if (currentRow.F_Type === 1) {
+        this.displayContent = true
+      }
+    },
+    handleChangeType(val) {
+      if (val === '2') {
+        this.displayContent = false
+      } else if (val === '1') {
+        this.displayContent = true
+      }
+    },
+    // 获取任务人
+    getRoleSelects() {
+      // getUserAccountLists().then((response) => {
+      //   if (response.state.toLowerCase() === 'success') {
+      //     this.roleOptions = response.data.Rows
+      //   }
+      // })
+    },
+    resetForm() {
+      this.$refs.ruleForm.resetFields()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form {
+  .form_select {
+    width: 100%;
+  }
+  .form_date {
+    width: 100%;
+  }
+}
+</style>

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

@@ -0,0 +1,285 @@
+<template>
+  <div class="app-container">
+    <div class="filter-container">
+      <el-date-picker
+        v-model="searchDate"
+        :picker-options="pickerOptions"
+        class="filter-item"
+        type="daterange"
+        format="yyyy年MM月dd日"
+        value-format="yyyy-MM-dd"
+        align="left"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期" />
+      <el-input v-model="keyword" placeholder="请输入主叫号码" class="filter-item" />
+      <el-select v-model="CallType" class="filter-item" filterable clearable placeholder="请选择呼叫类型">
+        <el-option :value="0" label="呼入" />
+        <el-option :value="1" label="呼出" />
+      </el-select>
+      <el-select v-model="CallState" class="filter-item" filterable clearable placeholder="请选择呼叫状态">
+        <el-option :value="0" label="未接通电话" />
+        <el-option :value="1" label="已接通电话" />
+      </el-select>
+      <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
+    </div>
+    <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="45" />
+      <el-table-column type="index" label="编号" align="center" width="80"/>
+      <el-table-column prop="CallNumber" label="电话号码" align="center" min-width/>
+      <el-table-column label="录音" align="center" min-width>
+        <template slot-scope="scope">
+          <svg-icon v-if="scope.row.FilePath" class="rec_file" icon-class="bofangluyin" @click.native="playSound(scope.row.FilePath, scope.row.UserCode)" />
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="呼叫类型" align="center" min-width>
+        <template slot-scope="scope">{{ scope.row.CallType | calltypeFilter }}</template>
+      </el-table-column>
+      <el-table-column label="呼叫状态" align="center" min-width>
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.CallState === 1 ? 'success' : 'danger'" size="mini" disable-transitions>{{ scope.row.CallState | statusFilter }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="TypeName" label="通话类型" align="center" min-width />
+      <el-table-column label="满意度" align="center" min-width>
+        <template slot-scope="scope">{{ scope.row.MYD | evaluationFilter }}</template>
+      </el-table-column>
+      <el-table-column prop="UserCode" label="坐席工号" align="center" min-width />
+      <el-table-column prop="UserName" label="坐席姓名" align="center" min-width />
+      <el-table-column prop="UseExtNumberrName" label="分机号" align="center" min-width />
+      <el-table-column label="呼叫开始时间" align="center" min-width="110">
+        <template slot-scope="scope">
+          <span>{{ scope.row.BeginTime | timesFilter }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="通话开始时间" align="center" min-width="110">
+        <template slot-scope="scope">
+          <span>{{ scope.row.TalkStartTime | timesFilter }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="通话结束时间" align="center" min-width="110">
+        <template slot-scope="scope">
+          <span>{{ scope.row.TalkEndTime | timesFilter }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="TalkLongTime" label="通话时长" align="center" min-width />
+      <el-table-column prop="RingLongTime" label="振铃时长" align="center" min-width />
+      <el-table-column prop="LongTime" label="总时长" align="center" min-width />
+    </el-table>
+    <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
+  </div>
+</template>
+
+<script>
+import { getCallRecords } from '@/api/trafficData/trafficData'
+import audioPlayer from '@/components/audioPlayer'
+import { pickerOptions } from '@/utils'
+import add from './add'
+import Pagination from '@/components/Pagination' // 对el-pagination 二次封装
+import store from '@/store'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'CallRecord',
+  components: {
+    Pagination
+  },
+  filters: {
+    // 呼叫类型
+    calltypeFilter(status) {
+      const statusMap = {
+        0: '呼入',
+        1: '呼出'
+      }
+      return statusMap[status]
+    },
+    // 呼叫状态
+    statusFilter(status) {
+      const statusMap = {
+        0: '未接通',
+        1: '已接通'
+      }
+      return statusMap[status]
+    },
+    // 外呼类型
+    callopttypeFilter(status) {
+      const statusMap = {
+        0: '拨号外呼',
+        1: '回访外呼'
+      }
+      return statusMap[status]
+    },
+    // 满意度
+    evaluationFilter(status) {
+      const statusMap = {
+        0: '-',
+        1: '非常满意',
+        2: '基本满意',
+        3: '不满意'
+      }
+      return statusMap[status]
+    },
+    // 时间格式化
+    timesFilter(tm) {
+      if (tm === '1970-01-01 08:00:00') {
+        return '-'
+      } else {
+        return tm
+      }
+    },
+    // 是否回访
+    isReturnvisitFilter(status) {
+      const statusMap = {
+        0: '未回访',
+        1: '已回访'
+      }
+      return statusMap[status]
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      keyword: '',
+      roleId: '',
+      CallType: '', // 呼叫类型
+      CallState: '', // 呼叫状态
+      searchDate: '',
+      pickerOptions,
+      recordpath: '', // 录音的路径
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [], // 列表数据
+      multipleSelection: [] // 选中数据
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'token',
+      'usercode', // 工号
+      'extension', // 分机号
+      'telIsVisCallout' // 外呼面板是否显示
+    ])
+  },
+  created() {
+    this.getList()
+    document.onkeyup = (e) => {
+      if (e.keyCode === 13) {
+        this.getList()
+      }
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      return new Promise((resolve) => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // 第几页
+          pagesize: this.pageParams.pagesize, // 每页几条信息
+          CallNumber: this.keyword.replace(/\s*/g, ''), //	否	string	模糊查询（呼叫号码）
+          UserCode: this.roleId, //	否	string	模糊查询（呼叫号码） CallNumber
+          CallType: this.CallType == null ? '' : this.CallType, // 呼叫类型
+          CallState: this.CallState, // 呼叫状态
+          SearchStartTime: this.searchDate && this.searchDate[0],
+          SearchEndTime: this.searchDate && this.searchDate[1]
+        }
+        getCallRecords(params).then((response) => {
+          this.loading = false
+          if (response.state.toLowerCase() === 'success') {
+            // this.recordpath = response.data.recordpath
+            this.pageParams.total = response.total
+            this.dataLists = response.rows
+            console.log(this.dataLists)
+          }
+        })
+        resolve()
+      })
+    },
+    btn_search() {
+      this.getList()
+    },
+    // 播放录音
+    playSound(rec_file, artist) {
+      console.log('artist', artist)
+      this.$layer.iframe({
+        content: {
+          content: audioPlayer, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { recFiles: rec_file, artists: artist.toString() } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+        },
+        area: ['600px', '230px'],
+        shadeClose: true,
+        title: '录音详情'
+      })
+    },
+    handleSelectionChange(selection) {
+      this.multipleSelection = selection
+    },
+    // 添加外呼
+    btn_add_outbound() {
+      this.$layer.iframe({
+        content: {
+          content: add, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowData: this.multipleSelection } // props
+        },
+        area: ['80%', '90%'],
+        title: '添加外呼'
+      })
+    },
+    // 外呼
+    clickCallOut(phoneNumber, id) {
+      this.callOut(phoneNumber, id)
+    },
+    // 外呼
+    callOut(phoneNumber, id) {
+      if (phoneNumber) {
+        // getCallOutprefix(phoneNumber).then((response) => {
+        //   if (response.state.toLowerCase() === 'success') {
+        //     const res = response.data
+        //     this.scoketDatas = {
+        //       Type: 'MakeCall',
+        //       AgentID: this.usercode,
+        //       AgentExten: this.extension,
+        //       Header: res.fix, // 号码前缀 用于截断前缀得到真实号码
+        //       DestinationNumber: res.phone //
+        //     }
+        //     store.dispatch('ChangeCallNum', phoneNumber)
+        //     Send(this.scoketDatas)
+        //     store.dispatch('UpdateCalloutScreen', false) // 关闭外呼面板
+        //     store.dispatch('UpdateOutboundScreen', false) // 关闭外呼弹屏
+        //   }
+        // })
+      } else {
+        this.$message({
+          message: '请先输入电话号码！',
+          type: 'warning'
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.phoneIcon {
+  cursor: pointer;
+}
+.filter-container {
+  .el-select {
+    margin-right: 10px;
+  }
+  .el-date-editor {
+    margin-right: 10px;
+  }
+  .el-cascader {
+    margin-right: 10px;
+  }
+  .filter-item {
+    vertical-align: top;
+  }
+}
+</style>

CallCenterWeb.UI/RMYY/static/config/serverConfig.json

@@ -3,8 +3,6 @@
   "BASE_API": "http://192.168.1.37:8000/",
   "SOCKET_IP": "192.168.8.7",
   "SOCKET_PORT": "8081",
-  "LineChat_SOCKET_IP": "192.168.5.42",
-  "LineChat_SOCKET_PORT": "28300",
   "PAGESIZES": "[10, 20, 50, 100]",
   "PAGESIZE": "10",
   "monitorPlatformTime": "5000",