Commit 7cd544a2 authored by dcy's avatar dcy

操作人回显

parent 545c4421
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人"></el-table-column> <el-table-column label="操作人" prop="creator">
<template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间"> <el-table-column label="操作时间">
<template v-slot="{row}"> <template v-slot="{row}">
{{parseTime(row.createTime)}} {{parseTime(row.createTime)}}
...@@ -85,6 +89,7 @@ import { ...@@ -85,6 +89,7 @@ import {
} from "@/api/ecw/associatedOrder"; } from "@/api/ecw/associatedOrder";
import {getDictDatas,DICT_TYPE} from '@/utils/dict' import {getDictDatas,DICT_TYPE} from '@/utils/dict'
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {listSimpleUsers} from "@/api/system/user";
export default { export default {
name: "associatedOrder", name: "associatedOrder",
props:{ props:{
...@@ -114,7 +119,8 @@ export default { ...@@ -114,7 +119,8 @@ export default {
list:[], list:[],
DICT_TYPE, DICT_TYPE,
getDictDatas, getDictDatas,
multipleSelection:[] multipleSelection:[],
userList:[]
} }
}, },
created() { created() {
...@@ -125,13 +131,13 @@ export default { ...@@ -125,13 +131,13 @@ export default {
this.orderDetails = r.data; this.orderDetails = r.data;
} }
}) })
listSimpleUsers().then(r => this.userList = r.data)
}, },
methods:{ methods:{
getList(){ getList(){
guanlianList(this.params).then(r => { guanlianList(this.params).then(r => {
if(r.code === 0){ if(r.code === 0){
this.list = r.data this.list = r.data
console.log( this.list[0])
} }
}) })
}, },
......
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
<dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag> <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人"></el-table-column> <el-table-column label="操作人">
<template v-slot="{row}">
{{userList.find( i => row.creator == i.id).nickname}}
</template>
</el-table-column>
<el-table-column label="操作时间" prop="createTime"> <el-table-column label="操作时间" prop="createTime">
<template v-slot="{row}">{{ <template v-slot="{row}">{{
parseTime(row.orderBackVO.createTime) parseTime(row.orderBackVO.createTime)
...@@ -85,6 +89,7 @@ import { ...@@ -85,6 +89,7 @@ import {
} from "@/api/ecw/mutexOrder"; } from "@/api/ecw/mutexOrder";
import {getDictDatas,DICT_TYPE} from '@/utils/dict' import {getDictDatas,DICT_TYPE} from '@/utils/dict'
import Template from "@/views/cms/template"; import Template from "@/views/cms/template";
import {listSimpleUsers} from "@/api/system/user";
export default { export default {
name: "mutexOrder", name: "mutexOrder",
props:{ props:{
...@@ -104,7 +109,8 @@ export default { ...@@ -104,7 +109,8 @@ export default {
list:[], list:[],
DICT_TYPE, DICT_TYPE,
getDictDatas, getDictDatas,
multipleSelection:[] multipleSelection:[],
userList:[]
} }
}, },
created() { created() {
...@@ -115,6 +121,7 @@ export default { ...@@ -115,6 +121,7 @@ export default {
this.orderDetails = r.data; this.orderDetails = r.data;
} }
}) })
listSimpleUsers().then(r => this.userList = r.data)
}, },
methods:{ methods:{
getList(){ getList(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment