Skip to content

M
mes-ui
Commit 4921adaa authored by renjintao's avatar renjintao
Browse files
Options

monitoring

parent 524601d5
Show whitespace changes
Inline Side-by-side
Showing with 599 additions and 594 deletions
pages/order/monitoring/index.vue
View file @ 4921adaa
<template> <template>
<div class="monitoring h100"> <div class="monitoring h100">
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline style="margin-top:5px;"> <Form ref="formInline" :model="easySearch" inline style="margin-top:5px;">
...@@ -25,13 +25,7 @@ ...@@ -25,13 +25,7 @@
<Record :eid="recordId" /> <Record :eid="recordId" />
</Modal> </Modal>
<Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM"> <Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
<Speed <Speed :result="result" :load="loading" @on-close="clsoeSpeedModal" :executeId="dispatchExecuteId" :orderId="orderId" />
:result="result"
:load="loading"
@on-close="clsoeSpeedModal"
:executeId="dispatchExecuteId"
:orderId="orderId"
/>
</Modal> </Modal>
<Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend"> <Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend">
<Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120"> <Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120">
...@@ -41,12 +35,7 @@ ...@@ -41,12 +35,7 @@
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('demandFinishDate')" prop="demandFinishDate"> <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
<DatePicker <DatePicker type="date" placeholder="请选择日期" style="width:240px" v-model="recovery.demandFinishDate"></DatePicker>
type="date"
placeholder="请选择日期"
style="width:240px"
v-model="recovery.demandFinishDate"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -56,8 +45,9 @@ ...@@ -56,8 +45,9 @@
<Button type="primary" @click="changeFinishiDate">确定</Button> <Button type="primary" @click="changeFinishiDate">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import Suspend from "./suspend"; import Suspend from "./suspend";
...@@ -84,16 +74,26 @@ export default { ...@@ -84,16 +74,26 @@ export default {
laster: 0, laster: 0,
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "mesCode", value: null }, keys: {
productingpreparationpeople: { op: "Equal", value: null }, op: "mesCode",
value: null
},
productingpreparationpeople: {
op: "Equal",
value: null
},
}, },
suspendModal: false, suspendModal: false,
recordModal: false, recordModal: false,
deletelModal: false, deletelModal: false,
recycleModal: false, recycleModal: false,
curId: 0, curId: 0,
columns: [ columns: [{
{ key: "id", title: this.l("id"), hide: true, align: "left" }, key: "id",
title: this.l("id"),
hide: true,
align: "left"
},
{ {
title: "序号", title: "序号",
type: "index", type: "index",
...@@ -118,8 +118,7 @@ export default { ...@@ -118,8 +118,7 @@ export default {
params.row.mesCode, params.row.mesCode,
[ [
h( h(
"Poptip", "Poptip", {
{
props: { props: {
content: "开工预警：" + params.row.startWarning + "条", content: "开工预警：" + params.row.startWarning + "条",
trigger: "hover", trigger: "hover",
...@@ -130,8 +129,7 @@ export default { ...@@ -130,8 +129,7 @@ export default {
}, },
[ [
h( h(
params.row.startWarning > 0 ? "Badge" : "", params.row.startWarning > 0 ? "Badge" : "", {
{
props: { props: {
type: "warning", type: "warning",
// count: 2, // count: 2,
...@@ -157,8 +155,7 @@ export default { ...@@ -157,8 +155,7 @@ export default {
] ]
), ),
h( h(
"Poptip", "Poptip", {
{
props: { props: {
content: "完工预警：" + params.row.finishWarning + "条", content: "完工预警：" + params.row.finishWarning + "条",
trigger: "hover", trigger: "hover",
...@@ -166,8 +163,7 @@ export default { ...@@ -166,8 +163,7 @@ export default {
}, },
[ [
h( h(
params.row.finishWarning > 0 ? "Badge" : "", params.row.finishWarning > 0 ? "Badge" : "", {
{
props: { props: {
type: "info", type: "info",
// count: 2, // count: 2,
...@@ -243,9 +239,9 @@ export default { ...@@ -243,9 +239,9 @@ export default {
return h( return h(
"span", "span",
// this.sliceStr(params.row.actualStartDate + ' ', 0, 10), // this.sliceStr(params.row.actualStartDate + ' ', 0, 10),
params.row.actualStartDate == "0001-01-01 00:00:00" params.row.actualStartDate == "0001-01-01 00:00:00" ?
? "" "" :
: params.row.actualStartDate params.row.actualStartDate
); );
}, },
}, },
...@@ -259,16 +255,16 @@ export default { ...@@ -259,16 +255,16 @@ export default {
return h( return h(
"span", "span",
// this.sliceStr(params.row.actualFinishDate + ' ', 0, 10), // this.sliceStr(params.row.actualFinishDate + ' ', 0, 10),
params.row.actualFinishDate == "0001-01-01 00:00:00" params.row.actualFinishDate == "0001-01-01 00:00:00" ?
? "" "" :
: params.row.actualFinishDate params.row.actualFinishDate
); );
}, },
}, },
{ {
key: "routingType", key: "routingType",
title: this.l("routingType"), title: this.l("routingType"),
align: "left", align: "center",
code: "mes_xingchi_plan.order_material.routingType", code: "mes_xingchi_plan.order_material.routingType",
easy: true, easy: true,
high: true, high: true,
...@@ -282,16 +278,14 @@ export default { ...@@ -282,16 +278,14 @@ export default {
render: (h, params) => { render: (h, params) => {
return h("div", [ return h("div", [
h( h(
"ButtonGroup", "ButtonGroup", {
{
props: { props: {
shape: "circle", shape: "circle",
}, },
}, },
[ [
h( h(
"Button", "Button", {
{
style: { style: {
background: "#e4e6ed ", background: "#e4e6ed ",
borderColor: "#e4e6ed ", borderColor: "#e4e6ed ",
...@@ -305,8 +299,7 @@ export default { ...@@ -305,8 +299,7 @@ export default {
params.row.unstartCount //未开工数 params.row.unstartCount //未开工数
), ),
h( h(
"Button", "Button", {
{
style: { style: {
background: "#ffc000", background: "#ffc000",
borderColor: "#ffc000", borderColor: "#ffc000",
...@@ -337,8 +330,7 @@ export default { ...@@ -337,8 +330,7 @@ export default {
params.row.stopCount //暂停数 params.row.stopCount //暂停数
), ),
h( h(
"Button", "Button", {
{
style: { style: {
background: "#27c149", background: "#27c149",
borderColor: "#27c149", borderColor: "#27c149",
...@@ -369,12 +361,18 @@ export default { ...@@ -369,12 +361,18 @@ export default {
width: 100, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "record", class: "edit" }, oprate: "record",
on: { click: () => this.record(params.row.id) }, class: "edit"
},
on: {
click: () => this.record(params.row.id)
},
}, },
"暂停记录" "暂停记录"
), ),
...@@ -387,14 +385,16 @@ export default { ...@@ -387,14 +385,16 @@ export default {
width: 100, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
(params.row.status == 5 && params.row.upSplitId == 0) || (params.row.status == 5 && params.row.upSplitId == 0) ||
(params.row.status == 5 && (params.row.status == 5 &&
params.row.upSplitId > 0 && params.row.upSplitId > 0 &&
params.row.splitCardStatus == 1) params.row.splitCardStatus == 1) ?
? "Button" "Button" :
: "", //订单状态暂停，启动 "", //订单状态暂停，启动
{ {
props: { props: {
type: "error", type: "error",
...@@ -441,9 +441,9 @@ export default { ...@@ -441,9 +441,9 @@ export default {
"" ""
), ),
h( h(
params.row.status == 5 && params.row.splitCardStatus == 0 params.row.status == 5 && params.row.splitCardStatus == 0 ?
? "op" "op" :
: "", //订单状态执行中，暂停 "", //订单状态执行中，暂停
{ {
attrs: { attrs: {
icon: "md-sync", icon: "md-sync",
...@@ -470,19 +470,20 @@ export default { ...@@ -470,19 +470,20 @@ export default {
}, },
mesCode: "", mesCode: "",
rulesRecycle: { rulesRecycle: {
demandFinishDate: [ demandFinishDate: [{
{
required: true, required: true,
message: "请选择计划完成时间", message: "请选择计划完成时间",
trigger: "change", trigger: "change",
type: "date", type: "date",
}, }, ],
],
}, },
}; };
}, },
mounted() {}, mounted() {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -562,7 +563,9 @@ export default { ...@@ -562,7 +563,9 @@ export default {
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then((r) => { Api.delete({
id: this.curId
}).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.deletelModal = false; this.deletelModal = false;
...@@ -635,10 +638,12 @@ export default { ...@@ -635,10 +638,12 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
.ivu-btn-group > .ivu-btn { .ivu-btn-group>.ivu-btn {
height: 21px !important; height: 21px !important;
} }
.ivu-btn-group { .ivu-btn-group {
height: 21px !important; height: 21px !important;
} }
......
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