yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改待办任务列表、已办任务列表去掉查看列表，由点击当前环节查看审批记录，修改审批记录页面样式

master
yunuo970428 3 years ago
parent
3275ddc259
commit
3d07972e36
4 changed files with 64 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 67
      anrui-system-ui/src/components/flow/flowRecord.vue
  2. 2
      anrui-system-ui/src/styles/index.scss
  3. 30
      anrui-system-ui/src/views/flow/doneList.vue
  4. 26
      anrui-system-ui/src/views/flow/todoList.vue

67
anrui-system-ui/src/components/flow/flowRecord.vue
View File

@ -1,40 +1,34 @@
<template> <template>
<div> <div>
<!--流程流转记录--> <!--流程流转记录-->
<el-card > <el-card>
<el-col :span="24" > <el-col :span="24">
<div > <div>
<div style="width:50%;float:left; border:1px solid #000;"> <div style="width:50%;float:left;">
<span class="el-icon-picture-outline">流程图</span> <span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskData"></flow> <flow :xmlData="xmlData" :taskData="taskData"></flow>
</div> </div>
<div style="width:50%;;float:left; border:1px solid #000;" > <div style="width:50%;;float:left;">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item v-for="(item,index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)" :color="setColor(item.finishTime)">
v-for="(item,index ) in flowRecordList" <p style="font-weight: 700">{{ item.taskName }}</p>
:key="index"
:icon="setIcon(item.finishTime)"
:color="setColor(item.finishTime)"
>
<p style="font-weight: 700">{{item.taskName}}</p>
<el-card :body-style="{ padding: '10px' }"> <el-card :body-style="{ padding: '10px' }">
<label v-if="item.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理： <label v-if="item.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理：
<span v-for="(items,indexs ) in item.taskUserInfos" :key="indexs">{{items.assigneeName}},</span> <span v-for="(items, index ) in item.taskUserInfos" :key="index">{{ items.assigneeName }},</span>
<!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>--> <!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
</label> </label>
<label v-if="item.candidate" <label v-if="item.candidate" style="font-weight: normal;margin-right: 30px;">候选办理：{{ item.candidate }}</label><br>
style="font-weight: normal;margin-right: 30px;">候选办理：{{item.candidate}}</label><br> <label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{ item.createTime }}</label><br>
<label style="font-weight: normal">接收时间： </label><label style="color:#8a909c;font-weight: normal">{{item.createTime}}</label><br> <label v-if="item.finishTime" style="font-weight: normal">办理时间： </label>
<label v-if="item.finishTime" style="font-weight: normal">办结时间： </label> <label style="color:#8a909c;font-weight: normal">{{ item.finishTime }}</label><br>
<label style="color:#8a909c;font-weight: normal">{{item.finishTime}}</label><br>
<label v-if="item.duration" style="font-weight: normal">耗时：</label> <label v-if="item.duration" style="font-weight: normal">耗时：</label>
<label style="color:#8a909c;font-weight: normal">{{item.duration}}</label> <label style="color:red;font-weight: normal">{{ item.duration }}</label>
<p v-if="item.comment"> <p v-if="item.comment">
<el-tag type="success" v-if="item.comment.type === '1'"> {{item.comment.comment}}</el-tag> <el-tag type="success" v-if="item.comment.type === '1'"> {{ item.comment.comment }}</el-tag>
<el-tag type="warning" v-if="item.comment.type === '2'"> {{item.comment.comment}}</el-tag> <el-tag type="warning" v-if="item.comment.type === '2'"> {{ item.comment.comment }}</el-tag>
<el-tag type="danger" v-if="item.comment.type === '3'"> {{item.comment.comment}}</el-tag> <el-tag type="danger" v-if="item.comment.type === '3'"> {{ item.comment.comment }}</el-tag>
<el-tag type="danger" v-if="item.comment.type === '7'"> {{item.comment.comment}}</el-tag> <el-tag type="danger" v-if="item.comment.type === '7'"> {{ item.comment.comment }}</el-tag>
<el-tag type="danger" v-if="item.comment.type === '6'"> {{item.comment.comment}}</el-tag> <el-tag type="danger" v-if="item.comment.type === '6'"> {{ item.comment.comment }}</el-tag>
</p> </p>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
@ -46,9 +40,10 @@
</div> </div>
</template> </template>
<script> <script>
import flow from "@C/flow/flow"; import flow from '@C/flow/flow'
export default { export default {
name: "flowRecords", name: 'flowRecords',
components: { components: {
flow flow
}, },
@ -67,25 +62,31 @@ export default {
} }
}, },
data() { data() {
return {}; return {}
}, },
created() { created() {
}, },
methods:{ methods: {
setIcon(val) { setIcon(val) {
if (val) { if (val) {
return "el-icon-check"; return 'el-icon-check'
} else { } else {
return "el-icon-time"; return 'el-icon-time'
} }
}, },
setColor(val) { setColor(val) {
if (val) { if (val) {
return "#2bc418"; return '#2bc418'
} else { } else {
return "#b3bdbb"; return '#b3bdbb'
} }
} }
} }
}; }
</script> </script>
<style scoped>
.el-tag {
white-space: normal;
height: auto;
}
</style>

