Commit 99d05c1e authored by renjintao's avatar renjintao

techonolgoy

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