diff --git a/src/components/VoiceCallDialog.vue b/src/components/VoiceCallDialog.vue index 3dd4584..bf4a6f2 100644 --- a/src/components/VoiceCallDialog.vue +++ b/src/components/VoiceCallDialog.vue @@ -47,7 +47,7 @@ - + { - if (!res.code) { - this.tableData = res; - } - }) + if(this.queryParam.name == ''&&this.queryParam.phone == ''&&this.queryParam.idCard == '') + { + this.tableData = [] + } + else + { + voiceCall.caseMatchList(this.queryParam).then(res => { + if (!res.code) { + this.tableData = res; + } + }) + } }, // 呼入接听 async handleAccept() { diff --git a/src/pages/layout/components/LayoutHeader.vue b/src/pages/layout/components/LayoutHeader.vue index d535dc6..171ca82 100644 --- a/src/pages/layout/components/LayoutHeader.vue +++ b/src/pages/layout/components/LayoutHeader.vue @@ -163,9 +163,9 @@ :before-close="handleClose" >
- @@ -191,7 +191,7 @@ - + - + - - 重新签名 + +
+ 重新签名
@@ -301,6 +302,16 @@ export default { {required: true, validator: validatePass2, trigger: 'change',}, ], }, + rulesInfoClient: { + phone: [ + { required: false, message: '请输入手机号码', trigger: 'change',}, + { pattern: /^(13[0-9]{9})|(18[0-9]{9})|(14[0-9]{9})|(17[0-9]{9})|(15[0-9]{9})|(19[0-9]{9})$/, message: '请输入正确的手机号码', trigger: ['blur', 'change']} + ], + replyPhone: [ + { required: false, message: '请输入手机号码', trigger: 'change',}, + { pattern: /^(13[0-9]{9})|(18[0-9]{9})|(14[0-9]{9})|(17[0-9]{9})|(15[0-9]{9})|(19[0-9]{9})$/, message: '请输入正确的手机号码', trigger: ['blur', 'change']} + ], + }, userInfo: {}, defaultHeadUrl: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',//默认图片 @@ -318,12 +329,18 @@ export default { methods: { // 个人信息 handleChangePersonal() { - api.getUserById({id: this.userInfo.id}).then(res => { + api.getUserById({id: this.userInfo.id}).then(async res => { this.PersonalInfo.id = res.id this.PersonalInfo.realName = res.realName // this.PersonalInfo.realName = res.realName this.PersonalInfo.phone = res.phone - this.PersonalInfo.signPic = res.signPic + + // this.PersonalInfo.signPic = res.signPic + if(res.signPic != ''&& res.signPic != null){ + this.PersonalInfo.signPic = await this.$fetchApi.viewFullFile({path: res.signPic}) + } + // obj.previewUrl = await this.$fetchApi.viewFullFile({path: item.url}) + this.PersonalInfo.replyPhone = res.replyPhone this.PersonalInfo.cardNo = res.cardNo @@ -338,9 +355,13 @@ export default { this.showInfo = false }, handlePersonalSubmit() { - api.updateUserById(this.PersonalInfo).then(res => { - this.$message.success("修改成功") - this.handleClose() + this.$refs.ruleInfoForm.validate((valid) => { + if (valid) { + api.updateUserById(this.PersonalInfo).then(res => { + this.$message.success("修改成功") + this.handleClose() + }) + } }) }, diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index a64053f..c162ec9 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -664,7 +664,8 @@ export default { callingCaseList() { api.callingCaseList({}).then(res => { this.queueList = res.queue || [] - }) + + }) }, // 当前自动呼叫队列 callingQueue() { @@ -723,7 +724,7 @@ export default { // 呼叫成功 async callingSuccess () { try { - let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId}) + let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId,callingSessionId:this.sessionId}) console.log('呼叫成功请求接口==callingSuccess:', res) // this.getmediate_record() this.$refs.layoutContent.getmediate_record(); @@ -733,13 +734,12 @@ export default { // 呼叫失败 async callingFail () { try { - let res = await api.callingFail({caseId: this.caseId,contactId: this.contactId}) + let res = await api.callingFail({caseId: this.caseId,contactId: this.contactId,callingSessionId:this.sessionId}) } catch (err) { } }, // 挂断会话 async hungUp(type) { - console.log(this.calling,'挂断会话挂断会话挂断会话挂断会话挂断会话') if (!this.$clickThrottle()) { return } @@ -837,6 +837,12 @@ export default { missedCallList() { voiceCall.notAnswerList({}).then(res => { this.missedCallData.list = res; + + this.missedCallData.list.forEach(item =>{ + item.contact = item.contact.replace('0086','') + item.phone = item.phone.replace('0086','') + }) + // this.missedCallData.list = [ // { // contact: '唐 138', diff --git a/src/pages/mediation-page/components/missedCallCaseDialog.vue b/src/pages/mediation-page/components/missedCallCaseDialog.vue index cee2388..fd447ce 100644 --- a/src/pages/mediation-page/components/missedCallCaseDialog.vue +++ b/src/pages/mediation-page/components/missedCallCaseDialog.vue @@ -1,29 +1,31 @@