Commit 85a46678 authored by renjintao's avatar renjintao

aps/

parent d236e896
...@@ -928,6 +928,11 @@ export default { ...@@ -928,6 +928,11 @@ export default {
id: '', id: '',
part_task_pk: '计划编号', part_task_pk: '计划编号',
mes_code: '计划编号', mes_code: '计划编号',
urgency_level: '紧急程度',
batchnum: '批次号',
drawingnum: '图号',
project_no: '项目号',
product_name: '产品名称',
priority: '优先级', priority: '优先级',
plan_qty: '排产数量', plan_qty: '排产数量',
spare_qty: '备件数量', spare_qty: '备件数量',
......
...@@ -146,16 +146,50 @@ export default { ...@@ -146,16 +146,50 @@ export default {
category: "icon" category: "icon"
}, },
{ {
key: "mes_code", key: "mesCode",
title: this.l("mes_code"), title: this.l("mes_code"),
align: "left", align: "left",
high: true,
width: 240,
},
{
key: "product_name",
title: this.l("product_name"),
align: "left",
high: true
},
{
key: "drawingnum",
title: this.l("drawingnum"),
align: "left",
high: true
},
{
key: "project_no",
title: this.l("project_no"),
align: "left",
high: true high: true
}, },
{
key: "batchnum",
title: this.l("batchnum"),
align: "left",
high: true
},
{
key: "urgency_level",
title: this.l("urgency_level"),
align: "left",
high: true,
code: "plan.order.urgencyLevel",
width: 100,
},
{ {
key: "priority", key: "priority",
title: this.l("priority"), title: this.l("priority"),
align: "left", align: "left",
high: true, high: true,
hide: true,
render: (h, params) => { render: (h, params) => {
return h("span", {}, params.index + 1); return h("span", {}, params.index + 1);
} }
...@@ -163,14 +197,15 @@ export default { ...@@ -163,14 +197,15 @@ export default {
{ {
key: "plan_qty", key: "plan_qty",
title: this.l("plan_qty"), title: this.l("plan_qty"),
align: "left", align: "right",
width: 100,
high: true, high: true,
sortable: true
}, },
{ {
key: "spare_qty", key: "spare_qty",
title: this.l("spare_qty"), title: this.l("spare_qty"),
align: "left", align: "right",
width: 100,
high: true high: true
}, },
{ {
...@@ -180,7 +215,7 @@ export default { ...@@ -180,7 +215,7 @@ export default {
high: true, high: true,
hide: true, hide: true,
resizable: true, resizable: true,
width: 140 width: 150
}, },
{ {
key: "plan_finish", key: "plan_finish",
...@@ -190,7 +225,7 @@ export default { ...@@ -190,7 +225,7 @@ export default {
hide: true, hide: true,
sortable: true, sortable: true,
resizable: true, resizable: true,
width: 140 width: 150
}, },
{ {
key: "notes", key: "notes",
...@@ -205,7 +240,7 @@ export default { ...@@ -205,7 +240,7 @@ export default {
title: this.l("demand_start"), title: this.l("demand_start"),
align: "center", align: "center",
resizable: true, resizable: true,
width: 140 width: 150
}, },
{ {
key: "demand_finish", key: "demand_finish",
...@@ -213,7 +248,7 @@ export default { ...@@ -213,7 +248,7 @@ export default {
align: "center", align: "center",
high: true, high: true,
resizable: true, resizable: true,
width: 140 width: 150
}, },
{ {
key: "badjustflag", key: "badjustflag",
...@@ -235,7 +270,7 @@ export default { ...@@ -235,7 +270,7 @@ export default {
icon: "md-options", icon: "md-options",
type: "icon", type: "icon",
title: "工序参数设置", title: "工序参数设置",
oprate: "edit", oprate: "edit"
}, },
on: { click: () => this.openAddModel(2, params.row) } on: { click: () => this.openAddModel(2, params.row) }
}), }),
......
...@@ -33,16 +33,17 @@ ...@@ -33,16 +33,17 @@
<Search /> <Search />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="addModal=true">新增</Button> <Button type="primary" @click="addModal=true">创建</Button>
<Button type="primary" >修改</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="addModal" title="新增" footer-hide> <Modal v-model="addModal" title="新增" footer-hide width="1000">
<Add @on-close="cancel" @on-ok="addOk" /> <Add @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="编辑" footer-hide width="1000">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="detailModal" title="详情"> <Modal v-model="detailModal" title="详情" width="1000">
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
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