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