Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
721ddd7b17
|
@ -45,10 +45,10 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="处理人">
|
||||
<template #default="scope">{{ scope.row.handle_user }}</template>
|
||||
<template #default="scope">{{ scope.row.handle_user_name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="处理时间">
|
||||
<template #default="scope">{{ scope.row.handle_user }}</template>
|
||||
<template #default="scope">{{ scope.row.handle_time }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" align="center" width="120px">
|
||||
<template #default="scope">
|
||||
|
@ -66,32 +66,34 @@
|
|||
<el-form :model="eventItem" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="所属部门:">{{ eventItem.deptName }}</el-form-item>
|
||||
<el-form-item label="所属部门:">{{ eventItem.belong_dept}}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="所属工段:">{{ eventItem.mgroupName }}</el-form-item>
|
||||
<el-form-item label="所属工段:">{{ eventItem.enm_data.mgroup_name }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="所在班组:">{{ eventItem.teamName }}</el-form-item>
|
||||
<el-form-item label="所在班组:">{{ eventItem.enm_data.team_name }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="所在班次:">{{ eventItem.shiftName }}</el-form-item>
|
||||
<el-form-item label="所在班次:">{{ eventItem.enm_data.shift_name }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="发生时间:">{{ eventItem.production_date }}</el-form-item>
|
||||
<el-form-item label="发生时间:">{{ eventItem.create_time }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="发生类型:">{{ eventItem.buy_date }}</el-form-item>
|
||||
<el-form-item label="发生类型:">{{ eventItem.cates_[0].name }}</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<!-- <el-col :span='12'>
|
||||
<el-form-item label="状态:">{{ eventItem.buy_date }}</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span='12'>
|
||||
<el-form-item label="处理人:">{{ eventItem.buy_date }}</el-form-item>
|
||||
<el-form-item label="处理人:">
|
||||
<el-form-item >{{ eventItem.handle_user_name }}</el-form-item>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span='12'>
|
||||
<!-- <el-col :span='12'>
|
||||
<el-form-item label="备注:">{{ eventItem.buy_date }}</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
@ -100,7 +102,7 @@
|
|||
<el-descriptions-item label="事件标记">{{ mark_options2[eventItem.mark] }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处理人">
|
||||
<span v-if="eventItem.handle_user"></span>{{ eventItem.handle_user_name }}
|
||||
<span v-if="eventItem.handle_user_name"></span>{{ eventItem.handle_user_name }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="处理时间">
|
||||
{{ eventItem.handle_time }}
|
||||
|
@ -134,7 +136,7 @@
|
|||
<el-button type="primary" @click="onSubmit">保存</el-button>
|
||||
</div>
|
||||
</el-card>
|
||||
<el-card header="事件推送情况" style="margin-top: 8px">
|
||||
<!-- <el-card header="事件推送情况" style="margin-top: 8px">
|
||||
<scTable ref="table" :data="remindData" row-key="id" fit stripe hidePagination hideRefresh hideDo>
|
||||
<el-table-column label="#" type="index" width="50"></el-table-column>
|
||||
<el-table-column label="事件种类" width="200">
|
||||
|
@ -168,7 +170,7 @@
|
|||
|
||||
<el-table-column label="发送时间" prop="create_time"></el-table-column>
|
||||
</scTable>
|
||||
</el-card>
|
||||
</el-card> -->
|
||||
</el-drawer>
|
||||
<el-dialog title="提醒配置" width="50%" v-model="visible" :append-to-body="true">
|
||||
<el-form :model="cateItem" label-width="100px">
|
||||
|
@ -206,6 +208,7 @@ export default {
|
|||
},
|
||||
cateItem: {},
|
||||
eventItem: {},
|
||||
userName: '',
|
||||
eventID: '',
|
||||
mark_options2: {
|
||||
10: "正常",
|
||||
|
@ -225,7 +228,10 @@ export default {
|
|||
created() {
|
||||
this.getSetting();
|
||||
},
|
||||
mounted() { },
|
||||
mounted() {
|
||||
var userInfo = this.$TOOL.data.get("USER_INFO");
|
||||
this.userName = userInfo.username;
|
||||
},
|
||||
methods: {
|
||||
getSetting() {
|
||||
this.$API.ecm.event_cate.list.req({ page: 0 }).then((res) => {
|
||||
|
@ -262,9 +268,11 @@ export default {
|
|||
table_handle(row) {
|
||||
this.eventID = row.id;
|
||||
this.showLimited = true;
|
||||
this.$nextTick(() => {
|
||||
this.$refs.handleDialog.open("edit").setData(row);
|
||||
});
|
||||
this.eventItem = row;
|
||||
console.log(row);
|
||||
// this.$nextTick(() => {
|
||||
// this.$refs.handleDialog.open("edit").setData(row);
|
||||
// });
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.selectionList = val;
|
||||
|
|
Loading…
Reference in New Issue