tanghuan/mediate-manage-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 'stg'

Browse Source 
Main

See merge request cloud-mediate/mediate-manage-web!24
This commit is contained in:
刘翕 2025-02-14 08:56:07 +00:00
commit 73bffb25c5
14 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/image/arrange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

BIN
src/assets/image/busy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

BIN
src/assets/image/free.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 319 B

BIN
src/assets/image/notReady.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 310 B

BIN
src/assets/image/rest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 251 B

12
src/assets/style/common.scss
View File

@ -270,7 +270,9 @@ html{
.p-h-16{
@include basePadding(0, $size16);
}
.p-8-16{
@include basePadding($size8, $size16);
}
.pl-22{
padding-left: $size22;
}
@ -752,10 +754,10 @@ html{
}
//=================== start::提示框置顶 ===============================
.el-message.el-message--warning{z-index: 3000 !important;}
.el-message.el-message--error.is-closable{z-index: 3000 !important;}
.el-message.el-message--warning.is-closable{z-index: 3000 !important;}
.el-message.el-message--success.is-closable{z-index: 3000 !important;}
.el-message.el-message--warning{z-index: 9999 !important;}
.el-message.el-message--error.is-closable{z-index: 9999 !important;}
.el-message.el-message--warning.is-closable{z-index: 9999 !important;}
.el-message.el-message--success.is-closable{z-index: 9999 !important;}
.el-loading-mask.is-fullscreen{z-index: 9999 !important;}
.el-loading-mask{z-index: 3000 !important;}
//=================== end::提示框置顶 ===============================

4
src/pages/event-tracing/components/officeDialog.vue
View File

@ -108,7 +108,7 @@
</div>
</div>
</div>
<!-- 短信发送追踪 -->
<!-- 文书生成追踪明细 -->
<officeDialogDetail v-else :DialogDetail="DialogDetail" />
</div>
@ -204,7 +204,7 @@ import api from "@/services/eventTracingApi";
type: "warning",
}).then(() => {
if(!this.$clickThrottle()) { return }//防止重复点击
api.posttrace_generate_retryl({id: row.id}).then(res => {
api.posttrace_generate_cancel({id: row.id}).then(res => {
this.getList(1);
this.$message.success("成功");
})

7
src/pages/event-tracing/components/officeWriteDialog.vue
View File

@ -78,7 +78,8 @@
</el-table-column>
<el-table-column label="签字状态" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.status.desc }}</span>
<span v-if="$util.getTimeContrast(scope.row.deadline)">{{ scope.row.status.desc }}</span>
<span v-else>已过期</span>
</template>
</el-table-column>
<el-table-column prop="failureReason" label="失败原因" show-overflow-tooltip ></el-table-column>
@ -93,8 +94,8 @@
<template slot-scope="scope">
<div class="flex-row align-items-center">
<el-button size="mini" @click="handleDetail(scope)">明细</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" size="mini" @click="handleAgain(scope)">重试</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" size="mini" @click="handleCancel(scope)">取消</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleAgain(scope)">重试</el-button>
<el-button v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2 && scope.row.status.code !== 1" size="mini" @click="handleCancel(scope)">取消</el-button>
</div>
</template>
</el-table-column>

42
src/pages/layout/components/LayoutHeader.vue
View File

@ -18,21 +18,37 @@
<!-- <el-badge :value="1" :max="99" class="item">
<el-avatar size="medium" icon="el-icon-user-solid"></el-avatar>
</el-badge> -->
<div class="mr-8 cursor-pointer layou-header-right-box " @mouseover="showInfo=true">
<div class="mr-16 cursor-pointer flex-row-center align-items-center" @mouseover="showInfo=true">
<el-avatar size="medium" :src="userInfo.headUrl?userInfo.headUrl:defaultHeadUrl" ></el-avatar>
<span class="f16 color-fff ml-16">{{ userInfo.realName || userInfo.showName || '-' }}</span>
</div>
<div class="cursor-pointer border-radius-8 p-8-16" style="background-color:#00000010 ;">
<el-dropdown @command="handleCommand">
<div class="flex-row align-items-center">
<img :src="require(`@/assets/image/${agentStatus}.png`)" alt="" class="mr-8">
<span class="el-dropdown-link" style="color: white;">
{{agentStatusName}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
</div>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="free">
空闲
</el-dropdown-item>
<el-dropdown-item command="busy">
忙碌
</el-dropdown-item>
<el-dropdown-item command="arrange">
话后整理
</el-dropdown-item>
<el-dropdown-item command="notReady">
示忙
</el-dropdown-item>
<el-dropdown-item command="rest">
小休
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<el-dropdown @command="handleCommand">
<span class="el-dropdown-link" style="color: white;">
{{agentStatusName}}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="free">空闲</el-dropdown-item>
<el-dropdown-item command="busy">忙碌</el-dropdown-item>
<el-dropdown-item command="arrange">话后整理</el-dropdown-item>
<el-dropdown-item command="notReady">示忙</el-dropdown-item>
<el-dropdown-item command="rest">小休</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <div class="flex-row justify-content-between align-items-center border-t-solid-lighter-1 p-16 cursor-pointer">
<div class="f16 color-text-regular">坐席状态</div>
<div class="f16 color-text-secondary">

5
src/pages/mediation-management/components/batchofficeWDialog.vue
View File

@ -109,7 +109,10 @@ import api from "@/services/caseManagement";
const year = nextDate.getFullYear();
const month = (nextDate.getMonth() + 1).toString().padStart(2, '0');
const day = nextDate.getDate().toString().padStart(2, '0');
this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59'
const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+
nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0');
// this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59'
this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime
this.ObjectInfo.caseIdList = this.eventTraDialog.caseids;
api.traceSignBatchCreate(this.ObjectInfo).then((res) => {

2
src/pages/mediation-page/components/cassWrit.vue
View File

@ -168,7 +168,6 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
if(!this.$clickThrottle()) { return }//防止重复点击
let data = {id: item.generateLogId}
caseManagement.traceGenerateRetry(data).then((res) => {
this.$message.success("重新生成文件成功");
@ -182,7 +181,6 @@ export default {
cancelButtonText: "取消",
type: "warning",
}).then(() => {
if(!this.$clickThrottle()) { return }//防止重复点击
let data = {id: item.generateLogId}
caseManagement.traceGenerateDelete(data).then((res) => {
this.$message.success("文书删除成功");

5
src/pages/mediation-page/components/singleofficeWritPopover.vue
View File

@ -115,7 +115,10 @@ import api from "@/services/caseManagement";
const year = nextDate.getFullYear();
const month = (nextDate.getMonth() + 1).toString().padStart(2, '0');
const day = nextDate.getDate().toString().padStart(2, '0');
this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59'
const nowtime = nextDate.getHours().toString().padStart(2, '0')+':'+
nextDate.getMinutes().toString().padStart(2, '0')+':'+nextDate.getSeconds().toString().padStart(2, '0');
// this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' 23:23:59'
this.ObjectInfo.deadline = year +'-'+ month +'-'+ day + ' '+ nowtime
this.ObjectInfo.caseId = this.caseId
api.traceSignCreate(this.ObjectInfo).then((res) => {

4
src/services/eventTracingApi.js
View File

@ -51,10 +51,10 @@ const traceApi = {
},
// 文书生成-批量重试
posttrace_generate_retryl: data => {
return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-retryl`, data)
return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-retry`, data)
},
// 文书生成-批量取消
posttrace_generate_retryl: data => {
posttrace_generate_cancel: data => {
return service.service.post(`${apiMediate}api/trace/traceGenerate/batch-cancel`, data)
},

7
src/utils/util.js
View File

@ -370,6 +370,13 @@ const util = {
const day = date.getDate().toString().padStart(2, '0'); // 日期前面补0
return `${year}-${month}-${day}`;
},
// 和当前时间对比，判断是否大于当前时间
getTimeContrast(timeString) {
const timedate = moment(timeString);
return timedate > new Date()
},
// {{scope.row.linkedSituation == 2 ?'':''}}
// {{scope.row.linkedSituation == 3 ?'':''}}
// {{scope.row.linkedSituation == 4 ?'':''}}