Skip to content

M
mes-ui
Commit 0b31c683 authored by renjintao's avatar renjintao
Browse files
Options

plan

parent 504ff885
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 18 deletions
components/page/dataGrid.vue
View file @ 0b31c683
......@@ -42,6 +42,7 @@
:height="tableHeight"
:draggable="draggable"
:size="size"
:row-key="rowKey"
ref="table"
class="tableCommon"
@on-expand="expand"
......@@ -235,6 +236,9 @@ export default {
span: {
type: Number,
default: 24
},
rowKey:{
type:[String,Number]
}
},
created() {
......
pages/mesPlan/index.vue
View file @ 0b31c683
......@@ -15,13 +15,22 @@
</div>
</Sider>
<Content class="content">
<DataGrid :columns="columns" ref="grid" :action="action">
<DataGrid
:columns="columns"
ref="grid"
:data="listTemp"
@on-selection-change="onSelect"
:batch="true"
:border="false"
:rowKey="id"
>
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入关键字订单编号/备注/任务节点要求/产品序号:No1~No99/产品名称/图号/批次号/项目号"
placeholder="请输入关键字订单编号/产品名称"
v-model="easySearch.keys.value"
style="width:240px;"
/>
</FormItem>
<FormItem>
......@@ -34,16 +43,19 @@
</template>
<template slot="buttons">
<Button type="primary" @click="addModal=true">创建</Button>
<Button type="primary" >修改</Button>
</template>
<template slot="batch">
<Button type="primary" class="mr10 ml10">订单派发</Button>
<Button type="primary" class="mr10 ml10">批量删除</Button>
</template>
</DataGrid>
<Modal v-model="addModal" title="新增" footer-hide width="1000">
<Add @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="editModal" title="编辑" footer-hide width="1000">
<Modal v-model="editModal" title="编辑" footer-hide width="1000">
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情" width="1000">
<Modal v-model="detailModal" title="详情" width="1000">
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......@@ -71,8 +83,7 @@ export default {
action: Api.index,
easySearch: {
keys: {
op:
"mesCode,productCode,productName,drawnNumber,batchNumber,projectNumber",
op: "mesCode,productName",
value: null
}
},
......@@ -81,25 +92,39 @@ export default {
detailModal: false,
deletelModal: false,
curId: 0,
id:"id",
columns: [
{
key: "selection",
type: "selection",
width: 50,
align: "center"
},
{
key: "id",
title: this.l("id"),
hide:true,
},
{
key: "mesCode",
title: this.l("mesCode"),
align: "left",
width: 240,
easy: true,
high: true
high: true,
tree: true
},
{
key: "taskType",
title: this.l("taskType"),
align: "left",
align: "center",
high: true,
code: "mes.mes_plan.task_type"
code: "plan.order.taskType"
},
{
key: "quantity",
title: this.l("quantity"),
align: "left",
align: "right",
high: true
},
{
......@@ -113,9 +138,9 @@ export default {
{
key: "status",
title: this.l("status"),
align: "left",
align: "center",
high: true,
code: "mes.mes_plan.status"
code: "plan.order.status"
},
{
key: "productCode",
......@@ -158,7 +183,7 @@ export default {
title: this.l("urgencyLevel"),
align: "left",
high: true,
code: "mes.mes_plan.urgency_level"
code: "plan.order.urgencyLevel"
},
{
key: "productingPreparationPeople",
......@@ -205,7 +230,7 @@ export default {
{
title: "操作",
key: "action",
width: 140,
width: 180,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -232,12 +257,200 @@ export default {
on: { click: () => this.remove(params.row.id) }
},
"删除"
),
h(
"op",
{
attrs: { oprate: "remove" },
on: { click: () => this.remove(params.row.id) }
},
"分解"
)
]);
}
}
],
treeData: [],
listTemp: [
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: true,
children: [
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13_01",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false
}
]
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_14",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
},
{
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5",
creationTime: "2020-04-09 17:32:06",
creatorUserId: 0,
demandFinishDate: "2020-04-10 00:00:00",
demandStartDate: "2020-04-09 00:00:00",
designer: "",
drawnNumber: "TY9-06-0803",
functionaryOffice: "",
guestName: "",
id: 540,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_15",
modelVersion: "",
officeFunctionary: "",
orderQuotationStatus: 0,
outerDrawnNumber: "",
outer_Envelope_Size: "4",
printSupply: "",
productId: 27,
productName: "气源分配器壳体",
projectNumber: "5",
putintDocmentCode: "5",
quantity: 10,
remark: "555",
rootCode: "DDBH_20200409_13",
rootId: 540,
routing_Method: "1",
stage: "1",
status: 13,
taskCode: "5",
taskInputDate: "2020-04-09 17:32:06",
taskRequire: "5",
taskType: "1",
technologyDocmentCode: "5",
upId: 0,
urgencyLevel: "1",
_disabled: false,
}
],
treeData: [],
treeInputSearch: "",
ocolumn: [],
treeHeight: "",
......@@ -379,11 +592,11 @@ export default {
let vkey = "mes_plan" + "." + key;
return this.$t(vkey) || key;
},
//new start
//new tree start
initTree() {
var sumData = [];
this.$http.order.getallselecttree().then(res => {
alert(JSON.stringify(res))
//alert(JSON.stringify(res))
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
......@@ -455,6 +668,18 @@ export default {
data.title
);
},
//new tree end
//list start
onSelect(a, b) {
alert(JSON.stringify(a));
//批量选择
let selectRows = a;
this.arrPartPkId = [];
// selectRows.forEach(e => {
// this.arrPartPkId.push(e.part_task_pk);
// });
}
//list end
}
};
</script>
......
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