2
anrui-system-ui/src/styles/index.scss
View File

@ -72,7 +72,7 @@ div:focus {
box-sizing: border-box; box-sizing: border-box;
padding: 10px 0; padding: 10px 0;
} }
.bluezi{color: $header-bg; cursor: pointer}
.fl{ .fl{
float: left; float: left;
} }

30
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -47,41 +47,41 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="工作名称" align="center"> <el-table-column label="工作名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.procDefName}}</span> <span>{{scope.row.procDefName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发起人" align="center"> <el-table-column label="发起人" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.startUserName}}</span> <span>{{scope.row.startUserName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发起日期" align="center"> <el-table-column label="发起日期" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.createTime|formatTimer}}</span> <span>{{scope.row.createTime|formatTimer}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发起部门" align="center"> <el-table-column label="发起部门" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.startDeptName}}</span> <span>{{scope.row.startDeptName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前处理人" align="center"> <el-table-column label="当前处理人" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.endTime!=null" class="bluezi"></span> <span v-if="scope.row.endTime!=null"></span>
<span v-else class="bluezi">{{scope.row.assigneeName}}</span> <span v-else>{{scope.row.assigneeName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前环节" align="center"> <el-table-column label="当前环节" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.endTime!=null" class="bluezi">已办结</span> <span v-if="scope.row.endTime!=null" class="bluezi" @click="handleFlowRecord(scope.row)">已办结</span>
<span v-else class="bluezi">{{scope.row.taskName}}</span> <span v-else class="bluezi" @click="handleFlowRecord(scope.row)">{{scope.row.taskName}}</span>
</template>
</el-table-column>
<el-table-column width="80px" label="审批记录" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleFlowRecord(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column width="80px" label="审批记录" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="primary" size="small" @click="handleFlowRecord(scope.row)">查看</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -254,8 +254,8 @@ import flowRecords from '@/components/flow/flowRecord'
} }
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') { if (response.code === '200') {
this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else { } else {
this.$notify({ this.$notify({
title: '提示', title: '提示',

26
anrui-system-ui/src/views/flow/todoList.vue
View File

@ -47,39 +47,39 @@
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="工作名称" align="center"> <el-table-column label="工作名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.procDefName}}</span> <span>{{scope.row.procDefName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100px" label="发起人" align="center"> <el-table-column width="100px" label="发起人" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.startUserName}}</span> <span>{{scope.row.startUserName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100px" label="发起日期" align="center"> <el-table-column width="100px" label="发起日期" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.createTime|formatTimer}}</span> <span>{{scope.row.createTime|formatTimer}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发起部门" align="center"> <el-table-column label="发起部门" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.startDeptName}}</span> <span>{{scope.row.startDeptName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100px" label="提交日期" align="center"> <el-table-column width="100px" label="提交日期" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.processCreateTime|formatTimer}}</span> <span>{{scope.row.processCreateTime|formatTimer}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="当前环节" align="center"> <el-table-column label="当前环节" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="bluezi">{{scope.row.taskName}}</span> <span class="bluezi" @click="handleFlowRecord(scope.row)">{{scope.row.taskName}}</span>
</template>
</el-table-column>
<el-table-column width="80px" label="审批记录" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleFlowRecord(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column width="80px" label="审批记录" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="primary" size="small" @click="handleFlowRecord(scope.row)">查看</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
@ -285,8 +285,8 @@ export default {
} }
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') { if (response.code === '200') {
this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
console.log('已办拼接url:',this.url) console.log('已办拼接url:',this.url)
} else { } else {
this.$notify({ this.$notify({

Write Preview
Loading…
Cancel
Save