diff --git a/src/components/VoiceCallDialog.vue b/src/components/VoiceCallDialog.vue index 5bcb075..3dd4584 100644 --- a/src/components/VoiceCallDialog.vue +++ b/src/components/VoiceCallDialog.vue @@ -4,7 +4,7 @@
-
{{ zoomActive ? '缩小' : '放大' }}
-
-
{{ incomingCallPhone }}
+
+
{{ incomingCallPhone }}
-
{{ zoomActive ? '缩小' : '放大' }} @@ -244,8 +244,9 @@ export default { .big-header{ .big-header-btn{ - background-color: #e4e7ed; - padding: 6px 10px; + background-color: rgba(242, 243, 245, 1); + padding: 9px 14px; + border-radius: 16px; .tabs-svg{ width: 16px; height: 16px; @@ -286,20 +287,27 @@ export default { position: absolute; top: 0; left: 50%; - height: 56px; + height: 72px; width: 460px; margin-left: -230px; .small-layout{ - height: 56px; + height: 72px; border-radius: 16px; - background-color: #dcdfe6; + background-color: #ffffff; + border: 1px solid #E5E6EB; + box-shadow: 0 8px 16px 0 rgba(0,0,0,.1); + .small-layout-phone{ + line-height: 34px; + border-right: 1px solid rgba(229, 230, 235, 1); + } .tabs-svg-phone{ width: 40px; height: 40px; } .big-header-btn{ - background-color: #ffffff; - padding: 6px 10px; + background-color: rgba(242, 243, 245, 1); + padding: 9px 14px; + border-radius: 16px; .tabs-svg{ width: 16px; height: 16px; diff --git a/src/pages/case-management/components/caseAllocationDialog.vue b/src/pages/case-management/components/caseAllocationDialog.vue index 2a99401..efdbc94 100644 --- a/src/pages/case-management/components/caseAllocationDialog.vue +++ b/src/pages/case-management/components/caseAllocationDialog.vue @@ -331,15 +331,17 @@ import apipack from "@/services/casePackageManagement"; return false } + // console.log(this.caseAllocationDialog.choosecaseIds,'datadatadatadata') + this.$refs.ruleForm.validate((valid) => { if(valid) { let data = { - id:this.caseAllocationDialog.ObjectInfo.id, + caseIds:this.caseAllocationDialog.choosecaseIds, dispatchType:this.queryParam.dispatchType, userList:chooseUser } - + apipack.postpkgdispatchCase(data).then(res => { this.$message({ showClose: true, diff --git a/src/pages/case-mistake/components/importPackageDialog.vue b/src/pages/case-mistake/components/importPackageDialog.vue index b098e69..9ab8201 100644 --- a/src/pages/case-mistake/components/importPackageDialog.vue +++ b/src/pages/case-mistake/components/importPackageDialog.vue @@ -193,6 +193,8 @@ import apipk from "@/services/casePackageManagement"; apipk.CasePkgimport(data).then(res => { this.handleClose() this.$parent.getCaseInfoList(1) + + this.$message.success("批量导入案件成功，导入错误案件请在错误修复里面进行查看！"); }) } diff --git a/src/pages/case-package/components/importPackageDialog.vue b/src/pages/case-package/components/importPackageDialog.vue index 4f12597..3215be9 100644 --- a/src/pages/case-package/components/importPackageDialog.vue +++ b/src/pages/case-package/components/importPackageDialog.vue @@ -61,7 +61,8 @@ v-model="baseInfo.planStartTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" - placeholder="选择委案日期"> + placeholder="选择委案日期" + :picker-options="pickerOptions"> @@ -116,6 +117,12 @@ import apipk from "@/services/casePackageManagement"; }, data() { return { + pickerOptions: { + disabledDate(v) { + return v.getTime() < new Date().getTime();// - 86400000是否包括当天 + } + }, + baseInfo:{ pkgName:'',//案件包名 entrustingAgencyName:'',//金融机构名称 @@ -164,6 +171,7 @@ import apipk from "@/services/casePackageManagement"; apipk.CasePkgimport(data).then(res => { this.handleClose() this.$parent.getCaseInfoList(1) + this.$message.success("批量导入案件成功，导入错误案件请在错误修复里面进行查看！"); }) } diff --git a/src/pages/mediation-management/components/batchSMSDialog.vue b/src/pages/mediation-management/components/batchSMSDialog.vue index 60ae7cb..cb7266d 100644 --- a/src/pages/mediation-management/components/batchSMSDialog.vue +++ b/src/pages/mediation-management/components/batchSMSDialog.vue @@ -122,7 +122,7 @@ export default { if(!this.$clickThrottle()) { return }//防止重复点击 let caseIdList = this.eventTraDialog.caseids; caseManagement.smsBatchSend({...this.ObjectInfo, caseIdList: caseIdList}).then(res => { - this.$parent.getCaseInfoList(1) + this.$parent.getCaseInfoList(this.eventTraDialog.current) this.handleClose() this.$message.success("发送成功"); }) diff --git a/src/pages/mediation-management/components/batchofficeDeliveryDialog.vue b/src/pages/mediation-management/components/batchofficeDeliveryDialog.vue index 96e3e03..6b2fc7b 100644 --- a/src/pages/mediation-management/components/batchofficeDeliveryDialog.vue +++ b/src/pages/mediation-management/components/batchofficeDeliveryDialog.vue @@ -86,7 +86,7 @@ export default { if(!this.$clickThrottle()) { return }//防止重复点击 let caseIdList = this.eventTraDialog.caseids; caseManagement.traceServedBatchCreate({...this.ObjectInfo, caseIdList: caseIdList}).then(res => { - this.$parent.getCaseInfoList(1) + this.$parent.getCaseInfoList(this.eventTraDialog.current) this.handleClose() this.$message.success("发送成功"); }) diff --git a/src/pages/mediation-management/components/batchofficeDialog.vue b/src/pages/mediation-management/components/batchofficeDialog.vue index 1f9f508..a3e46e7 100644 --- a/src/pages/mediation-management/components/batchofficeDialog.vue +++ b/src/pages/mediation-management/components/batchofficeDialog.vue @@ -95,7 +95,7 @@ export default { ...this.ObjectInfo, } caseManagement.traceGenerateBatchCreate(dataJson).then(res => { - this.$parent.getCaseInfoList(1) + this.$parent.getCaseInfoList(this.eventTraDialog.current) this.handleClose() this.$message.success("成功"); }) diff --git a/src/pages/mediation-management/components/batchofficeSealDialog.vue b/src/pages/mediation-management/components/batchofficeSealDialog.vue index f8052c4..e5397c2 100644 --- a/src/pages/mediation-management/components/batchofficeSealDialog.vue +++ b/src/pages/mediation-management/components/batchofficeSealDialog.vue @@ -67,7 +67,7 @@ import api from "@/services/caseManagement"; methods: { handleSubmit(){ api.traceSeal_launch(this.ObjectInfo).then((res) => { - this.$parent.getCaseInfoList(1) + this.$parent.getCaseInfoList(this.eventTraDialog.current) this.handleClose() this.$message.success("发起批量签章成功"); }); diff --git a/src/pages/mediation-management/components/batchofficeWDialog.vue b/src/pages/mediation-management/components/batchofficeWDialog.vue index c264017..384a355 100644 --- a/src/pages/mediation-management/components/batchofficeWDialog.vue +++ b/src/pages/mediation-management/components/batchofficeWDialog.vue @@ -114,7 +114,7 @@ import api from "@/services/caseManagement"; api.traceSignBatchCreate(this.ObjectInfo).then((res) => { this.$message.success("批量发起签字成功"); this.handleClose() - this.$parent.getCaseInfoList() + this.$parent.getCaseInfoList(this.eventTraDialog.current) }); }, diff --git a/src/pages/mediation-management/index.vue b/src/pages/mediation-management/index.vue index 4ea3820..c70c60d 100644 --- a/src/pages/mediation-management/index.vue +++ b/src/pages/mediation-management/index.vue @@ -517,35 +517,35 @@ import { values } from "lodash"; this.$message.warning(`请至少选中一个调解案件！`) return } - this.officeDeliveryIdsDialog={titile:'批量文书送达',caseids:this.selectionData} + this.officeDeliveryIdsDialog={titile:'批量文书送达',caseids:this.selectionData,current:this.queryParam.current} }, handleOfficeSeal(){ if(this.selectionData.length == 0 ){ this.$message.warning(`请至少选中一个调解案件！`) return } - this.officeSealIdsDialog={titile:'批量文书签章',caseids:this.selectionData} + this.officeSealIdsDialog={titile:'批量文书签章',caseids:this.selectionData,current:this.queryParam.current} }, handleOfficeWrite(){ if(this.selectionData.length == 0 ){ this.$message.warning(`请至少选中一个调解案件！`) return } - this.officeWriteIdsDialog={titile:'批量文书签字',caseids:this.selectionData} + this.officeWriteIdsDialog={titile:'批量文书签字',caseids:this.selectionData,current:this.queryParam.current} }, handleOffice(){ if(this.selectionData.length == 0 ){ this.$message.warning(`请至少选中一个调解案件！`) return } - this.officeIdsDialog={titile:'批量文书生成',caseids:this.selectionData} + this.officeIdsDialog={titile:'批量文书生成',caseids:this.selectionData,current:this.queryParam.current} }, handleSMSSend(){ if(this.selectionData.length == 0 ){ this.$message.warning(`请至少选中一个调解案件！`) return } - this.smsIdsDialog={titile:'批量发送短信',caseids:this.selectionData} + this.smsIdsDialog={titile:'批量发送短信',caseids:this.selectionData,current:this.queryParam.current} }, // tab切换 handleTabClick(tab){ diff --git a/src/pages/mediation-page/components/LayoutContentNew.vue b/src/pages/mediation-page/components/LayoutContentNew.vue index c64d0fb..a244515 100644 --- a/src/pages/mediation-page/components/LayoutContentNew.vue +++ b/src/pages/mediation-page/components/LayoutContentNew.vue @@ -84,7 +84,7 @@
-
+
呼叫被申请人
@@ -132,7 +132,7 @@
- +
@@ -194,7 +194,7 @@
- + @@ -480,6 +480,13 @@ export default { openRecordDialog(obj) { this.visiblemediatRecord = true; this.visiblemediatRecordObj = obj; + }, + startOutboundCall(phone, contactId) { + let params = { + phone: phone || null, + contactId: contactId || null + } + this.$emit('startOutboundCall', params) } } }; diff --git a/src/pages/mediation-page/components/MediationRoom.vue b/src/pages/mediation-page/components/MediationRoom.vue index 4832362..b41bd96 100644 --- a/src/pages/mediation-page/components/MediationRoom.vue +++ b/src/pages/mediation-page/components/MediationRoom.vue @@ -113,7 +113,7 @@
- +
@@ -641,9 +641,11 @@ export default { } }, // 电话呼出 - async startOutboundCall() { + async startOutboundCall(phone, contactId) { // this.phoneNumber = this.queue ? this.queueList[this.index].phone : this.baseInfo.phone + if (this.calling) return this.phoneNumber = '13982024318' + if (contactId) this.contactId=contactId console.log('进入呼叫电话：', this.phoneNumber) try { @@ -676,7 +678,7 @@ export default { // 呼叫失败 async callingFail () { try { - let res = await api.callingSuccess({caseId: this.caseId,contactId: this.contactId}) + let res = await api.callingFail({caseId: this.caseId,contactId: this.contactId}) } catch (err) { } }, // 挂断会话 diff --git a/src/pages/mediation-page/components/contactPerson.vue b/src/pages/mediation-page/components/contactPerson.vue index 605968a..be8f1e0 100644 --- a/src/pages/mediation-page/components/contactPerson.vue +++ b/src/pages/mediation-page/components/contactPerson.vue @@ -31,7 +31,7 @@
- 电话 + 电话 {}); }, - makeCall(item) {}, + makeCall(item) { + this.$emit('startOutboundCall', {phone: item.phone, contactId: item.id}) + }, sendMessages(item) {} } }