|
|
@@ -26,7 +26,7 @@
|
|
|
align="center"
|
|
|
>
|
|
|
<vxe-column type="seq" width="50"></vxe-column>
|
|
|
- <vxe-column type="expand" width="50">
|
|
|
+ <vxe-column type="expand" width="40">
|
|
|
<template #content="{ row }">
|
|
|
<!--流程节点-->
|
|
|
<template v-if="row.traceStyle === 0">
|
|
|
@@ -40,8 +40,13 @@
|
|
|
</template>
|
|
|
<!--发布-->
|
|
|
<template v-if="row.traceStyle === 1">
|
|
|
- <div class="mb5"><el-text tag="b">发布状态：</el-text>：{{ row.handleModeText }}</div>
|
|
|
- <div class="mb10 formatted-text"><el-text tag="p" class="font-bold">办理意见：</el-text>{{ row.arrangeOpinion }}</div>
|
|
|
+ <div class="mb5"><el-text tag="b">发布状态：</el-text>{{ row.handleModeText }}</div>
|
|
|
+ <div class="mb10 formatted-text">
|
|
|
+ <el-text tag="p" class="font-bold" v-if="row.arrangeOpinion">办理意见：</el-text>{{ row.arrangeOpinion }}
|
|
|
+ </div>
|
|
|
+ <div class="mb10 formatted-text">
|
|
|
+ <el-text tag="p" class="font-bold" v-if="row.opinion">{{ row.handleModeTypeText }}：</el-text>{{ row.opinion }}
|
|
|
+ </div>
|
|
|
</template>
|
|
|
<!--回访-->
|
|
|
<template v-if="row.traceStyle === 2">
|
|
|
@@ -68,6 +73,11 @@
|
|
|
<el-col>
|
|
|
<div class="mb5 formatted-text"><el-text tag="p" class="font-bold">部门回访内容：</el-text>{{ item.visitContent }}</div>
|
|
|
</el-col>
|
|
|
+ <el-col v-if="row.opinion">
|
|
|
+ <div class="mb10 formatted-text">
|
|
|
+ <el-text tag="p" class="font-bold">{{ row.handleModeTypeText }}：</el-text>{{ row.opinion }}
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -82,7 +92,7 @@
|
|
|
</template>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
- <vxe-column field="creationTime" title="建立时间" width="160">
|
|
|
+ <vxe-column field="creationTime" title="建立时间" width="150">
|
|
|
<template #default="{ row }">
|
|
|
{{ formatDate(row.creationTime, 'YYYY-mm-dd HH:MM:SS') }}
|
|
|
</template>
|
|
|
@@ -93,27 +103,28 @@
|
|
|
<vxe-column field="acceptorName" title="接办人" width="120"></vxe-column>
|
|
|
<vxe-column field="acceptorOrgName" title="接办部门" width="140"></vxe-column>
|
|
|
<vxe-column field="handlerName" title="办理人" width="120"></vxe-column>
|
|
|
- <vxe-column field="acceptTime" title="签收时间" width="160">
|
|
|
+ <vxe-column field="acceptTime" title="签收时间" width="150">
|
|
|
<template #default="{ row }">
|
|
|
{{ formatDate(row.acceptTime, 'YYYY-mm-dd HH:MM:SS') }}
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
- <vxe-column field="handleTime" title="办理时间" width="160">
|
|
|
+ <vxe-column field="handleTime" title="办理时间" width="150">
|
|
|
<template #default="{ row }">
|
|
|
{{ formatDate(row.handleTime, 'YYYY-mm-dd HH:MM:SS') }}
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
- <vxe-column field="stepExpiredTime" title="期满时间" width="160">
|
|
|
+ <vxe-column field="stepExpiredTime" title="期满时间" width="150">
|
|
|
<template #default="{ row }">
|
|
|
{{ formatDate(row.stepExpiredTime, 'YYYY-mm-dd HH:MM:SS') }}
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
- <vxe-column field="expiredStatusText" title="状态" width="110"></vxe-column>
|
|
|
- <vxe-column field="handleModeText" title="流转状态" width="100">
|
|
|
+ <vxe-column field="expiredStatusText" title="超期状态" width="80"></vxe-column>
|
|
|
+ <vxe-column field="handleModeText" title="流转状态" width="90">
|
|
|
<template #default="{ row }">
|
|
|
<el-text :type="row.handleMode !== 0 ? 'danger' : ''">{{ row.handleModeText }}</el-text>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
+ <vxe-column field="opinionResult" title="结果" width="80"></vxe-column>
|
|
|
<vxe-column title="是否会签" width="90">
|
|
|
<template #default="{ row }">
|
|
|
<template v-if="row.traces && row.traces.length">
|
|
|
@@ -303,19 +314,6 @@ const formatTraces = (val: any) => {
|
|
|
if (!val || !val.length) return [];
|
|
|
val.forEach((item: any) => {
|
|
|
item.files = transformFileNew(item.fileJson);
|
|
|
- if (item.traceStyle === 1) {
|
|
|
- // 发布需要特殊处理
|
|
|
- if (item.publishState !== null) item.handleModeText = item.publishState ? '公开' : '不公开';
|
|
|
- else item.handleModeText = '';
|
|
|
- }
|
|
|
- if (item.traceStyle === 2) {
|
|
|
- // 回访需要特殊处理
|
|
|
- item.handleModeText = item.orderFlowVisitDetails
|
|
|
- .map((item: any) => {
|
|
|
- return item.orgProcessingResults;
|
|
|
- })
|
|
|
- .join(',');
|
|
|
- }
|
|
|
// 需要给意见做一个映射关系 正常就是办理意见 其他状态就是其他意见 比如重办就是重办意见
|
|
|
switch (item.handleMode) {
|
|
|
case 0:
|
|
|
@@ -330,6 +328,9 @@ const formatTraces = (val: any) => {
|
|
|
case 201:
|
|
|
item.handleModeTypeText = '重办意见';
|
|
|
break;
|
|
|
+ case 203:
|
|
|
+ item.handleModeTypeText = '发布退回意见';
|
|
|
+ break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
zhangchong