gd

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

@@ -82,7 +82,7 @@ export function GetDicValue(Flag) {
 // 工单状态
 export function GetTypeState(params) {
   return request({
-    url: '/T_Dis_WorkOrder/GetTypeState',
+    url: 'T_Dis_WorkOrder/GetTypeState',
     method: 'get',
     params
   })
@@ -105,3 +105,11 @@ export function GetFiledState(TableId) {
     }
   })
 }
+// 签入签出
+export function Teljournal(params) {
+  return request({
+    url: 'Home/Teljournal',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/api/equipment/equip.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+// 获取列表数据
+export function GetEquipmentlist(params) {
+  return request({
+    url: 'Equipment/GetList',
+    method: 'get',
+    params
+  })
+}
+export function GetAddEquip(params) {
+  return request({
+    url: 'Equipment/AddEquip',
+    method: 'post',
+    params
+  })
+}
+export function GetEditEquip(params) {
+  return request({
+    url: 'Equipment/EditEquip',
+    method: 'post',
+    params
+  })
+}
+export function GetDelEquips(params) {
+  return request({
+    url: 'Equipment/DelEquips',
+    method: 'get',
+    params
+  })
+}

CallCenterWeb.UI/RMYY/src/api/faultRepairManagement/faultRepair.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 
+// 完工设备下拉框数据
+export function getsbeilist(params) {
+  return request({
+    url: 'Equipment/GetAllList',
+    method: 'get',
+    data: params
+  })
+}
 // 新故障报修
 // 添加工单
 export function getAddRepairbase(params) {

CallCenterWeb.UI/RMYY/src/api/orderManagement/orderList.js

@@ -7,7 +7,14 @@ export function getOrderStateData(params) {
     params
   })
 }
-
+// 投诉来源下拉数据
+export function getTouSuSelect(params) {
+  return request({
+    url: 'Dictionary/GetDicValueList',
+    method: 'get',
+    params
+  })
+}
 // 工单新增
 export function addOrEdittOrder(data) {
   return request({

CallCenterWeb.UI/RMYY/src/api/orderManagement/patientvisit.js

@@ -0,0 +1,31 @@
+import request from '@/utils/request'
+
+export function getGongDanType(params) {
+  return request({
+    url: 'GongDanType/GetList',
+    method: 'get',
+    params
+  })
+}
+export function getGetList(params) {
+  return request({
+    url: 'Con_WorkOrder/GetList',
+    method: 'get',
+    params
+  })
+}
+export function GetOrderDetail(params) {
+  return request({
+    url: 'Con_WorkOrder/GetWorkOrder',
+    method: 'get',
+    params
+  })
+}
+export function GetVisitWorkOrder(params) {
+  return request({
+    url: 'Con_WorkOrder/VisitWorkOrder',
+    method: 'post',
+    params
+  })
+}
+

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -71,12 +71,19 @@
     <!-- 咨询预约处理 -->
     <el-dialog :visible.sync="dialogStatus.dialog_ywzx_chuli" title="预约处理">
       <el-form ref="appointmentForm" :model="appointmentForm" :rules="rules" label-width="100px">
-        <el-form-item label="是否完结" prop="isover">
-          <el-radio-group v-model="appointmentForm.isover">
+        <el-form-item label="是否回访" prop="isvisit">
+          <el-radio-group v-model="appointmentForm.isvisit">
             <el-radio label="0">否</el-radio>
             <el-radio label="1">是</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="沟通情况" prop="communicate">
+          <el-radio-group v-model="appointmentForm.communicate">
+            <el-radio label="0">沟通</el-radio>
+            <el-radio label="1">已沟通未预约</el-radio>
+            <el-radio label="2">已沟通已预约</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="处理结果" prop="cont">
           <el-input :autosize="{ minRows: 4, maxRows: 8}" v-model="appointmentForm.cont" show-word-limit maxlength="100"
             type="textarea" />
@@ -183,7 +190,9 @@
           ReturnReason: ''
         },
         appointmentForm: {
-          isover: '',
+          isover:1,
+          isvisit: '',
+          communicate: '',
           cont: ''
         },
         postEvent: null,
@@ -248,7 +257,7 @@
 
     },
     methods: {
-      butOptionMethod(name, code) {
+      butOptionMethod(name, code,row) {
         this.optionName = name
         this.wocode = code
         if (this.dialogStatus[`dialog_${name}`] === false) {

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

@@ -3,10 +3,14 @@
  * 签入后心跳开始；签出后心跳结束；
  * 增加心跳 false 处理（签出）
  */
-import { Message, MessageBox, Switch } from 'element-ui'
+import {
+  Message,
+  MessageBox,
+  Switch
+} from 'element-ui'
 import store from '@/store'
 import router from '@/router'
-
+import { Teljournal } from '@/api/commonAPI'
 let ws // websocket 实例
 let cls = 0
 let lockReconnect = false // 避免重复连接
@@ -15,7 +19,7 @@ let wsUrl = null
 // const wsUrl = 'ws://' + process.env.SOCKET_IP + ':' + process.env.SOCKET_PORT
 // 创建scoket连接
 export function createWebSocket() {
-  wsUrl = 'ws://' + store.getters.serverConfig.SOCKET_IP + ':' + store.getters.serverConfig.SOCKET_PORT// 请求地址
+  wsUrl = 'ws://' + store.getters.serverConfig.SOCKET_IP + ':' + store.getters.serverConfig.SOCKET_PORT // 请求地址
   try {
     if ('WebSocket' in window) {
       ws = new WebSocket(wsUrl) // 创建一个websocket实例
@@ -55,7 +59,8 @@ function init() {
     // 如果获取到消息，心跳检测重置
     // 拿到任何消息都说明当前连接是正常的
     // heartCheck.reset().start()
-    console.log('%c' + new Date() + '%c receive%c telWebsocket %ctype:' + JSON.parse(evt.data)[0].Type + '%c ' + evt.data, 'color: #111', 'color: #67C23A', 'color: #111', 'color: #67C23A', 'color: #111')
+    console.log('%c' + new Date() + '%c receive%c telWebsocket %ctype:' + JSON.parse(evt.data)[0].Type + '%c ' + evt
+      .data, 'color: #111', 'color: #67C23A', 'color: #111', 'color: #67C23A', 'color: #111')
     dealMsg(JSON.parse(evt.data)[0])
     // 修改 store 中telwebsocket的数据
     const telWSData = JSON.parse(evt.data)
@@ -111,8 +116,8 @@ function init() {
 }
 
 /**
-  * 重新连接
-  */
+ * 重新连接
+ */
 function reconnect() {
   if (lockReconnect) return
   lockReconnect = true
@@ -131,15 +136,16 @@ function reconnect() {
 }
 
 /**
-  * 发送
-  * @ socketDatas 发送的数据 type {}
-  */
+ * 发送
+ * @ socketDatas 发送的数据 type {}
+ */
 export function Send(scoketDatas) {
   if (ws.readyState !== ws.OPEN) {
     reconnect()
   }
   if (ws.readyState === ws.OPEN) {
-    console.log('%c' + new Date() + '%c  send %c telWebsocket  ' + JSON.stringify(scoketDatas), 'color: #111', 'color: #409EFF', 'color: #111')
+    console.log('%c' + new Date() + '%c  send %c telWebsocket  ' + JSON.stringify(scoketDatas), 'color: #111',
+      'color: #409EFF', 'color: #111')
     ws.send(JSON.stringify(scoketDatas))
     scoketDatas.operationType = '发送'
     // 修改 store 中telwebsocket的数据
@@ -209,9 +215,9 @@ function signIn() {
   Send(scoketDatas)
 }
 /**
-  * 处理接收的消息
-  * @ msgData 接收的数据 type {}
-  */
+ * 处理接收的消息
+ * @ msgData 接收的数据 type {}
+ */
 function dealMsg(msgData) {
   if (msgData) {
     const rlt = msgData.Result
@@ -264,7 +270,8 @@ function dealMsg(msgData) {
       // const errCode = msgData.Error % 10000
       Message({
         dangerouslyUseHTMLString: true,
-        message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' + msgData.Type + '</div>',
+        message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
+          msgData.Type + '</div>',
         offset: 400,
         center: true,
         type: 'error',
@@ -281,7 +288,8 @@ function dealMsg(msgData) {
         // Message.error(`${rlt} !`)
         Message({
           dangerouslyUseHTMLString: true,
-          message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' + rlt + '</div>',
+          message: '<div style="font-size:42px;font-weight: 700;text-align: center; width:80%;margin: 0 auto;">' +
+            rlt + '</div>',
           offset: 400,
           center: true,
           type: 'error',
@@ -291,6 +299,7 @@ function dealMsg(msgData) {
     }
   }
 }
+
 function updateSeatMonitorlists(msgData) {
   store.dispatch('ChangeMonitor', true) // 修改监听操作的返回值
   store.dispatch('ChangeMonitorstate', msgData.State) // 监控状态
@@ -335,6 +344,8 @@ function LogoutBack(reState) {
   // 重置初始化状态
   resetInitState()
   window.sessionStorage.setItem('storageSeatState', 0)
+  getOperatonTime('2')
+  console.log('签出2')
 }
 
 // 重置初始化状态
@@ -348,25 +359,29 @@ function resetInitState() {
 }
 
 /**
-  * 置忙 置闲
-  * sayOption (点击置忙置闲后的返回值)
-  * */
+ * 置忙 置闲
+ * sayOption (点击置忙置闲后的返回值)
+ * */
 function SetState(sayOption) {
   if (sayOption.State === 5) {
     store.dispatch('ChangeSeatState', 5)
     window.sessionStorage.setItem('storageSeatState', 5)
     store.dispatch('ChangeTopRightState', ['忙碌', false])
+    getOperatonTime('3')
+    console.log('置忙3')
   } else if (sayOption.State === 2) {
     store.dispatch('ChangeSeatState', 2)
     window.sessionStorage.setItem('storageSeatState', 2)
     store.dispatch('ChangeTopRightState', ['空闲', true])
+    getOperatonTime('4')
+    console.log('置闲4')
   }
 }
 
 /**
-  * 置忙
-  * sayOption (点击置忙置闲后的返回值)
-  * */
+ * 置忙
+ * sayOption (点击置忙置闲后的返回值)
+ * */
 function SayBusyBack(sayOption) {
   store.dispatch('ChangeSeatState', 5)
   if (sayOption.Type === 'SayBusy') {
@@ -374,9 +389,9 @@ function SayBusyBack(sayOption) {
   }
 }
 /**
-  * 置闲
-  * sayOption (点击置忙置闲后的返回值)
-  * */
+ * 置闲
+ * sayOption (点击置忙置闲后的返回值)
+ * */
 function SayFreeBack(sayOption) {
   store.dispatch('ChangeSeatState', 2)
   if (sayOption.Type === 'SayFree') {
@@ -448,7 +463,15 @@ function IncomingBack(inComingData) {
     // console.log(inComingNumber)
   }
   window.localStorage.setItem('callidSave', inComingData.CallID) // 用户的坐席组code
-  router.push({ name: 'CallScreen', path: '/callScreen', fullPath: '/callScreen', params: { callid: inComingCallId, telInNumber: inComingNumber }})
+  router.push({
+    name: 'CallScreen',
+    path: '/callScreen',
+    fullPath: '/callScreen',
+    params: {
+      callid: inComingCallId,
+      telInNumber: inComingNumber
+    }
+  })
   store.dispatch('ChangeCallNum', inComingNumber)
 }
 
@@ -480,10 +503,10 @@ function MakeCallBack(callBackData) {
 }
 
 // 多方通话
-function MeetingBack() { }
+function MeetingBack() {}
 
 // 录音返回
-function RecordPathBack() { }
+function RecordPathBack() {}
 
 // 保持
 function HoldBack(holdData) {
@@ -510,3 +533,14 @@ function getAgentList(data) {
   store.dispatch('GetOnlineSeatList', data.AgentList) // 监控坐席
 }
 
+function getOperatonTime(state) {
+  const params = {
+    state: state,
+    token: localStorage.getItem('Admin-Token').split(' ')[1]
+  }
+  Teljournal(params)
+    .then((response) => {
+
+    })
+    .catch((result) => {})
+}

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

@@ -8,7 +8,7 @@
       </el-col>
       <!--业务咨询工单 -->
       <el-col v-if="orderTypeData.F_Type1===1000" :span="22">
-        <add-or-edit-inf-order :wid='wid' :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
+        <add-or-edit-inf-order :iswomanage='iswomanage' :wid='wid' :callid='callid' :order-type-data="orderTypeData" :person-parms-data="personParmsData"/>
       </el-col>
       <!-- 综合调度 -->
       <el-col v-if="orderTypeData.F_Type1===2000" :span="22">

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/addOrEdit.vue

@@ -0,0 +1,131 @@
+<template>
+  <div>
+    <el-form ref="ruleForm" :rules="rules" :model="ruleForm" label-width="80px">
+      <el-form-item label="设备名称" prop="equipname">
+        <el-input v-model="ruleForm.equipname" type="text" placeholder="请输入设备名称" />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="equipnumber">
+        <el-input v-model="ruleForm.equipnumber" type="text" placeholder="请输入规格型号" />
+      </el-form-item>
+      <el-form-item label="设备价格" prop="equipprice">
+        <el-input v-model="ruleForm.equipprice" type="text" placeholder="请输入设备价格" />
+      </el-form-item>
+      <el-form-item label="是否有效">
+        <el-switch v-model="ruleForm.state" active-color="#13ce66" inactive-color="#ff4949" active-value="1"
+          inactive-value="0">
+        </el-switch>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm()">提交</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+  import {
+    AuditOrder
+  } from '@/api/orderManagement/orderList'
+  import {
+    GetAddEquip,
+    GetEditEquip
+  } from '@/api/equipment/equip'
+  export default {
+    name: 'AddOrEdit',
+    props: {
+      rowid: {
+        type: Number,
+        default: 0
+      },
+      layerid: {
+        type: String,
+        default: ''
+      },
+      rowdata: {
+        type: Object,
+        default () {
+          return {}
+        }
+      }
+    },
+    data() {
+      return {
+        ruleForm: {
+          equipname: '',
+          equipnumber: '',
+          equipprice: '',
+          state: '1'
+        },
+        rules: {
+          equipname: [{
+            required: true,
+            message: '请输入设备名称',
+            trigger: 'blur'
+          }],
+          equipnumber: [{
+            required: true,
+            message: '请输入设备型号',
+            trigger: 'blur'
+          }],
+          equipprice: [{
+            required: true,
+            message: '请输入设备价格',
+            trigger: 'blur'
+          }]
+        }
+      }
+    },
+    created() {
+      if (JSON.stringify(this.rowdata) != "{}") {
+        this.ruleForm.equipname = this.rowdata.F_EquipName
+        this.ruleForm.equipnumber = this.rowdata.F_EquipNumber
+        this.ruleForm.equipprice = this.rowdata.F_EquipPrice
+        this.ruleForm.state = this.rowdata.F_State.toString()
+        this.ruleForm.equipid = this.rowdata.F_EquipID
+      }
+    },
+    methods: {
+      submitForm() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            // 添加
+            if (JSON.stringify(this.rowdata) === "{}") {
+              GetAddEquip(this.ruleForm)
+                .then((response) => {
+                  if (response.state.toLowerCase() === 'success') {
+                    this.$parent.$layer.close(this.layerid)
+                    this.$parent.getList() // 重新加载父级数据
+                    this.$message.success('添加成功!')
+                  }
+                })
+                .catch(() => {
+                  this.loading = false
+                })
+              return
+            } else {
+              GetEditEquip(this.ruleForm)
+                .then((response) => {
+                  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
+          }
+        })
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .form_select {
+    width: 100%;
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20" />
+    <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
+      <el-form-item label="设备名称：">
+        <el-input v-model="ruleForm.sbmc" placeholder="请输入设备名称" size="medium" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
+        <el-button type="primary" size="medium" @click="btn_add">添加</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="dataLists" border highlight-current-row stripe>
+      <el-table-column type="index" label="序号" align="center" width="100">
+      </el-table-column>
+      <el-table-column prop="F_EquipName" label="设备名称" align="center" min-width />
+      <el-table-column prop="F_EquipNumber" label="规格型号" align="center" min-width />
+      <el-table-column prop="F_EquipPrice" label="价格(元)" align="center" min-width />
+      <el-table-column label="状态" align="center" min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.F_State==1">有效</span>
+          <span v-if="scope.row.F_State==0">无效</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_CreateUser" label="添加人" align="center" min-width />
+      <el-table-column prop="F_CreateTime" label="添加时间" align="center" min-width />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">删除</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="getList" />
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import AddOrEdit from './addOrEdit'
+  import {
+    GetEquipmentlist,
+    GetDelEquips
+  } from '@/api/equipment/equip'
+  import {
+    exportExcel
+  } from '@/utils'
+  export default {
+    name: 'EquipmentManage',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        dataLists: [],
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        ruleForm: {
+          sbmc: ''
+        },
+      }
+    },
+    computed: {},
+    created() {
+      this.getNowTime()
+      this.getList()
+    },
+    mounted() {},
+    methods: {
+      // 搜索
+      btn_search_task() {
+        this.getList()
+      },
+      getList() {
+        const params = {
+          PageIndex:this.pageParams.pageindex,
+          PageSize:this.pageParams.pagesize,
+          equipmentname: this.ruleForm.sbmc
+        }
+        return new Promise(resolve => {
+          GetEquipmentlist(params).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.dataLists = response.data
+            }
+          })
+          resolve()
+        })
+      },
+      btn_add() {
+        this.$layer.iframe({
+          content: {
+            content: AddOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+
+            } // props
+          },
+          area: ['40%', '50%'],
+          title: '添加设备'
+        })
+      },
+      handleEdit(row) {
+        this.$layer.iframe({
+          content: {
+            content: AddOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowdata:row
+            } // props
+          },
+          area: ['40%', '50%'],
+          title: '编辑设备'
+        })
+      },
+      handleDelete(row) {
+        this.$confirm('确定要删除此设备吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            const params = {
+              ids : row.F_EquipID
+            }
+            GetDelEquips(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.$message.success('删除成功!')
+                this.getList()
+              }
+            })
+          })
+          .catch(() => {
+            this.$message('已取消删除')
+          })
+      },
+      btn_export() {
+        const exporParams = {
+          stime: this.ruleForm.startTime && this.ruleForm.startTime[0],
+          endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
+          groupby: this.ruleForm.way,
+          isdc: 1
+        }
+        exportExcel(exporParams, getListExpt)
+      },
+      formtTime(val) {
+        if (!val) {
+          return '0秒'
+        }
+        var secondTime = parseInt(val);
+        var minuteTime = 0;
+        var hourTime = 0;
+        if (secondTime > 60) {
+          minuteTime = parseInt(secondTime / 60);
+          secondTime = parseInt(secondTime % 60);
+          if (minuteTime > 60) {
+            hourTime = parseInt(minuteTime / 60);
+            minuteTime = parseInt(minuteTime % 60);
+          }
+        }
+        var result = "" + parseInt(secondTime) + "秒";
+        if (minuteTime > 0) {
+          result = "" + parseInt(minuteTime) + "分" + result;
+        }
+        if (hourTime > 0) {
+          result = "" + parseInt(hourTime) + "小时" + result;
+        }
+        return result;
+      },
+      getNowTime() {
+        var now = new Date();
+        var year = now.getFullYear(); //得到年份
+        var month = now.getMonth(); //得到月份
+        var date = now.getDate(); //得到日期
+        month = month + 1;
+        month = month.toString().padStart(2, "0");
+        date = date.toString().padStart(2, "0");
+        var defaultDate = `${year}-${month}-${date}`;
+        // this.ruleForm.startTime=[defaultDate,defaultDate]
+        this.$set(this.ruleForm, "startTime", [defaultDate, defaultDate]);
+      },
+      btn_way() {
+        this.getList()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/.el-tabs__item {
+    width: 185px !important;
+    text-align: center;
+    font-size: 16px !important;
+    font-weight: 600;
+  }
+
+  .el-popper[x-placement^='bottom'] {
+    z-index: 10px !important;
+  }
+
+  .operation div {
+    font-size: 14px;
+    color: #222;
+    padding: 5px 0;
+    cursor: pointer;
+  }
+
+  .el-icon-s-tools {
+    font-size: 18px !important;
+    vertical-align: middle;
+  }
+
+  .el-popover {
+    min-width: 75px;
+    text-align: center;
+  }
+
+  .el-table .cell {
+    position: relative;
+  }
+
+  .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;
+  }
+
+  .app-container {
+    padding: 10px;
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/faultRepair/clinicalReporting/components/addRepairbase.vue

@@ -119,13 +119,13 @@
         type: String,
         default: ''
       },
-      callid:{
-        type:String,
-        default:''
+      callid: {
+        type: String,
+        default: ''
       },
-      iswomanage:{
-        type:String,
-        default:''
+      iswomanage: {
+        type: String,
+        default: ''
       }
     },
     data() {
@@ -208,6 +208,10 @@
       if (this.wid) {
         this.getWoDetail(this.wid, '0')
       }
+      if (this.iswomanage == 1) {
+        this.ruleForm.assignDepart = ''
+        this.ruleForm.assignMant = ''
+      }
     },
     methods: {
       // 部门
@@ -302,7 +306,7 @@
         this.ruleForm.repairImageid += res.data[0].F_FileId + ','
       },
       submitForm(formName) {
-        console.log(this.callid,'callid')
+        console.log(this.callid, 'callid')
         console.log(this.ruleForm.repairDeptid)
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -345,8 +349,8 @@
                 if (this.wid == '') {
                   console.log('tj')
                   const params = {
-                    LeaveRecordId:this.fid,
-                    CallId:this.callid,
+                    LeaveRecordId: this.fid,
+                    CallId: this.callid,
                     Applicant: this.ruleForm.repairmanid, // 申请人
                     ApplicationDept: this.ruleForm.repairDeptid, // 申请部门
                     Applicantsphone: this.ruleForm.repairmanphone, // 申请电话

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/finish.vue

@@ -0,0 +1,193 @@
+<template>
+  <div>
+    <el-form ref="doneForm" :model="doneForm" label-width="100px">
+      <el-form-item label="完成情况" prop="type">
+        <el-radio-group v-model="doneForm.type">
+          <el-radio label="0">正常完成</el-radio>
+          <el-radio label="1">异常完成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="doneForm.type == '1'" label="异常原因">
+        <el-select v-model="doneForm.ExceptionType" placeholder="请选择异常原因" size="medium" clearable>
+          <el-option v-for="(item, index) in unusualArr" :key="index" :value="item.F_DictionaryValueId"
+            :label="item.F_Name" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="doneForm.type == '0'" label="是否涉及设备">
+        <el-radio-group v-model="doneForm.IsInvolvedEquip" style="margin-right: 15px">
+          <el-radio label="0">否</el-radio>
+          <el-radio label="1">是</el-radio>
+        </el-radio-group>
+        <el-select v-if="doneForm.IsInvolvedEquip == '1'" v-model="equilist" placeholder="请选择设备" size="medium" multiple
+          clearable style="width: 80%;" @change="equiChange">
+          <el-option v-for="(item, index) in equiArr" :key="index" :label="item.F_Name+'('+item.F_Describe+')'"
+            :value="item.F_DictionaryValueId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
+        <el-table :data="equipmodellist" border stripe style="width: 100%">
+          <el-table-column prop="F_EquipName" label="设备" width="180" />
+          <el-table-column prop="F_EquipNumber" label="规格型号" width="180" />
+          <el-table-column prop="F_EquipAmount" label="数量" width="180">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.F_EquipAmount" type="number" placeholder="请输入数量" size="small" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="F_EquipPrice" label="价格" width="180">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.F_EquipPrice" type="number" placeholder="请输入价格" size="small" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+      <el-form-item label="完成说明" prop="result">
+        <el-input v-model="doneForm.result" :autosize="{ minRows: 4, maxRows: 8 }" show-word-limit maxlength="100"
+          type="textarea" placeholder="请输入完成说明" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="postDoneOrder">确 定</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import {
+    GetPerson
+  } from '@/api/commonAPI'
+  import {
+    GetFiledState,
+    AddFiled
+  } from '@/api/commonAPI'
+  import fieldDATA from '@/utils/fieldsData.js'
+  import selectOrderTypeTwo from '@/components/context/commonSelect/selectOrderTypeTwo.vue'
+  import addDefinedList from '@/components/context/addDefinedList'
+  import {
+    getMaintenancerList,
+    postTaskOrders,
+    postBackWorkOrder,
+    postAssistWorkOrder,
+    postTransfer,
+    postDealWorkOrder,
+    postHangUpWorkOrder,
+    postArriveWorkOrder,
+    getDicValueList
+  } from '@/api/faultRepairManagement/faultRepair'
+  import detail from '../../orderManage/components/orderDetail.vue'
+  export default {
+    name: 'Finish',
+    components: {
+      Pagination,
+      selectOrderTypeTwo
+    },
+    data() {
+      return {
+        equiArr: [], // 设备
+        unusualArr: [], // 异常原因
+        equilist: [], // 设备id
+        checkLabel: [], // 设备名称
+        checkLabelxh: [], //设备型号
+        doneForm: {
+          workordercode: '',
+          type: '0',
+          IsInvolvedEquip: '',
+          equipmodellist: [],
+          ExceptionType: '',
+          result: ''
+        },
+        equiTable: [],
+        equipmodellist: [],
+      }
+    },
+    created() {
+      this.getycValueList()
+      this.getsbValueList()
+    },
+    methods: {
+      equiChange(val) {
+        this.equiTable = []
+        this.checkLabel = []
+        this.checkLabelxh = []
+        this.equipmodellist = []
+        for (var i = 0; i < val.length; i++) {
+          this.equiArr.find((item) => {
+            if (item.F_DictionaryValueId == val[i]) {
+              this.checkLabel.push(item.F_Name)
+              this.checkLabelxh.push(item.F_Describe)
+            }
+          })
+        }
+        console.log(this.checkLabelxh)
+        for (var a = 0; a < this.equilist.length; a++) {
+          for (var b = 0; b < this.checkLabel.length; b++) {
+            for (var c = 0; c < this.checkLabelxh.length; c++) {
+              this.equiTable.push({
+                F_DicId: this.equilist[b],
+                F_EquipName: this.checkLabel[b],
+                F_EquipNumber: this.checkLabelxh[b],
+                F_EquipAmount: '',
+                F_EquipPrice: ''
+              })
+            }
+          }
+        }
+        let temp = {}
+        this.equiTable.map((item, index) => {
+          if (!temp[item.F_DicId]) {
+            this.equipmodellist.push(item)
+            temp[item.F_DicId] = true
+          }
+        })
+        console.log(this.equipmodellist)
+      },
+      getycValueList() {
+        const params = {
+          Flag: 'YCLX',
+          Name: ''
+        }
+        getDicValueList(params).then((res) => {
+          this.unusualArr = res.rows
+        })
+      },
+      getsbValueList() {
+        const params = {
+          Flag: 'SJSB',
+          Name: ''
+        }
+        getDicValueList(params).then((res) => {
+          this.equiArr = res.rows
+        })
+      },
+      postDoneOrder() {
+        // console.log(this.equipmodellist)
+        if (this.doneForm.equipmodellist) {
+          this.doneForm.equipmodellist = this.equipmodellist
+        }
+        new Promise((resolve) => {
+          const params = this.doneForm
+          postDealWorkOrder(params).then((response) => {
+            if (response.state === 'success') {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+              this.dialogDone = false
+              this.equipmodellist = []
+              this.getListTask()
+            } else {
+              this.$message({
+                type: 'info',
+                message: response.message
+              })
+            }
+          })
+          resolve()
+        })
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

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

@@ -25,7 +25,8 @@
           <span v-show="telIsLogin && telLineState === 10" key="15">保持中</span>
           <svg-icon v-show="telIsLogin" icon-class="xinhao" />
         </p>
-        <p v-show="(telSeatState === 2 && telLineState < 6) || (telSeatState === 5 && telLineState < 6)" class="call_time">--:--:--</p>
+        <p v-show="(telSeatState === 2 && telLineState < 6) || (telSeatState === 5 && telLineState < 6)"
+          class="call_time">--:--:--</p>
         <p v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" class="call_time">
           <span v-show="Number(telCallTime.hh) === 0">{{ telCallTime.hh }}</span>
           <span v-show="Number(telCallTime.hh) > 0 && Number(telCallTime.hh) < 10">
@@ -45,431 +46,470 @@
     </div>
     <div v-show="telIsLogin" class="call_middle">
       <el-input :class="{ no_write: true }" :readonly="true" v-model="telCallNum" size="small" placeholder />
-      <i v-show="(telSeatState === 2 && telLineState === 1) || (telSeatState === 5 && telLineState === 1)" slot="reference" class="dialicon" @click="makeCall" />
-      <el-popover :value="telIsVisCallout" :disabled="false" trigger="manual" popper-class="dial_popover" placement="bottom-start" width="300" transition="fade-in-linear" @after-leave="afterLeave">
+      <i v-show="(telSeatState === 2 && telLineState === 1) || (telSeatState === 5 && telLineState === 1)"
+        slot="reference" class="dialicon" @click="makeCall" />
+      <el-popover :value="telIsVisCallout" :disabled="false" trigger="manual" popper-class="dial_popover"
+        placement="bottom-start" width="300" transition="fade-in-linear" @after-leave="afterLeave">
         <Dialplate />
       </el-popover>
     </div>
     <div class="call_right">
       <transition-group type="transition" name="fade-list">
         <button v-waves v-show="!telIsLogin" key="27" type="button" class="start_btn" @click="signIn">开始工作</button>
-        <button v-waves v-show="telIsLogin && telSeatState === 2 && telLineState === 1" key="17" type="button" class="call_btn" @click="setBusy">置忙</button>
-        <button v-waves v-show="telIsLogin && telSeatState === 5 && telLineState === 1" key="18" type="button" class="call_btn" @click="setFree">置闲</button>
-        <button v-waves v-show="telIsLogin && (telSeatState === 2 || telSeatState === 5) && telLineState === 1" key="19" type="button" class="call_btn" @click="signOut">签出</button>
-        <button v-waves v-show="telIsLogin && telLineState === 6" key="20" type="button" class="call_btn yellow_bg" @click="holdBack">保持通话</button>
-        <button v-waves v-show="telIsLogin && telLineState === 10" key="21" type="button" class="call_btn green_bg" @click="retrieveBack">接回通话</button>
-        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="24" type="button" class="call_btn" @click="transferCall">转接</button>
-        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="25" type="button" class="call_btn" @click="meetingCall">多方通话</button>
-        <button v-waves v-show="telIsLogin && telLineState > 5" key="22" type="button" class="call_btn" @click="btn_IVR">转IVR</button>
-        <button v-waves v-show="telIsLogin && telLineState > 5" key="23" type="button" class="call_btn red_bg" @click="dropCall">挂断</button>
+        <button v-waves v-show="telIsLogin && telSeatState === 2 && telLineState === 1" key="17" type="button"
+          class="call_btn" @click="setBusy">置忙</button>
+        <button v-waves v-show="telIsLogin && telSeatState === 5 && telLineState === 1" key="18" type="button"
+          class="call_btn" @click="setFree">置闲</button>
+        <button v-waves v-show="telIsLogin && (telSeatState === 2 || telSeatState === 5) && telLineState === 1" key="19"
+          type="button" class="call_btn" @click="signOut">签出</button>
+        <button v-waves v-show="telIsLogin && telLineState === 6" key="20" type="button" class="call_btn yellow_bg"
+          @click="holdBack">保持通话</button>
+        <button v-waves v-show="telIsLogin && telLineState === 10" key="21" type="button" class="call_btn green_bg"
+          @click="retrieveBack">接回通话</button>
+        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="24" type="button"
+          class="call_btn" @click="transferCall">转接</button>
+        <button v-waves v-show="telIsLogin && (telLineState === 6 || telLineState === 10)" key="25" type="button"
+          class="call_btn" @click="meetingCall">多方通话</button>
+        <button v-waves v-show="telIsLogin && telLineState > 5" key="22" type="button" class="call_btn"
+          @click="btn_IVR">转IVR</button>
+        <button v-waves v-show="telIsLogin && telLineState > 5" key="23" type="button" class="call_btn red_bg"
+          @click="dropCall">挂断</button>
       </transition-group>
     </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import store from '@/store'
-import { Send } from '@/utils/telWebsocket'
-import Dialplate from '@/components/context/Dialplate'
-export default {
-  name: 'Teloperation',
-  components: {
-    Dialplate
-  },
-  data() {
-    return {
-      scoketDatas: {}, // 发送的数据
-      telNumber: '',
-      telTimer: null // 时间定时器
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'usercode', // 工号
-      'extension', // 分机号
-      'groupcode', // 坐席组code
-      'telIsLogin', // 是否签入
-      'telSeatState', // 坐席状态
-      'telLineState', // 线路状态
-      'telCallNum', // 电话号码
-      'telIsVisCallout', // 外呼操作面板是否显示
-      'telCallTime', // 通话时间
-      'telMessageData' // telwebsocket 接收的数据
-    ])
-  },
-  watch: {
-    // 如果 `telLineState` 发生改变，这个函数就会运行
-    telLineState: function(newT, oldT) {
-      this.watchTelLineState(newT, oldT)
-    }
-  },
-  methods: {
-    // 签入
-    signIn() {
-      if (!this.extension) {
-        this.$confirm('如果您想进行话务操作，请重新登录并且输入分机号, 是否重新登录？', '提示', {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          type: 'warning'
-        })
-          .then(() => {
-            this.$store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
-            })
-          })
-          .catch(() => {})
-        return
-      }
-      this.scoketDatas = {
-        Type: 'Login',
-        AgentID: this.usercode,
-        AgentExten: this.extension,
-        AgentGroup: window.localStorage.getItem('groupCode'), // 坐席组id window.localStorage.getItem('groupCode')
-        AgentType: '0',
-        DisposeTime: '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
-      }
-      Send(this.scoketDatas)
+  import {
+    mapGetters
+  } from 'vuex'
+  import store from '@/store'
+  import {
+    Send
+  } from '@/utils/telWebsocket'
+  import {
+    Teljournal
+  } from '@/api/commonAPI'
+  import Dialplate from '@/components/context/Dialplate'
+  export default {
+    name: 'Teloperation',
+    components: {
+      Dialplate
     },
-    // 签出
-    signOut() {
-      this.scoketDatas = {
-        Type: 'Logout',
-        AgentID: this.usercode,
-        AgentExten: this.extension
+    data() {
+      return {
+        scoketDatas: {}, // 发送的数据
+        telNumber: '',
+        telTimer: null // 时间定时器
       }
-      Send(this.scoketDatas)
-      store.dispatch('UpdateCalloutScreen', false)
     },
-    // 置忙
-    setBusy() {
-      this.scoketDatas = {
-        Type: 'SayBusy',
-        AgentID: this.usercode,
-        AgentExten: this.extension
-      }
-      Send(this.scoketDatas)
+    computed: {
+      ...mapGetters([
+        'usercode', // 工号
+        'extension', // 分机号
+        'groupcode', // 坐席组code
+        'telIsLogin', // 是否签入
+        'telSeatState', // 坐席状态
+        'telLineState', // 线路状态
+        'telCallNum', // 电话号码
+        'telIsVisCallout', // 外呼操作面板是否显示
+        'telCallTime', // 通话时间
+        'telMessageData' // telwebsocket 接收的数据
+      ])
     },
-    // 置闲
-    setFree() {
-      this.scoketDatas = {
-        Type: 'SayFree',
-        AgentID: this.usercode,
-        AgentExten: this.extension
+    watch: {
+      // 如果 `telLineState` 发生改变，这个函数就会运行
+      telLineState: function(newT, oldT) {
+        this.watchTelLineState(newT, oldT)
       }
-      Send(this.scoketDatas)
-    },
-    // 转IVR
-    btn_IVR() {
-      this.scoketDatas = {
-        Type: 'TurnIvr',
-        AgentID: this.usercode,
-        AgentExten: this.extension,
-        IvrName: 'MYD_ZXZ',
-        IvrPos: '1'
-      }
-      Send(this.scoketDatas)
-    },
-    // 挂断
-    dropCall() {
-      this.scoketDatas = {
-        Type: 'DropCall',
-        AgentID: this.usercode,
-        AgentExten: this.extension
-      }
-      Send(this.scoketDatas)
-      store.dispatch('UpdateCalloutScreen', false)
-    },
-    // 保持通话
-    holdBack() {
-      this.scoketDatas = {
-        Type: 'Hold',
-        AgentID: this.usercode,
-        AgentExten: this.extension
-      }
-      Send(this.scoketDatas)
-    },
-    // 接回通话
-    retrieveBack() {
-      this.scoketDatas = {
-        Type: 'Retrieve',
-        AgentID: this.usercode,
-        AgentExten: this.extension
-      }
-      Send(this.scoketDatas)
-    },
-    // 外呼
-    makeCall() {
-      store.dispatch('ChangeCallType', 'MakeCall')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
     },
-    // 转接
-    transferCall() {
-      store.dispatch('ChangeCallType', 'Transfer')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
-    },
-    // 多方通话
-    meetingCall() {
-      store.dispatch('ChangeCallType', 'Meeting')
-      store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
-    },
-    // 外呼操作面板 关闭后
-    afterLeave() {
-      store.dispatch('ChangeCallType', 'MakeCall')
-    },
-    // 通话时间
-    callTime() {
-      // 通话时间重置为00:00:00
-      store.dispatch('UpdateCallTime', {
-        hh: '00',
-        mm: '00',
-        ss: '00'
-      })
-      // 时间 计时
-      let _n = 0
-      if (this.telTimer) {
-        clearInterval(this.telTimer)
-      }
-      this.telTimer = setInterval(() => {
-        _n++
-
+    methods: {
+      // 签入
+      signIn() {
+        this.getOperatonTime('1')
+        console.log('签入1')
+        if (!this.extension) {
+          this.$confirm('如果您想进行话务操作，请重新登录并且输入分机号, 是否重新登录？', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            })
+            .then(() => {
+              this.$store.dispatch('FedLogOut').then(() => {
+                location.reload() // 为了重新实例化vue-router对象 避免bug
+              })
+            })
+            .catch(() => {})
+          return
+        }
+        this.scoketDatas = {
+          Type: 'Login',
+          AgentID: this.usercode,
+          AgentExten: this.extension,
+          AgentGroup: window.localStorage.getItem('groupCode'), // 坐席组id window.localStorage.getItem('groupCode')
+          AgentType: '0',
+          DisposeTime: '0' // 话后处理时长设置，0代表一致话后处理，除非发送置闲 （按照历史习惯，字符串形式）
+        }
+        Send(this.scoketDatas)
+      },
+      // 签出
+      signOut() {
+        this.scoketDatas = {
+          Type: 'Logout',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+        store.dispatch('UpdateCalloutScreen', false)
+      },
+      // 置忙
+      setBusy() {
+        this.scoketDatas = {
+          Type: 'SayBusy',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+      },
+      // 置闲
+      setFree() {
+        this.scoketDatas = {
+          Type: 'SayFree',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+      },
+      // 转IVR
+      btn_IVR() {
+        this.scoketDatas = {
+          Type: 'TurnIvr',
+          AgentID: this.usercode,
+          AgentExten: this.extension,
+          IvrName: 'MYD_ZXZ',
+          IvrPos: '1'
+        }
+        Send(this.scoketDatas)
+      },
+      // 挂断
+      dropCall() {
+        this.scoketDatas = {
+          Type: 'DropCall',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+        store.dispatch('UpdateCalloutScreen', false)
+      },
+      // 保持通话
+      holdBack() {
+        this.scoketDatas = {
+          Type: 'Hold',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+      },
+      // 接回通话
+      retrieveBack() {
+        this.scoketDatas = {
+          Type: 'Retrieve',
+          AgentID: this.usercode,
+          AgentExten: this.extension
+        }
+        Send(this.scoketDatas)
+      },
+      // 外呼
+      makeCall() {
+        store.dispatch('ChangeCallType', 'MakeCall')
+        store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+      },
+      // 转接
+      transferCall() {
+        store.dispatch('ChangeCallType', 'Transfer')
+        store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+      },
+      // 多方通话
+      meetingCall() {
+        store.dispatch('ChangeCallType', 'Meeting')
+        store.dispatch('UpdateCalloutScreen', !this.telIsVisCallout)
+      },
+      // 外呼操作面板 关闭后
+      afterLeave() {
+        store.dispatch('ChangeCallType', 'MakeCall')
+      },
+      // 通话时间
+      callTime() {
+        // 通话时间重置为00:00:00
         store.dispatch('UpdateCallTime', {
-          hh: this.toDub(parseInt((_n / 60 / 60) % 60)), // 小时
-          mm: this.toDub(parseInt((_n / 60) % 60)), // 分钟
-          ss: this.toDub(parseInt(_n % 60)) // 秒
+          hh: '00',
+          mm: '00',
+          ss: '00'
         })
-      }, 1000)
-    },
-    // 清除定时器
-    clearInter() {
-      clearInterval(this.telTimer)
-    },
-    // 小于10补0
-    toDub(i) {
-      return i < 10 ? '0' + i : '' + i
-    },
-    // 监听 线路状态
-    watchTelLineState(newT, oldT) {
-      // 外呼
-      if (newT === 6 && oldT === 4) {
-        this.callTime()
-      }
-      // 来电
-      if (newT === 6 && oldT === 5) {
-        this.callTime()
-      }
-      if (newT === 1) {
+        // 时间 计时
+        let _n = 0
         if (this.telTimer) {
           clearInterval(this.telTimer)
-          this.telTimer = null
         }
+        this.telTimer = setInterval(() => {
+          _n++
+
+          store.dispatch('UpdateCallTime', {
+            hh: this.toDub(parseInt((_n / 60 / 60) % 60)), // 小时
+            mm: this.toDub(parseInt((_n / 60) % 60)), // 分钟
+            ss: this.toDub(parseInt(_n % 60)) // 秒
+          })
+        }, 1000)
+      },
+      // 清除定时器
+      clearInter() {
+        clearInterval(this.telTimer)
+      },
+      // 小于10补0
+      toDub(i) {
+        return i < 10 ? '0' + i : '' + i
+      },
+      // 监听 线路状态
+      watchTelLineState(newT, oldT) {
+        // 外呼
+        if (newT === 6 && oldT === 4) {
+          this.callTime()
+        }
+        // 来电
+        if (newT === 6 && oldT === 5) {
+          this.callTime()
+        }
+        if (newT === 1) {
+          if (this.telTimer) {
+            clearInterval(this.telTimer)
+            this.telTimer = null
+          }
+        }
+      },
+      getOperatonTime(state) {
+        const params = {
+          state: state,
+          token: localStorage.getItem('Admin-Token').split(' ')[1]
+        }
+        Teljournal(params)
+          .then((response) => {
+
+          })
+          .catch((result) => {})
       }
     }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.call_middle {
-  .el-input {
-    width: 130px;
-  }
-  .el-input__inner {
-    width: 130px;
-    background-color: #282b36;
-    color: #ffffff;
-    border-radius: 16px;
-    border-color: transparent;
-    font-family: "黑体";
-  }
-  .no_write .el-input__inner {
-    background-color: transparent;
-    font-size: 18px;
-    padding-left: 6px;
-    padding-right: 0;
+  .call_middle {
+    .el-input {
+      width: 130px;
+    }
+
+    .el-input__inner {
+      width: 130px;
+      background-color: #282b36;
+      color: #ffffff;
+      border-radius: 16px;
+      border-color: transparent;
+      font-family: "黑体";
+    }
+
+    .no_write .el-input__inner {
+      background-color: transparent;
+      font-size: 18px;
+      padding-left: 6px;
+      padding-right: 0;
+    }
   }
-}
-
-.dial_popover {
-  background-color: #42484d;
-  padding: 0;
-  border-bottom-left-radius: 10px;
-  border-bottom-right-radius: 0;
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-  border-color: #42484d;
-
-  .popper__arrow,
-  .popper__arrow::after {
-    border-bottom-color: #42484d !important;
+
+  .dial_popover {
+    background-color: #42484d;
+    padding: 0;
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    border-color: #42484d;
+
+    .popper__arrow,
+    .popper__arrow::after {
+      border-bottom-color: #42484d !important;
+    }
   }
-}
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.tel_operation {
-  position: absolute;
-  left: 230px;
-  top: 3px;
-  background-color: #42484d;
-  min-width: 284px;
-  height: 46px;
-  line-height: 46px;
-  border-radius: 23px;
-  -webkit-box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.7);
-  z-index: 999;
-
-  .call_left,
-  .call_middle,
-  .call_right {
-    float: left;
+  .tel_operation {
+    position: absolute;
+    left: 230px;
+    top: 3px;
+    background-color: #42484d;
+    min-width: 284px;
     height: 46px;
-    overflow: hidden;
     line-height: 46px;
-  }
+    border-radius: 23px;
+    -webkit-box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.7);
+    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.7);
+    z-index: 999;
 
-  .call_left {
-    width: 139px;
-    display: flex;
-    .call_icon {
-      display: inline-block;
-      margin-left: 7px;
-      margin-top: 7px;
-      width: 32px;
-      height: 32px;
-      text-align: center;
-      border-radius: 50%;
+    .call_left,
+    .call_middle,
+    .call_right {
+      float: left;
+      height: 46px;
       overflow: hidden;
-      background-color: #1f2129;
-      .calli {
+      line-height: 46px;
+    }
+
+    .call_left {
+      width: 139px;
+      display: flex;
+
+      .call_icon {
         display: inline-block;
+        margin-left: 7px;
+        margin-top: 7px;
         width: 32px;
         height: 32px;
+        text-align: center;
         border-radius: 50%;
-      }
-      .free {
-        background: url("~@/assets/imgs/free.gif") center center no-repeat;
-      }
-      .incalling {
-        background: url("~@//assets/imgs/incalling.gif") center center no-repeat;
-      }
-      .callringing {
-        background: url("~@//assets/imgs/callringing.gif") center center no-repeat;
-      }
+        overflow: hidden;
+        background-color: #1f2129;
 
-      .svg-icon {
-        color: #ffffff;
-        font-size: 16px;
-        vertical-align: 0.3em;
-      }
+        .calli {
+          display: inline-block;
+          width: 32px;
+          height: 32px;
+          border-radius: 50%;
+        }
 
-      .ringing {
-        color: #1bce7d;
-      }
+        .free {
+          background: url("~@/assets/imgs/free.gif") center center no-repeat;
+        }
 
-      .incall {
-        color: #149ee4;
-      }
-    }
+        .incalling {
+          background: url("~@//assets/imgs/incalling.gif") center center no-repeat;
+        }
 
-    .call_content {
-      display: inline-block;
-      margin-left: 12px;
-      vertical-align: -0.09em;
+        .callringing {
+          background: url("~@//assets/imgs/callringing.gif") center center no-repeat;
+        }
 
-      p {
-        margin: 0;
-        padding: 0;
-        color: #ffffff;
-      }
+        .svg-icon {
+          color: #ffffff;
+          font-size: 16px;
+          vertical-align: 0.3em;
+        }
 
-      .blue_color {
-        color: #409eff;
-      }
+        .ringing {
+          color: #1bce7d;
+        }
 
-      .ft16 {
-        font-size: 16px;
+        .incall {
+          color: #149ee4;
+        }
       }
 
-      .call_text {
-        font-size: 12px;
-        line-height: 13px;
+      .call_content {
+        display: inline-block;
+        margin-left: 12px;
+        vertical-align: -0.09em;
 
-        .svg-icon {
-          margin-left: 20px;
-          font-size: 15px;
+        p {
+          margin: 0;
+          padding: 0;
+          color: #ffffff;
+        }
+
+        .blue_color {
+          color: #409eff;
         }
-      }
 
-      .call_time {
-        margin-top: 4px;
-        font-size: 14px;
-        line-height: 20px;
+        .ft16 {
+          font-size: 16px;
+        }
+
+        .call_text {
+          font-size: 12px;
+          line-height: 13px;
+
+          .svg-icon {
+            margin-left: 20px;
+            font-size: 15px;
+          }
+        }
+
+        .call_time {
+          margin-top: 4px;
+          font-size: 14px;
+          line-height: 20px;
+        }
       }
     }
-  }
 
-  .call_middle {
-    width: 160px;
-    margin-left: 16px;
-    .dialicon {
-      display: inline-block;
-      width: 14px;
-      height: 19px;
-      background: url("~@/assets/imgs/dialicon.png") center center no-repeat;
-      margin-right: 10px;
-      cursor: pointer;
-      vertical-align: text-bottom;
+    .call_middle {
+      width: 160px;
+      margin-left: 16px;
+
+      .dialicon {
+        display: inline-block;
+        width: 14px;
+        height: 19px;
+        background: url("~@/assets/imgs/dialicon.png") center center no-repeat;
+        margin-right: 10px;
+        cursor: pointer;
+        vertical-align: text-bottom;
+      }
     }
-  }
 
-  .call_right {
-    margin-left: 17px;
+    .call_right {
+      margin-left: 17px;
 
-    .start_btn {
-      border: none;
-      outline: none;
-      background-color: #409eff;
-      color: #ffffff;
-      border-top-right-radius: 23px;
-      border-bottom-right-radius: 23px;
-      height: 46px;
-      line-height: 46px;
-      width: 140px;
-      font-size: 16px;
-      text-align: center;
-      cursor: pointer;
-    }
+      .start_btn {
+        border: none;
+        outline: none;
+        background-color: #409eff;
+        color: #ffffff;
+        border-top-right-radius: 23px;
+        border-bottom-right-radius: 23px;
+        height: 46px;
+        line-height: 46px;
+        width: 140px;
+        font-size: 16px;
+        text-align: center;
+        cursor: pointer;
+      }
 
-    .call_btn {
-      outline: none;
-      cursor: pointer;
-      background-color: #42484d;
-      border: 2px solid #191c26;
-      height: 26px;
-      padding: 0 20px;
-      margin-right: 10px;
-      border-radius: 11px;
-      font-size: 12px;
-      color: #ffffff;
-    }
+      .call_btn {
+        outline: none;
+        cursor: pointer;
+        background-color: #42484d;
+        border: 2px solid #191c26;
+        height: 26px;
+        padding: 0 20px;
+        margin-right: 10px;
+        border-radius: 11px;
+        font-size: 12px;
+        color: #ffffff;
+      }
 
-    .yellow_bg {
-      background-color: #e6ad43;
-    }
+      .yellow_bg {
+        background-color: #e6ad43;
+      }
 
-    .green_bg {
-      background-color: #1795d5;
-    }
+      .green_bg {
+        background-color: #1795d5;
+      }
 
-    .red_bg {
-      background-color: #e6261e;
+      .red_bg {
+        background-color: #e6261e;
+      }
     }
-  }
 
-  .inlineBlock {
-    display: inline-block;
+    .inlineBlock {
+      display: inline-block;
+    }
   }
-}
 </style>

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

@@ -69,7 +69,9 @@
     mapGetters
   } from 'vuex'
   import store from '@/store'
-  import {getLogout} from '@/api/layout/permsgEdit'
+  import {
+    getLogout
+  } from '@/api/layout/permsgEdit'
   import {
     createWebSocket
   } from '@/utils/telWebsocket'
@@ -170,9 +172,6 @@
             this.isDisable = false
             this.loginout()
             this.signOut() // 签出
-            this.$store.dispatch('FedLogOut').then(() => {
-              location.reload() // 为了重新实例化vue-router对象 避免bug
-            })
           })
           .catch(() => {
             this.$message({
@@ -181,18 +180,19 @@
             })
           })
       },
-      loginout(){
+      loginout() {
         const params = {
-          token:localStorage.getItem('Admin-Token').split(' ')[1]
+          token: localStorage.getItem('Admin-Token').split(' ')[1]
         }
         return new Promise((resolve, reject) => {
           getLogout(params).then(response => {
-
+            this.$store.dispatch('FedLogOut').then(() => {
+              location.reload() // 为了重新实例化vue-router对象 避免bug
+            })
           }).catch(error => {
             reject(error)
           })
         })
-
       },
       tosend(roleid, uesrid) {
         this.$layer.iframe({

CallCenterWeb.UI/RMYY/src/views/orderManage/components/addOrEditInfOrder.vue

@@ -19,6 +19,16 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row v-if="ruleForm.type2Arr[0] == 8015&&iswomanage!=1">
+            <el-col :span="22">
+              <el-form-item label="投诉来源">
+                <el-select v-model="ruleForm.F_ComplaintSource" style="width: 100%;">
+                  <el-option v-for="(item,index) in tousuArr" :key="index" :label="item.F_Name" :value="item.F_DictionaryValueId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="姓名" prop="F_Customer">
@@ -70,16 +80,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- 家庭预约上门字段 -->
-          <!--       <el-row v-if="ruleForm.F_Type2 === 1004">
-            <el-col :span="10">
-              <el-form-item label="服务项目" prop="F_ServiceItems">
-                <select-service-project v-if="OrderDetailFlag" :services-param="inServicesParam"
-                  @post-service-project="getServiceProject" />
-              </el-form-item>
-            </el-col>
-          </el-row> -->
-          <!-- 外聘专家咨询字段 -->
           <el-row v-if="ruleForm.type2Arr[0] == 8008">
             <el-col :span="12">
               <el-form-item label="地区" prop="F_Address">
@@ -113,36 +113,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- PICC、中长导管置管 -->
-          <!--         <el-row v-if="ruleForm.F_Type2 === 1005">
-            <el-col :span="10">
-              <el-form-item label="置管类型" prop="F_Cathetertype">
-                <el-input v-model="ruleForm.F_Cathetertype" placeholder="请输入置管类型" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="置管科室" prop="F_Catheterdept">
-                <el-input v-model="ruleForm.F_Catheterdept" placeholder="请输入置管科室" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="置管时间" prop="F_Cathetertime">
-                <el-date-picker v-model="ruleForm.F_Cathetertime" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                  style="width: 100%;" placeholder="请选择置管时间" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="床号" prop="F_BedNum">
-                <el-input v-model="ruleForm.F_BedNum" placeholder="请输入床号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="住院号" prop="F_InpatientNum">
-                <el-input v-model="ruleForm.F_InpatientNum" placeholder="请输入住院号" />
-              </el-form-item>
-            </el-col>
-          </el-row> -->
-          <!--工单处理内容 -->
           <el-row>
             <el-col :span="24">
               <el-form-item label="工单内容" prop="F_WorkOrderContents">
@@ -215,7 +185,8 @@
   import {
     addOrEdittOrder,
     updateWorkOrder,
-    GetOrderDetail
+    GetOrderDetail,
+    getTouSuSelect
   } from '@/api/orderManagement/orderList'
   import {
     validateTel
@@ -237,6 +208,10 @@
         type: String,
         default: ''
       },
+      iswomanage: {
+        type: String,
+        default: ''
+      },
       // callid:{
       //   type:String,
       //   default:''
@@ -275,6 +250,7 @@
         repairman: [],
         deptidArr1: [],
         repairman1: [],
+        tousuArr: [],
         firstOrderTypeParam: {
           typeid: 1,
           name: '',
@@ -433,6 +409,7 @@
           clbm: '',
           clid: '',
           cont: '',
+          F_ComplaintSource:4010,
           F_ComplaintDept: '',
           F_ComplaintUser: '',
           F_WorkOrderContents: '', // 工单内容
@@ -481,6 +458,10 @@
       if (this.wid) {
         this.OrderDetail()
       }
+      if(this.iswomanage){
+        this.ruleForm.F_ComplaintSource = ''
+      }
+      this.gettsSelect()
     },
     mounted() {
       if (this.wid) {
@@ -498,6 +479,7 @@
             const data = {
               F_CallID: this.ruleForm.F_CallID,
               F_ID: this.ruleForm.F_ID,
+              F_ComplaintSource:this.ruleForm.F_ComplaintSource,
               F_Source: this.ruleForm.F_Source, // 业务类别
               F_Type1: this.ruleForm.F_Type1, // 工单类别
               F_Type2: this.ruleForm.F_Type2, // 工单子类
@@ -869,6 +851,16 @@
         this.ruleForm.F_Relationship = ''
         this.ruleForm.F_FullName = ''
         this.ruleForm.F_IDNumber = ''
+      },
+      //投诉来源下拉框数据
+      gettsSelect(){
+        const params = {
+          Flag: 'tsly',
+          Name: ''
+        }
+        getTouSuSelect(params).then(res=>{
+          this.tousuArr = res.rows
+        })
       }
     }
   }

CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -7,7 +7,7 @@
             <el-col :md="18">
               <h1 class="title" style="display: inline-block;">
                 <svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ orderDetailData.F_WorkOrderCode }}
-                <span class="wostate">{{orderDetailData.StateName}}</span>
+                <span v-if="orderDetailData.StateName" class="wostate">{{orderDetailData.StateName}}</span>
               </h1>
             </el-col>
           </el-col>
@@ -27,7 +27,7 @@
                 <th>性别:</th>
                 <td>{{orderDetailData.F_Sex}}</td>
                 <th>来源:</th>
-                <td>{{orderDetailData.F_Source}}</td>
+                <td>{{orderDetailData.F_ComplaintSource}}</td>
               </tr>
               <tr>
                 <th>联系电话:</th>
@@ -59,20 +59,6 @@
                 <th>地区:</th>
                 <td colspan="3">{{orderDetailData.F_Address}}</td>
               </tr>
-              <!-- <tr v-show="isConduit">
-                <th>置管类型:</th>
-                <td>{{orderDetailData.F_Cathetertype}}</td>
-                <th>置管科室:</th>
-                <td>{{orderDetailData.F_Catheterdept}}</td>
-                <th>置管时间:</th>
-                <td>{{orderDetailData.F_Cathetertime}}</td>
-              </tr>
-              <tr v-show="isConduit">
-                <th>床号:</th>
-                <td>{{orderDetailData.F_BedNum}}</td>
-                <th>住院号:</th>
-                <td colspan="3">{{orderDetailData.F_InpatientNum}}</td>
-              </tr> -->
               <tr>
                 <th>工单内容:</th>
                 <td colspan="5">{{orderDetailData.F_WorkOrderContents}}</td>
@@ -286,7 +272,7 @@
     }
 
     .el-col {
-      margin-bottom: 20px;
+      // margin-bottom: 20px;
     }
 
     .el-icon-time {

CallCenterWeb.UI/RMYY/src/views/orderManage/mySubmit/index.vue

@@ -162,7 +162,7 @@
       },
       btnClickEvents(button, wocode, row) {
         this.buttonName = button.key
-        this.$refs.butOption.butOptionMethod(this.buttonName, wocode)
+        this.$refs.butOption.butOptionMethod(this.buttonName, wocode,row)
         if (this.buttonName === 'chehuibianji') {
           this.btn_edit(wocode)
         }

CallCenterWeb.UI/RMYY/src/views/orderManage/orderList/index.vue

@@ -237,7 +237,7 @@ export default {
     },
     btnClickEvents(button, wocode, row) {
       this.buttonName = button.key
-      this.$refs.butOption.butOptionMethod(this.buttonName, wocode)
+      this.$refs.butOption.butOptionMethod(this.buttonName, wocode ,row)
       if (this.buttonName === 'bianji') {
         // this.btn_edit(wocode)
         this.btn_edit(wocode,row.F_Type)

CallCenterWeb.UI/RMYY/src/views/orderManage/patientVisit/index.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20" />
+    <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
+      <el-form-item label="关键字：">
+        <el-input v-model="ruleForm.keywords" placeholder="患者名称,手机号,工单编号" size="medium" />
+      </el-form-item>
+      <el-form-item label="类型：">
+        <el-cascader size="medium" ref="cascader" v-model="ruleForm.type" :options="orderData" :props="TagProps"
+          clearable @change="handleChange" />
+      </el-form-item>
+      <el-form-item label="回访状态：">
+        <el-select v-model="ruleForm.state" size="medium" clearable>
+          <el-option value="7" label="待回访"></el-option>
+          <el-option value="10" label="已回访"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="满意度：">
+        <el-select v-model="ruleForm.satisfaction" size="medium" clearable>
+          <el-option value="0" label="满意"></el-option>
+          <el-option value="1" label="基本满意"></el-option>
+          <el-option value="2" label="不满意"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="medium" @click="btn_search_task">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="dataLists" border highlight-current-row stripe>
+      <el-table-column prop="F_WorkOrderCode" label="工单编号" align="center" min-width />
+      <el-table-column prop="typename2" label="工单类别" align="center" min-width />
+      <!-- <el-table-column label="工单类别" align="center" min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.F_State==1">有效</span>
+          <span v-if="scope.row.F_State==0">无效</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column prop="F_WorkOrderContents" label="工单内容" align="center" min-width />
+      <el-table-column prop="F_Customer" label="患者姓名" align="center" min-width />
+      <el-table-column label="患者手机号" align="center" min-width>
+        <template slot-scope="scope">
+          <a @click="btn_visit(scope.row)" style="color: #55aaff;">{{scope.row.F_Phon}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column label="回访状态" align="center" min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.F_State==7" style="color: #00aaff;">待回访</span>
+          <span v-if="scope.row.F_State==10">已回访</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="满意度" align="center" min-width>
+        <template slot-scope="scope">
+          <span v-if="scope.row.F_Satisfaction==0" style="color: #00aaff;">满意</span>
+          <span v-if="scope.row.F_Satisfaction==1" style="color: #ffaa00;">基本满意</span>
+          <span v-if="scope.row.F_Satisfaction==2" style="color: #ff0000;">不满意</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="F_ReturnBakTime" 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 Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+  import Visit from './visit'
+  import {
+    getGongDanType,
+    getGetList
+  } from '@/api/orderManagement/patientvisit'
+  import {
+    exportExcel
+  } from '@/utils'
+  export default {
+    name: 'PatientVisit',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        dataLists: [],
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        orderData: [],
+        TagProps: {
+          checkStrictly: true,
+          value: 'id',
+          label: 'text',
+          children: 'children',
+        },
+        ruleForm: {
+          keywords: '',
+          state: '',
+          satisfaction: '',
+          type: []
+        },
+      }
+    },
+    computed: {},
+    created() {
+      this.getNowTime()
+      this.getList()
+      this.getgdtype()
+    },
+    mounted() {},
+    methods: {
+      // 搜索
+      btn_search_task() {
+        this.getList()
+      },
+      getList() {
+        const params = {
+          isvisit: 1,
+          keywords: this.ruleForm.keywords,
+          state: this.ruleForm.state,
+          satisfaction: this.ruleForm.satisfaction,
+          type: this.ruleForm.type[this.ruleForm.type.length - 1]
+        }
+        return new Promise(resolve => {
+          getGetList(params).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.dataLists = response.rows
+              this.pageParams.total = response.total
+            }
+          })
+          resolve()
+        })
+      },
+      getgdtype() {
+        const params = {
+          pid: 1000,
+          flag: 1
+        }
+        return new Promise(resolve => {
+          getGongDanType(params).then(response => {
+            if (response.state.toLowerCase() === 'success') {
+              this.orderData = response.data
+            }
+          })
+          resolve()
+        })
+      },
+      handleChange() {},
+      btn_visit(row) {
+        this.$layer.iframe({
+          content: {
+            content: Visit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowid:row.F_WorkOrderCode
+            } // props
+          },
+          area: ['70%', '80%'],
+          title: '回访'
+        })
+      },
+      btn_add() {
+        this.$layer.iframe({
+          content: {
+            content: AddOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+
+            } // props
+          },
+          area: ['40%', '50%'],
+          title: '添加设备'
+        })
+      },
+      handleEdit(row) {
+        this.$layer.iframe({
+          content: {
+            content: AddOrEdit, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              rowdata: row
+            } // props
+          },
+          area: ['40%', '50%'],
+          title: '编辑设备'
+        })
+      },
+      handleDelete(row) {
+        this.$confirm('确定要删除此设备吗?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            const params = {
+              ids: row.F_EquipID
+            }
+            GetDelEquips(params).then((response) => {
+              if (response.state.toLowerCase() === 'success') {
+                this.$message.success('删除成功!')
+                this.getList()
+              }
+            })
+          })
+          .catch(() => {
+            this.$message('已取消删除')
+          })
+      },
+      btn_export() {
+        const exporParams = {
+          stime: this.ruleForm.startTime && this.ruleForm.startTime[0],
+          endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
+          groupby: this.ruleForm.way,
+          isdc: 1
+        }
+        exportExcel(exporParams, getListExpt)
+      },
+      formtTime(val) {
+        if (!val) {
+          return '0秒'
+        }
+        var secondTime = parseInt(val);
+        var minuteTime = 0;
+        var hourTime = 0;
+        if (secondTime > 60) {
+          minuteTime = parseInt(secondTime / 60);
+          secondTime = parseInt(secondTime % 60);
+          if (minuteTime > 60) {
+            hourTime = parseInt(minuteTime / 60);
+            minuteTime = parseInt(minuteTime % 60);
+          }
+        }
+        var result = "" + parseInt(secondTime) + "秒";
+        if (minuteTime > 0) {
+          result = "" + parseInt(minuteTime) + "分" + result;
+        }
+        if (hourTime > 0) {
+          result = "" + parseInt(hourTime) + "小时" + result;
+        }
+        return result;
+      },
+      getNowTime() {
+        var now = new Date();
+        var year = now.getFullYear(); //得到年份
+        var month = now.getMonth(); //得到月份
+        var date = now.getDate(); //得到日期
+        month = month + 1;
+        month = month.toString().padStart(2, "0");
+        date = date.toString().padStart(2, "0");
+        var defaultDate = `${year}-${month}-${date}`;
+        // this.ruleForm.startTime=[defaultDate,defaultDate]
+        this.$set(this.ruleForm, "startTime", [defaultDate, defaultDate]);
+      },
+      btn_way() {
+        this.getList()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/.el-tabs__item {
+    width: 185px !important;
+    text-align: center;
+    font-size: 16px !important;
+    font-weight: 600;
+  }
+
+  .el-popper[x-placement^='bottom'] {
+    z-index: 10px !important;
+  }
+
+  .operation div {
+    font-size: 14px;
+    color: #222;
+    padding: 5px 0;
+    cursor: pointer;
+  }
+
+  .el-icon-s-tools {
+    font-size: 18px !important;
+    vertical-align: middle;
+  }
+
+  .el-popover {
+    min-width: 75px;
+    text-align: center;
+  }
+
+  .el-table .cell {
+    position: relative;
+  }
+
+  .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;
+  }
+
+  .app-container {
+    padding: 10px;
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/orderManage/patientVisit/visit.vue

@@ -0,0 +1,462 @@
+<template>
+  <div class="order_detail">
+    <el-row :gutter="20">
+      <el-col :md="24" class="order_detail_content">
+        <el-alert title="工单信息" type="success" class="ordertit" style="" :closable="false">
+        </el-alert>
+        <table class="tabdept" cellspacing="0" cellpadding="0">
+          <tr>
+            <th>业务类别:</th>
+            <td>{{orderDetailData.TypeName}}</td>
+            <th>工单类别:</th>
+            <td>{{orderDetailData.F_TypeName2}}</td>
+            <th>创建时间:</th>
+            <td>{{orderDetailData.F_CreateTime}}</td>
+          </tr>
+          <tr>
+            <th>姓名:</th>
+            <td>{{ orderDetailData.F_Customer }}</td>
+            <th>性别:</th>
+            <td>{{orderDetailData.F_Sex}}</td>
+            <th>联系电话:</th>
+            <td>{{orderDetailData.F_Phon}} <i class="el-icon-mobile" style="
+              color: #24c6c8;
+              font-size: 20px;
+              vertical-align: middle;
+              margin-left: 5px;
+              cursor: pointer;
+            " @click="oncall" /></td>
+          </tr>
+          <tr>
+            <th>工单内容:</th>
+            <td colspan="5">{{orderDetailData.F_WorkOrderContents}}</td>
+          </tr>
+          <tr>
+            <th>处理部门:</th>
+            <td>{{orderDetailData.DealDeptName}}</td>
+            <th>处理人:</th>
+            <td>{{orderDetailData.DealUserName}}</td>
+            <th>处理时间:</th>
+            <td>{{orderDetailData.F_HandleTime}}</td>
+          </tr>
+          <tr>
+            <th>处理结果:</th>
+            <td colspan="5">{{orderDetailData.F_DealResult}}</td>
+          </tr>
+        </table>
+      </el-col>
+      <el-col :md="24" class="order_detail_body">
+        <el-alert title="回访记录" type="success" class="ordertit" :closable="false">
+        </el-alert>
+        <el-table :data="visitarr" border highlight-current-row stripe>
+          <el-table-column type="index" width="100" label="序号" align="center">
+          </el-table-column>
+          <el-table-column prop="F_CreateTime" label="回访时间" align="center" min-width />
+          <el-table-column prop="F_CreateUser" label="回访人" align="center" min-width />
+          <el-table-column prop="F_CallResult" label="呼叫结果" align="center" min-width />
+          <el-table-column prop="F_Result" label="回访结果" align="center" min-width />
+          <el-table-column label="满意度" align="center" min-width>
+            <template slot-scope="scope">
+              <span v-if="scope.row.F_Satisfaction==0" style="color: #00aaff;">满意</span>
+              <span v-if="scope.row.F_Satisfaction==1" style="color: #ffaa00;">基本满意</span>
+              <span v-if="scope.row.F_Satisfaction==2" style="color: #ff0000;">不满意</span>
+              <span v-if="scope.row.F_Satisfaction==-1">-</span>
+            </template>
+          </el-table-column>
+          <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.F_CreateUser)" />
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :md="24" class="order_detail_body" v-if="orderDetailData.F_State==7">
+        <el-alert title="呼叫结果" type="success" class="ordertit" style="margin-bottom: 30px;" :closable="false">
+        </el-alert>
+        <el-radio-group v-model="ruleForm.callResult" style="margin-left: 20px;">
+          <el-radio label="正常接通">正常接通</el-radio>
+          <el-radio label="拒接">拒接</el-radio>
+          <el-radio label="不是本人">不是本人</el-radio>
+          <el-radio label="关机">关机</el-radio>
+          <el-radio label="停机">停机</el-radio>
+          <el-radio label="无人接听">无人接听</el-radio>
+          <el-radio label="空号">空号</el-radio>
+          <el-radio label="免回访">免回访</el-radio>
+        </el-radio-group>
+      </el-col>
+      <el-col :md="24" class="order_detail_body" v-if="orderDetailData.F_State==7">
+        <el-alert title="回访结果" type="success" class="ordertit" style="margin-bottom: 20px;" :closable="false">
+        </el-alert>
+        <el-form ref="ruleForm" :model="ruleForm" label-width="80px" style="font-size: 14px" class="order_form">
+          <el-form-item v-if="ruleForm.callResult=='正常接通'||ruleForm.callResult=='免回访'" label="满意度:">
+            <el-radio-group v-model="ruleForm.satisfaction">
+              <el-radio :label="0">满意</el-radio>
+              <el-radio :label="1">基本满意</el-radio>
+              <el-radio :label="2">不满意</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="回访结果:">
+            <el-input v-model="ruleForm.result" type="textarea" placeholder="请输入回访结果" />
+          </el-form-item>
+          <el-form-item v-if="ruleForm.callResult=='正常接通'||ruleForm.callResult=='免回访'" label="是否完结:">
+            <el-radio-group v-model="ruleForm.isover">
+              <el-radio :label="0">否</el-radio>
+              <el-radio :label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click='btnVisit'>确定</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import {
+    GetOrderDetail,
+    GetVisitWorkOrder
+  } from '@/api/orderManagement/patientvisit'
+  import {
+    getCallOutprefix
+  } from '@/api/trafficData/trafficData'
+  import {
+    Send
+  } from '@/utils/telWebsocket'
+  import audioPlayer from '@/components/context/audioPlayer'
+  import Pagination from '@/components/context/Pagination' // 对el-pagination 二次封装
+
+  export default {
+    name: 'Visit',
+    components: {
+      Pagination
+    },
+    props: {
+      rowid: {
+        type: String,
+        default: ''
+      },
+      layerid: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        visitarr: [],
+        orderDetailData: {},
+        pageParams: {
+          pageindex: 1, // 当前第几页
+          pagesize: 5, // 每页几条数据
+          total: 0 // 总共多少数据
+        },
+        ruleForm: {
+          callResult: '',
+          satisfaction: '',
+          result: '',
+          isover: 0
+        },
+        workOrderCirculationList: [] // 工单流转
+      }
+    },
+    computed: {
+      ...mapGetters(['rolecode'])
+    },
+    created() {
+      this.getDetail('0')
+      this.getDetail('2')
+    },
+    methods: {
+      // 详情
+      getDetail(num) {
+        const params = {
+          WorkOrderCode: this.rowid,
+          type: num
+        }
+        GetOrderDetail(params).then((response) => {
+          if (num == 0) {
+            this.orderDetailData = response.data[0]
+            this.orderDetailData.F_TypeName2 = this.$store.getters.workTypeMap[parseInt(response.data[0].F_type2)]
+              .text // 工单子类
+          }
+          if (num == 2) {
+            this.visitarr = response.data
+          }
+        })
+      },
+      btnVisit() {
+        if (this.ruleForm.satisfaction == 2 && this.ruleForm.result == '') {
+          this.$message.error('请输入回访结果');
+          return;
+        }
+        const params = {
+          WorkOrderCode: this.orderDetailData.F_WorkOrderCode,
+          callid: this.orderDetailData.F_CallID,
+          callResult: this.ruleForm.callResult,
+          satisfaction: this.ruleForm.satisfaction,
+          result: this.ruleForm.result,
+          isover: this.ruleForm.isover,
+          phone: this.orderDetailData.F_Phon
+        }
+        GetVisitWorkOrder(params).then(res => {
+          if (res.state == 'success') {
+            this.$message.success('回访成功')
+            this.$parent.getList()
+            this.$parent.$layer.close(this.layerid)
+          }
+        })
+      },
+      oncall() {
+        const params = {
+          phone: this.orderDetailData.F_Phon
+        }
+        getCallOutprefix(params).then((response) => {
+          if (response.state.toLowerCase() === 'success') {
+            const scoketDatas = {
+              Type: 'MakeCall',
+              AgentID: localStorage.getItem('storageUsercode'),
+              AgentExten: localStorage.getItem('ext'),
+              Header: response.data.fix,
+              DestinationNumber: response.data.phone
+            }
+            Send(scoketDatas)
+          }
+        })
+      },
+      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: '录音详情'
+        })
+      },
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+  .order_detail {
+    .ordertit {
+      color: #000000;
+      font-size: 20px !important;
+      font-weight: bold;
+      background-color: #f5f5f5;
+      border-bottom: 1px dashed #00ff7f;
+      padding-left: 0;
+    }
+
+    .tabdept {
+      width: 100%;
+      margin: 10px 0;
+      border: 1px solid #ccc;
+    }
+
+    .tabdept th {
+      width: 150px;
+      padding: 10px 0;
+      font-size: 14px;
+      text-align: center;
+      background-color: #ececec;
+      border: 1px solid #ccc;
+    }
+
+    .tabdept td {
+      font-size: 14px;
+      text-align: center;
+      background-color: #fafafa;
+      border: 1px solid #ccc;
+    }
+
+    .wostate {
+      color: #67aa60;
+      display: inline-block;
+      border: 1px solid #c1c1c1;
+      border-radius: 5px;
+      padding: 5px 10px 3px 10px;
+      font-size: 17px !important;
+    }
+
+    .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: 16px;
+          margin-right: 20px;
+        }
+      }
+
+      .title_sub {
+        font-size: 14px;
+        color: #666666;
+      }
+
+      .order_detail_content {
+        background-color: #f5f5f6;
+        padding-top: 20px;
+        color: #4c4c4c;
+        font-size: 14px;
+
+        .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: 5px;
+              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;
+    }
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/systemSetup/LogManage/Loginlog/index.vue

@@ -3,10 +3,23 @@
     <el-row :gutter="20">
       <el-col :md="24">
         <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
-          <el-form-item>
-            <el-input v-model="ruleForm.username" placeholder="请输入操作人姓名" size="medium" />
+          <el-form-item label="操作人:">
+            <el-input v-model="ruleForm.username" placeholder="请输入姓名" size="medium" />
           </el-form-item>
-          <el-form-item>
+          <el-form-item label="操作:">
+            <el-select v-model="ruleForm.msg" placeholder="请选择操作">
+              <el-option value="登录" label="登录"></el-option>
+              <el-option value="登出" label="登出"></el-option>
+              <el-option value="签入" label="签入"></el-option>
+              <el-option value="签出" label="签出"></el-option>
+              <el-option value="置闲" label="置闲"></el-option>
+              <el-option value="置忙" label="置忙"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="IP地址:">
+            <el-input v-model="ruleForm.ip" placeholder="请输入ip地址" size="medium" />
+          </el-form-item>
+          <el-form-item label="时间范围:">
             <el-col :span="16">
               <el-date-picker v-model="ruleForm.searchTime" type="daterange" format="yyyy年MM月dd日"
                 value-format="yyyy-MM-dd" align="left" unlink-panels range-separator="至" start-placeholder="开始日期"
@@ -18,17 +31,21 @@
           </el-form-item>
         </el-form>
         <el-table :data="taskDataLists" border stripe @selection-change="handleSelectionChange">
-          <el-table-column type="index" label="编号" align="center" width="120">
+          <el-table-column type="index" label="序号" align="center" width="120">
+          </el-table-column>
+          <el-table-column label="操作人" align="center" min-width>
+            <template slot-scope="scope">
+              <span>{{scope.row.T_username}} ({{scope.row.T_usercode}})</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作类型" align="center" min-width>
+            <template slot-scope="scope">
+              <span>{{scope.row.T_result.substring(0,2)}}</span>
+            </template>
           </el-table-column>
-          <el-table-column prop="T_usercode" label="操作人编号" align="center" min-width />
-          <el-table-column prop="T_username" label="操作人名称" align="center" min-width />
-          <el-table-column prop="T_time" label="登录时间" align="center" min-width />
-          <el-table-column prop="T_LoginOutDate" label="登出时间" align="center" min-width />
-          <el-table-column prop="LoginTime" label="签入时间" align="center" min-width />
-          <el-table-column prop="LogoutTime" label="签出时间" align="center" min-width />
-          <el-table-column prop="IdleTime" label="置闲时间" align="center" min-width />
-          <el-table-column prop="BusyTime" label="置忙时间" align="center" min-width />
-          <el-table-column prop="T_result" label="操作内容" align="center" min-width />
+          <el-table-column prop="T_login_ip" label="操作IP" align="center" min-width />
+          <el-table-column prop="T_time" label="操作时间" align="center" min-width />
+          <el-table-column prop="T_result" 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="getListTask" />
@@ -52,7 +69,9 @@
       return {
         ruleForm: {
           username:'',
-          searchTime:''
+          searchTime:'',
+          msg:'',
+          ip:'',
         },
         taskDataLists: [],
         pageParams: {
@@ -87,7 +106,9 @@
             pagesize:this.pageParams.pagesize,
             username:this.ruleForm.username,
             starttime:this.ruleForm.searchTime&&this.ruleForm.searchTime[0],
-            endtime:this.ruleForm.searchTime&&this.ruleForm.searchTime[1]
+            endtime:this.ruleForm.searchTime&&this.ruleForm.searchTime[1],
+            msg:this.ruleForm.msg,
+            ip:this.ruleForm.ip
           }
           getLogList(params)
             .then((response) => {

CallCenterWeb.UI/RMYY/src/views/systemSetup/sysSetting/orderTypeManage/addOrEditOrderType.vue

@@ -20,6 +20,9 @@
       <el-form-item label="返修时限">
         <el-input-number v-model="ruleForm.F_RepairTimeLimit" :min="0"></el-input-number>
       </el-form-item>
+      <el-form-item label="流转部门">
+        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
+      </el-form-item>
       <el-form-item label="备注" prop="F_Remark">
         <el-input
           v-model="ruleForm.F_Remark"
@@ -43,7 +46,7 @@
 import { getOrderType, addOrderType, editOrderType } from '@/api/systemSetup/roleSetting/orderTypeManage'
 import { validateSort } from '@/utils/validate'
 import { filterContent } from '@/utils'
-
+import selectDeptTree from '@/components/context/commonSelect/selectDeptTree.vue'
 const validateSortRule = (rule, value, callback) => {
   if (!validateSort(value)) {
     callback(new Error('请输入有效的排序编号（正整数、负整数、0）'))
@@ -54,6 +57,9 @@ const validateSortRule = (rule, value, callback) => {
 
 export default {
   name: 'AddOrEditOrderType',
+  components: {
+    selectDeptTree
+  },
   props: {
     rowid: {
       type: String,
@@ -88,6 +94,7 @@ export default {
         F_Remark: '', // 工单类型备注
         F_Sort: '' ,// 排序
         F_Identification:'',
+        F_AutoDept:''//流转部门
       },
       rules: {
         F_Name: [{
@@ -96,6 +103,7 @@ export default {
           trigger: 'blur'
         }]
       },
+      deptidArr:[],
       loading: false
     }
   },
@@ -175,7 +183,10 @@ export default {
           this.ruleForm.F_Identification = res.identification
         }
       })
-    }
+    },
+    getDeptid(data) {
+      this.ruleForm.F_AutoDept = data[data.length - 1]
+    },
   }
 }
 </script>