Skip to content

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

plan

parent 2a5cc640
Show whitespace changes
Inline Side-by-side
Showing with 188 additions and 18 deletions
components/page/dataGrid.vue
View file @ ee3ec524
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
mounted() { mounted() {
if (this.data && this.data.length > 0) { if (this.data && this.data.length > 0) {
this.list = this.data; this.list = this.data;
return; //return;
} }
this.keys = ""; this.keys = "";
this.intY(); this.intY();
...@@ -260,6 +260,7 @@ export default { ...@@ -260,6 +260,7 @@ export default {
return; return;
} }
this.loadUserConfig(); this.loadUserConfig();
if (this.height === 0) { if (this.height === 0) {
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
...@@ -271,6 +272,7 @@ export default { ...@@ -271,6 +272,7 @@ export default {
} else { } else {
this.tableHeight = this.height; this.tableHeight = this.height;
} }
//注册拖拽事件。 //注册拖拽事件。
this.$dragging.$on("dragend", e => { this.$dragging.$on("dragend", e => {
// console.log("dragend",e); // console.log("dragend",e);
......
pages/mesPlan/index.vue
View file @ ee3ec524
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
detailModal: false, detailModal: false,
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
id:"id", id: "id",
columns: [ columns: [
{ {
key: "selection", key: "selection",
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
{ {
key: "id", key: "id",
title: this.l("id"), title: this.l("id"),
hide:true, hide: true
}, },
{ {
key: "mesCode", key: "mesCode",
...@@ -112,7 +112,25 @@ export default { ...@@ -112,7 +112,25 @@ export default {
width: 240, width: 240,
easy: true, easy: true,
high: true, high: true,
tree: true tree: true,
render: (h, params) => {
let name = params.row.mesCode;
let isUpId = params.row.upId;
let isDivideMark = params.row.divideMark;
let rowChildren = params.row.children;
return h(
"div",
{
style: {
cursor: "pointer",
display: "inline",
marginLeft:
isDivideMark == 0 && isUpId == 0 ? "20px" : "0px"
}
},
params.row.mesCode
);
}
}, },
{ {
key: "taskType", key: "taskType",
...@@ -261,7 +279,7 @@ export default { ...@@ -261,7 +279,7 @@ export default {
h( h(
"op", "op",
{ {
attrs: { oprate: "remove" }, attrs: { oprate: "detail" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"分解" "分解"
...@@ -272,8 +290,6 @@ export default { ...@@ -272,8 +290,6 @@ export default {
], ],
listTemp: [ listTemp: [
{ {
actualFinishDate: "2020-04-09 18:36:31",
actualStartDate: "2020-04-09 17:52:42",
batchNumber: "5", batchNumber: "5",
creationTime: "2020-04-09 17:32:06", creationTime: "2020-04-09 17:32:06",
creatorUserId: 0, creatorUserId: 0,
...@@ -314,6 +330,7 @@ export default { ...@@ -314,6 +330,7 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: true, _disabled: true,
divideMark:1,
children: [ children: [
{ {
actualFinishDate: "2020-04-09 18:36:31", actualFinishDate: "2020-04-09 18:36:31",
...@@ -327,7 +344,7 @@ export default { ...@@ -327,7 +344,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 541,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -355,9 +372,57 @@ export default { ...@@ -355,9 +372,57 @@ export default {
taskRequire: "5", taskRequire: "5",
taskType: "1", taskType: "1",
technologyDocmentCode: "5", technologyDocmentCode: "5",
upId: 0, upId: 540,
urgencyLevel: "1",
_disabled: false,
divideMark:0,
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: 542,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_13_02",
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: 540,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false _disabled: true,
divideMark:0,
children: []
} }
] ]
}, },
...@@ -373,7 +438,7 @@ export default { ...@@ -373,7 +438,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 543,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -404,6 +469,8 @@ export default { ...@@ -404,6 +469,8 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false, _disabled: false,
divideMark:0,
children: []
}, },
{ {
actualFinishDate: "2020-04-09 18:36:31", actualFinishDate: "2020-04-09 18:36:31",
...@@ -417,7 +484,7 @@ export default { ...@@ -417,7 +484,7 @@ export default {
drawnNumber: "TY9-06-0803", drawnNumber: "TY9-06-0803",
functionaryOffice: "", functionaryOffice: "",
guestName: "", guestName: "",
id: 540, id: 544,
isDeleted: 0, isDeleted: 0,
mainDepartmentId: "", mainDepartmentId: "",
mainRoutingPeople: "", mainRoutingPeople: "",
...@@ -448,7 +515,102 @@ export default { ...@@ -448,7 +515,102 @@ export default {
upId: 0, upId: 0,
urgencyLevel: "1", urgencyLevel: "1",
_disabled: false, _disabled: false,
} divideMark:0,
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: 545,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_16",
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,
divideMark:0,
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: 546,
isDeleted: 0,
mainDepartmentId: "",
mainRoutingPeople: "",
materialId: "1",
mesCode: "DDBH_20200409_17",
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,
divideMark:0,
children: []
},
], ],
treeData: [], treeData: [],
treeInputSearch: "", treeInputSearch: "",
...@@ -683,11 +845,17 @@ export default { ...@@ -683,11 +845,17 @@ export default {
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less">
.full { .full {
margin-top: 0; margin-top: 0;
.content { .content {
margin-top: 10px; margin-top: 10px;
.ivu-icon-ios-add:before {
content: "\f341";
}
.ivu-icon-ios-remove:before {
content: "\f33d";
}
} }
} }
</style> </style>
\ No newline at end of file
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