Commit 5db20f94 authored by renjintao's avatar renjintao

mornitoring 订单监控/分卡

parent cd81a8f2
...@@ -321,7 +321,6 @@ export default { ...@@ -321,7 +321,6 @@ export default {
} }
} }
}, },
params.row.finishCount //完成数 params.row.finishCount //完成数
) )
] ]
......
<template> <template>
<div class="record"> <div class="record">
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="820"></DataGrid> <Tabs value="name1">
<TabPane label="订单暂停记录" name="name1">
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="tdHeight"></DataGrid>
</TabPane>
<TabPane label="工单暂停记录" name="name2">
<DataGrid :columns="columnsProcess" ref="gridProcess" :tool="false" :height="tdHeight"></DataGrid>
</TabPane>
</Tabs>
<Modal v-model="detailModal" title="详情" width="800"> <Modal v-model="detailModal" title="详情" width="800">
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
...@@ -18,6 +25,7 @@ export default { ...@@ -18,6 +25,7 @@ export default {
return { return {
detailModal: false, detailModal: false,
action: Api.record, action: Api.record,
tdHeight: "",
condition: { condition: {
orderId: { op: "Equal", value: this.eid }, orderId: { op: "Equal", value: this.eid },
keys: { op: "pauseCause,", value: null } keys: { op: "pauseCause,", value: null }
...@@ -103,7 +111,7 @@ export default { ...@@ -103,7 +111,7 @@ export default {
); );
} }
}, },
{ {
key: "relatedPerson", key: "relatedPerson",
type: "user", type: "user",
...@@ -111,13 +119,81 @@ export default { ...@@ -111,13 +119,81 @@ export default {
align: "left", align: "left",
high: true high: true
} }
],
columnsProcess: [
{
key: "productName",
title: "工序Id",
align: "left",
width: 90
},
{
key: "productName",
title: "工序号",
align: "left",
width: 90
},
{
key: "productName",
title: "工序名称",
align: "left",
width: 350,
},
{
key: "remark",
title: "暂停原因",
align: "left"
},
{
key: "productName",
title: "暂停人",
align: "left",
high: true,
width: 180
},
{
key: "productName",
title: "暂停时间",
align: "left",
width: 180
},
{
key: "productName",
title: "恢复人",
align: "left",
width: 180
},
{
key: "productName",
title: "恢复时间",
align: "left",
width: 180
},
{
key: "productName",
title: "相关人",
align: "left",
width: "180"
}
] ]
}; };
}, },
props: { props: {
eid: Number eid: Number
}, },
created() {}, mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.tdHeight = window.screenHeight - 180;
})();
};
},
created() {
this.tdHeight = window.innerHeight - 180;
},
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
......
This diff is collapsed.
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