Commit 0f55ac5a authored by 周远喜's avatar 周远喜

ok

parent f2068c4b
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
if (this.lazy == true) { if (this.lazy == true) {
return; return;
} }
if (this.userId > 0) { if (this.userId > 0&& this.set) {
this.loadUserConfig(); this.loadUserConfig();
} else { } else {
this.easySearch(); this.easySearch();
......
...@@ -353,7 +353,7 @@ export default { ...@@ -353,7 +353,7 @@ export default {
partTaskPk: this.row.part_task_pk, partTaskPk: this.row.part_task_pk,
opTaskPk: this.row.op_task_pk, opTaskPk: this.row.op_task_pk,
taskSeq: this.row.task_seq, taskSeq: this.row.task_seq,
flog: 5, //参数应用范围 flog: 0, //参数应用范围
calId: -1, calId: -1,
planState: this.row.plan_method=="平行", planState: this.row.plan_method=="平行",
planMethod: this.row.plan_method, // 平行 重叠 planMethod: this.row.plan_method, // 平行 重叠
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
type="info" type="info"
v-if="showAi" v-if="showAi"
> >
<a href="javascript:;">智能排产&nbsp;&nbsp;&nbsp;</a> <a>智能排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
<Badge <Badge
:count="this.$store.state.countAll" :count="this.$store.state.countAll"
...@@ -47,16 +47,17 @@ ...@@ -47,16 +47,17 @@
type="info" type="info"
v-if="showAll" v-if="showAll"
> >
<a href="javascript:;" @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a> <a @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
<Badge :count="this.$store.state.countRun" overflow-count="99" type="info" v-if="showRun"> <Badge :count="this.$store.state.countRun" overflow-count="99" type="info" v-if="showRun">
<a href="javascript:;" @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a> <a @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a>
</Badge> </Badge>
</template> </template>
<template slot="searchForm"> <template slot="searchForm">
<Search /> <Search />
</template> </template>
<template slot="buttons"></template> <template slot="buttons">
</template>
</DataGrid> </DataGrid>
<FooterToolbar extra v-if="footerBar"> <FooterToolbar extra v-if="footerBar">
<Row> <Row>
...@@ -148,6 +149,8 @@ export default { ...@@ -148,6 +149,8 @@ export default {
curId: 0, curId: 0,
columns: [ columns: [
{ {
key:"selection",
title:'#',
type: "selection", type: "selection",
width: 70, width: 70,
align: "center" align: "center"
...@@ -562,7 +565,10 @@ export default { ...@@ -562,7 +565,10 @@ export default {
name: "aps-stream" name: "aps-stream"
}); });
}, },
add(){
this.addModal=true;
},
addOk() { addOk() {
this.$refs.grid.load(); this.$refs.grid.load();
this.addModal = false; this.addModal = false;
......
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