Commit 99d05c1e authored by renjintao's avatar renjintao

techonolgoy

parent 84a04890
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
<div class="details_box"> <div class="details_box">
<div class="details_body"> <div class="details_body">
<Menu mode="horizontal" theme="light" active-name="0"> <Menu mode="horizontal" theme="light" active-name="0">
<MenuItem name="0" :to="'/technology/details?id='+headerId">工序</MenuItem> <MenuItem name="0" :to="'/technology/details?id='+headerId+'&headerStatus='+headerStatus">工序</MenuItem>
<!-- <MenuItem name="1" :to="'/technology/details/routingStep?id='+headerId">工步</MenuItem> --> <!-- <MenuItem name="1" :to="'/technology/details/routingStep?id='+headerId">工步</MenuItem> -->
<MenuItem name="2" :to="'/technology/details/routingqccard?id='+headerId">质控卡</MenuItem> <MenuItem name="2" :to="'/technology/details/routingqccard?id='+headerId+'&headerStatus='+headerStatus">质控卡</MenuItem>
<MenuItem name="3" :to="'/technology/details/routingsupporting?id='+headerId">工艺BOM</MenuItem> <MenuItem name="3" :to="'/technology/details/routingsupporting?id='+headerId+'&headerStatus='+headerStatus">工艺BOM</MenuItem>
<!-- <MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem> --> <!-- <MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem> -->
<MenuItem name="5" :to="'/technology/details/routinghcorder?id='+headerId">工艺更改单</MenuItem> <MenuItem name="5" :to="'/technology/details/routinghcorder?id='+headerId" v-show="headerStatus==1">工艺更改单</MenuItem>
</Menu> </Menu>
</div> </div>
<div class="bottom_box"> <div class="bottom_box">
...@@ -67,12 +67,14 @@ export default { ...@@ -67,12 +67,14 @@ export default {
showMenu: true, showMenu: true,
treeHeight: "", treeHeight: "",
actNum: "1", actNum: "1",
headerId: -1 headerId: -1,
headerStatus:-1,
}; };
}, },
created() { created() {
console.log("xiang", this.$route, this.router);
this.headerId = this.$route.query.id; this.headerId = this.$route.query.id;
this.headerStatus = this.$route.query.headerStatus;
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
......
...@@ -19,7 +19,8 @@ import ApiStep from "./routingStep/api"; ...@@ -19,7 +19,8 @@ import ApiStep from "./routingStep/api";
export default { export default {
name: "expand", name: "expand",
props: { props: {
row: { type: Array, default: [] } row: { type: Array, default: [] },
headerStatus:Number,
}, },
data() { data() {
return { return {
...@@ -112,7 +113,7 @@ export default { ...@@ -112,7 +113,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id, params.index) } on: { click: () => this.edit(params.row.id, params.index) }
}, },
"编辑" this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -120,7 +121,7 @@ export default { ...@@ -120,7 +121,7 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" this.headerStatus == 4||this.headerStatus == 0 ? "删除" : ""
) )
]); ]);
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<DataGrid :columns="columns" ref="grid" :data="list" :easy="false" :high="false" :page="false"> <DataGrid :columns="columns" ref="grid" :data="list" :easy="false" :high="false" :page="false">
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1300" footer-hide> <Modal v-model="modal" :title="title" width="1300" footer-hide>
...@@ -57,7 +57,8 @@ export default { ...@@ -57,7 +57,8 @@ export default {
render: (h, params) => { render: (h, params) => {
return h(expandRow, { return h(expandRow, {
props: { props: {
row: params.row.steps row: params.row.steps,
headerStatus:this.headerStatus,
}, },
on: { on: {
//监听子组件showDetail事件 //监听子组件showDetail事件
...@@ -293,7 +294,7 @@ export default { ...@@ -293,7 +294,7 @@ export default {
) )
} }
}, },
"新增" this.headerStatus == 4||this.headerStatus == 0 ? "新增" : ""
), ),
h( h(
"op", "op",
...@@ -310,7 +311,7 @@ export default { ...@@ -310,7 +311,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
"编辑" this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -318,7 +319,7 @@ export default { ...@@ -318,7 +319,7 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" this.headerStatus == 4||this.headerStatus == 0 ? "删除" : ""
) )
]); ]);
} }
...@@ -326,7 +327,8 @@ export default { ...@@ -326,7 +327,8 @@ export default {
], ],
list: [], list: [],
maxNum: 0, maxNum: 0,
maxNumTemp: 0 maxNumTemp: 0,
headerStatus:-1,
}; };
}, },
created() { created() {
...@@ -336,6 +338,7 @@ export default { ...@@ -336,6 +338,7 @@ export default {
this.easySearch.routingHeaderId.value = this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid = Number(this.easySearch.routingHeaderId.value); this.hid = Number(this.easySearch.routingHeaderId.value);
this.headerStatus=this.$route.query.headerStatus
}, },
mounted() { mounted() {
this.load(); this.load();
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<Search :headid="hid" /> <Search :headid="hid" />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1000" footer-hide> <Modal v-model="modal" :title="title" width="1000" footer-hide>
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
"编辑" this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -208,14 +208,15 @@ export default { ...@@ -208,14 +208,15 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" this.headerStatus == 4||this.headerStatus == 0 ? "删除" : ""
) )
]); ]);
} }
} }
], ],
downUrl: fileUrlDown, downUrl: fileUrlDown,
fileUrlPath: "" fileUrlPath: "",
headerStatus:-1,
}; };
}, },
created() { created() {
...@@ -225,6 +226,8 @@ export default { ...@@ -225,6 +226,8 @@ export default {
this.easySearch.routingHeaderId.value = this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid = Number(this.easySearch.routingHeaderId.value); this.hid = Number(this.easySearch.routingHeaderId.value);
this.headerStatus=this.$route.query.headerStatus
}, },
mounted() { mounted() {
console.log(this); console.log(this);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<Search :headid="hid"/> <Search :headid="hid"/>
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide>
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
attrs: { oprate: "edit" }, attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) } on: { click: () => this.edit(params.row.id) }
}, },
"编辑" this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op",
...@@ -212,12 +212,13 @@ export default { ...@@ -212,12 +212,13 @@ export default {
attrs: { oprate: "delete" }, attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) } on: { click: () => this.remove(params.row.id) }
}, },
"删除" this.headerStatus == 4||this.headerStatus == 0 ? "删除" : ""
) )
]); ]);
} }
} }
] ],
headerStatus:-1,
}; };
}, },
created() { created() {
...@@ -227,6 +228,7 @@ export default { ...@@ -227,6 +228,7 @@ export default {
this.easySearch.routingHeaderId.value = this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid=Number(this.easySearch.routingHeaderId.value) this.hid=Number(this.easySearch.routingHeaderId.value)
this.headerStatus=this.$route.query.headerStatus
}, },
mounted() { mounted() {
console.log(this); console.log(this);
......
...@@ -389,8 +389,9 @@ export default { ...@@ -389,8 +389,9 @@ export default {
version: row.version, version: row.version,
departmentName: row.departmentName departmentName: row.departmentName
}; };
// this.info=()=>import("./details") // this.info=()=>import("./details")
this.src = "/technology/details?id=" + row.id; this.src = "/technology/details?id=" + row.id+"&headerStatus="+row.approvalStatus;
}, },
viewClose() { viewClose() {
this.viewModal = false; this.viewModal = 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