【修改】修改流程传参 修改名称样式
This commit is contained in:
@@ -9,15 +9,15 @@
|
||||
height: '48px'}"
|
||||
border
|
||||
@sort-change="sortChange">
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="orgName"
|
||||
align="center"
|
||||
label="审批人所在部门">
|
||||
<template slot-scope="scope">
|
||||
<span >{{ scope.row.orgName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column-->
|
||||
<!-- show-overflow-tooltip-->
|
||||
<!-- prop="orgName"-->
|
||||
<!-- align="center"-->
|
||||
<!-- label="审批人所在部门">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span >{{ scope.row.orgName }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
prop="assignee"
|
||||
align="center"
|
||||
@@ -53,9 +53,9 @@
|
||||
align="center"
|
||||
label="开始时间"
|
||||
prop="startTime"
|
||||
sortable="custom">
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.startTime ? formatIssueDate(scope.row.startTime) : '' }}</span>
|
||||
<span> {{formatDate(scope.row.startTime,"yyyy-mm-dd hh:mm:ss")}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -64,11 +64,12 @@
|
||||
align="center"
|
||||
label="完成时间"
|
||||
prop="endTime"
|
||||
sortable="custom">
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.endTime ? formatIssueDate(scope.row.endTime) : '' }}</span>
|
||||
</template>
|
||||
<span>{{formatDate(scope.row.endTime?scope.row.endTime:'',"yyyy-mm-dd hh:mm:ss")}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
width="150px"
|
||||
@@ -106,12 +107,17 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import { formatDate } from '@/utils/date'
|
||||
export default {
|
||||
name: 'approvalHistory',
|
||||
props: ['query'],
|
||||
props: {
|
||||
prcNum:{
|
||||
type:String
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
formatDate,
|
||||
loading: false,
|
||||
standTableList: [],
|
||||
importModalshowflagtemp: false,
|
||||
@@ -147,10 +153,10 @@ export default {
|
||||
},
|
||||
getListByInstance (form) {
|
||||
this.$api.process.getHistory({
|
||||
prcNum: this.query.prcNum,
|
||||
prcNum: this.prcNum,
|
||||
...form
|
||||
}).then(res => {
|
||||
this.standTableList = res
|
||||
this.standTableList = res.data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user