Commit d4140284 authored by renjintao's avatar renjintao

工单执行

parent 54659720
...@@ -35,7 +35,7 @@ export default { ...@@ -35,7 +35,7 @@ export default {
}; };
}, },
created() { created() {
this.id = Number(this.$route.query.row.routingHeaderId); //工艺规程id this.id = Number(this.$route.query.headid); //工艺规程id
//this.uId = ""; //工艺规程文件id //this.uId = ""; //工艺规程文件id
ApiProcess.get({ id: this.id }).then(r => { ApiProcess.get({ id: this.id }).then(r => {
if (r.success && r.result) { if (r.success && r.result) {
...@@ -58,7 +58,8 @@ export default { ...@@ -58,7 +58,8 @@ export default {
openSaveTip(key) { openSaveTip(key) {
this.id = key; this.id = key;
if (this.id == "1") { if (this.id == "1") {
this.id = Number(this.$route.query.row.routingHeaderId); //工艺规程id this.id = Number(this.$route.query.headid); //工艺规程id
//this.uId = ""; //工艺规程文件id
this.detail = () => import("../../../technology/processview"); this.detail = () => import("../../../technology/processview");
} }
//if(this.id == "1"){ this.detail = () => import("./components/setupDetails");} //if(this.id == "1"){ this.detail = () => import("./components/setupDetails");}
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button> <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template> </template>
<template slot="card" slot-scope="{row}"> <template slot="card" slot-scope="{row}">
<div class="body" @click="toExecute(row.id,row.orderId,row.executeId)"> <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId)">
<Row class="title-i"> <Row class="title-i">
<Col :span="10" class="order-code">{{row.productName}}</Col> <Col :span="10" class="order-code">{{row.productName}}</Col>
<Col :span="10" class="order-code">{{row.mesCode}}</Col> <Col :span="10" class="order-code">{{row.mesCode}}</Col>
...@@ -181,7 +181,8 @@ export default { ...@@ -181,7 +181,8 @@ export default {
this.toExecute( this.toExecute(
params.row.id, params.row.id,
params.row.orderId, params.row.orderId,
params.row.executeId params.row.executeId,
params.row.routingHeaderId
) )
} }
}, },
...@@ -216,11 +217,11 @@ export default { ...@@ -216,11 +217,11 @@ export default {
search() { search() {
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
}, },
toExecute(id, orderId, executeId) { toExecute(id, orderId, executeId,headid) {
//跳转到对应操作页面 获取id:this.$route.query.id //跳转到对应操作页面 获取id:this.$route.query.id
this.$router.push({ this.$router.push({
path: "/produce/execute", path: "/produce/execute",
query: { id: id, orderId: orderId, executeId: executeId } query: { id: id, orderId: orderId, executeId: executeId,headid:headid }
}); });
}, },
tdStyle(val) { tdStyle(val) {
......
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