Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -2,3 +2,8 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
@media screen and (max-width: 1366px) {
|
||||||
|
.el-message {
|
||||||
|
min-width: 200px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -265,18 +265,20 @@
|
|||||||
prop="name"
|
prop="name"
|
||||||
label="任务步骤"
|
label="任务步骤"
|
||||||
align="center"
|
align="center"
|
||||||
width="120"
|
width="130"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="assignee"
|
prop="assignee"
|
||||||
label="任务受理人"
|
label="任务受理人"
|
||||||
align="center"
|
align="center"
|
||||||
|
width="130"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="createTime"
|
prop="createTime"
|
||||||
label="创建时间"
|
label="创建时间"
|
||||||
|
width="130"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
@@ -285,6 +287,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="endTime"
|
prop="endTime"
|
||||||
label="完成时间"
|
label="完成时间"
|
||||||
|
width="130"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
|
||||||
@@ -293,6 +296,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="comment"
|
prop="comment"
|
||||||
label="流程信息"
|
label="流程信息"
|
||||||
|
width="130"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.commentText }}</span>
|
<span>{{ scope.row.commentText }}</span>
|
||||||
@@ -492,6 +496,12 @@
|
|||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/phone';
|
@import '~@/assets/styles/phone';
|
||||||
.phoneBzjdStep4 {
|
.phoneBzjdStep4 {
|
||||||
|
.prc-content-border {
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
/deep/.prc-content-border .el-form-item__content {
|
||||||
|
width: 270px;
|
||||||
|
}
|
||||||
.headerTabs {
|
.headerTabs {
|
||||||
height: 52px;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
Reference in New Issue
Block a user