Browse Source

Merge branch 'feature-xiaowang' into feature

feature_dlt_taidong
mk 1 year ago
parent
commit
5ac7ddf71d
  1. 13
      src/views/modules/shequzhili/Delivery/index.vue
  2. 50
      src/views/modules/shequzhili/analysis/index.vue
  3. 15
      src/views/modules/shequzhili/event/cpts/process-form-complete.vue
  4. 13
      src/views/modules/shequzhili/eventHandling/index.vue

13
src/views/modules/shequzhili/Delivery/index.vue

@ -128,11 +128,12 @@
</template> -->
</el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="指派状态" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span v-if="scope.row.deliverystatus === 0">未指派</span>
<span v-else-if="scope.row.deliverystatus ===1">已指派</span>
<span v-else>--</span>
</template> -->
<template slot-scope="scope">
<span v-if="scope.row.status === 'unassigned'">未指派</span>
<span v-else-if="scope.row.status ==='assigned'">已指派</span>
<span v-else-if="scope.row.status ==='closed_case'">已办结</span>
<span v-else="scope.row.status ==='processing'">处理中</span>
</template>
</el-table-column>
<el-table-column prop="operationTypeName" align="center" width="110" label="办理状态" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
@ -152,7 +153,7 @@
<!-- <el-button @click="handleDispose(scope.row)" type="text" size="small" class="">{{scope.row.deliverystatus==0?"派件":"办理"}}</el-button>
-->
<el-button @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="(scope.row.status == 'processing'|| scope.row.status === 'assigned') && scope.row.operationType === '5'">处理</el-button>
<el-button @click="handleDispose(scope.row,'assign')" type="text" size="small" v-if="scope.row.status =='unassigned'">派件</el-button>
<el-button @click="handleDispose(scope.row,'assign')" type="text" size="small" v-if="scope.row.status =='unassigned'||scope.row.status =='processing'">派件</el-button>
<el-button @click="handleDispose(scope.row,'check')" type="text" size="small" v-if="scope.row.operationType === '11'">审核</el-button>
</template>
</el-table-column>

50
src/views/modules/shequzhili/analysis/index.vue

@ -104,9 +104,10 @@
<div style="display: flex;justify-content: space-between;flex-direction:row;">
<h1 style="font-size: 24px; font-weight: bold;"> 事件类型统计 </h1>
</div>
<el-table
<!-- <el-table
:data="tableList"
style="width: 100%;"
height="300"
row-key="id"
border
default-expand-all
@ -114,45 +115,63 @@
<el-table-column
prop="level1"
label="一级分类"
sortable
width="150">
>
</el-table-column>
<el-table-column
prop="level2"
label="二级分类"
sortable
width="150">
>
</el-table-column>
<el-table-column
prop="level3"
label="三级分类"
sortable
width="150">
>
</el-table-column>
<el-table-column
prop="level4"
label="四级分类"
sortable
width="150">
>
</el-table-column>
<el-table-column
prop="eventCount"
label="事件数量"
sortable
width="150">
>
</el-table-column>
<el-table-column
prop="proportion"
label="同级占比"
sortable
>
<template slot-scope="scope">
{{ scope.row.proportion }}%
</template>
</el-table-column>
</el-table>
</el-table> -->
<el-table
:data="tableList"
style="width: 100%;margin-bottom: 20px;"
row-key="id"
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="categoryName"
label="事件类型">
</el-table-column>
<el-table-column
prop="eventCount"
label="事件数量">
</el-table-column>
<el-table-column
prop="proportion"
label="同级占比"
>
</el-table-column>
</el-table>
<div style="display: flex;justify-content: space-between;flex-direction:row; height:500px">
<div style="display: flex;width: 49%; flex-direction:column;">
<h1 style="font-size: 24px; font-weight: bold; margin: 20px 0;"> 部门科室工单量统计 </h1>
@ -871,7 +890,8 @@ export default {
}
const { data, code, msg } = await requestPost(url, param);
if (code === 0) {
this.tableList=this.flattenTree(data);
this.tableList=data
// this.tableList=this.flattenTree(data);
console.log(this.tableList);
console.log(this.tableList,"lksdjfklj s");
} else {

15
src/views/modules/shequzhili/event/cpts/process-form-complete.vue

@ -270,6 +270,20 @@ export default {
contactFailureList: [{ label: '已接通', value: 1 }, { label: '未接通', value: 0 }],
coordinateList: [{ label: '配合', value: 0 }, { label: '未配合', value: 1 }],
examineList: [{ label: '合格', value: 0 }, { label: '不合格', value: 1 }],
satisfactionType : [
{
label: '满意',
value: 'perfect'
},
{
label: '基本满意',
value: 'good'
},
{
label: '不满意',
value: 'bad'
}
],
dataRule: {
content: [
{ required: true, message: "办理情况不能为空", trigger: "blur" },
@ -339,6 +353,7 @@ export default {
console.log(newVal,'bianle');
if(this.pageType === 'check'){
this.formData = newVal;
console.log(this.formData);
if(this.formData.internalFile){
this.imgList = this.formData.internalFile.filter(item=>item.type==='image')
this.audioList = this.formData.internalFile.filter(item=>item.type==='voice')

13
src/views/modules/shequzhili/eventHandling/index.vue

@ -116,13 +116,14 @@
<el-table-column prop="limitTime" align="center" width="110" label="办结时限(部门)" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="statusName" align="center" width="110" label="办理状态"
<el-table-column prop="status" align="center" width="110" label="办理状态"
:show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span v-if="scope.row.handlestatus === 0">联系当事人超期</span>
<span v-else-if="scope.row.handlestatus ===1">部门办结超期</span>
<span v-else>--</span>
</template> -->
<template slot-scope="scope">
<span v-if="scope.row.status === 'unassigned'">未指派</span>
<span v-else-if="scope.row.status ==='assigned'">已指派</span>
<span v-else-if="scope.row.status ==='closed_case'">已办结</span>
<span v-else="scope.row.status ==='processing'">处理中</span>
</template>
</el-table-column>
<el-table-column prop="limitStatus" align="center" width="110" label="办理超期"
:show-overflow-tooltip="true">

Loading…
Cancel
Save