Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
ba3400a014
|
|
@ -34,6 +34,11 @@
|
|||
<el-descriptions-item label="处理人">{{
|
||||
mlogItem.handle_user_name
|
||||
}}</el-descriptions-item>
|
||||
<template v-for="item in oinfo_json" :key="item">
|
||||
<el-descriptions-item :label="item.key" >
|
||||
{{item.value}}
|
||||
</el-descriptions-item>
|
||||
</template>
|
||||
<el-descriptions-item label="开始时间">{{
|
||||
mlogItem.work_start_time
|
||||
}}</el-descriptions-item>
|
||||
|
|
@ -388,6 +393,7 @@ export default {
|
|||
},
|
||||
fileList:[],
|
||||
tableDataWm:[],
|
||||
oinfo_json:[],
|
||||
test_file:'',
|
||||
deptId: "",
|
||||
visible: false,
|
||||
|
|
@ -448,6 +454,15 @@ export default {
|
|||
let that = this;
|
||||
that.$API.wpm.mlog.item.req(that.mlogId).then((res) => {
|
||||
that.mlogItem = res;
|
||||
that.oinfo_json = [];
|
||||
if(res.oinfo_json_){
|
||||
for(let key in res.oinfo_json_){
|
||||
let obj = {};
|
||||
obj.key = key;
|
||||
obj.value = res.oinfo_json_[key];
|
||||
that.oinfo_json.push(obj);
|
||||
}
|
||||
}
|
||||
that.routeId = res.route;
|
||||
that.tracking = res.material_in_.tracking;
|
||||
if(res.test_file!==null){
|
||||
|
|
|
|||
Loading…
Reference in New Issue