Skip to content

L
Laisi_AutoMES2
Commit 4a33e287 by xin.yang
Options

Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

parents 6265e4e7 687af983
Showing with 47 additions and 24 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
...@@ -52,40 +52,53 @@ ...@@ -52,40 +52,53 @@
<div class="row"> <div class="row">
<p class="flex"> <p class="flex">
<span class="infoLabel">工单信息：</span> <span class="infoLabel">工单信息：</span>
<span class="info"></span> <span class="info">{{
orderDetail.orderNumber
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">产品编号：</span> <span class="infoLabel">产品编号：</span>
<span class="info"></span> <span class="info">{{
orderDetail.productCode
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">产品名称：</span> <span class="infoLabel">产品名称：</span>
<span class="info"></span> <span class="info">{{
orderDetail.productName
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">工件编号：</span> <span class="infoLabel">工件编号：</span>
<span class="info"></span> <span class="info">{{
orderDetail.sn
}}</span>
</p> </p>
</div> </div>
<div class="row"> <div class="row">
<p class="flex"> <p class="flex">
<span class="infoLabel">状态：</span> <span class="infoLabel">状态：</span>
<span class="info"></span> <span class="info">{{
orderDetail.status
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">储位编号：</span> <span class="infoLabel">储位编号：</span>
<span class="info"></span> <span class="info">{{
orderDetail.location
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel">工装编号：</span> <span class="infoLabel">工装编号：</span>
<span class="info"></span> <span class="info">{{
orderDetail.fixtureGuid
}}</span>
</p> </p>
<Button type="primary" @click="modal = true"
>储位选择</Button
>
</div> </div>
<div> <div>
<Button type="primary">准备上料</Button> <Button type="primary" @click="feedReady()"
>准备上料</Button
>
<Button type="primary">安装完成</Button> <Button type="primary">安装完成</Button>
</div> </div>
</TabPane> </TabPane>
...@@ -107,7 +120,7 @@ ...@@ -107,7 +120,7 @@
>工单信息：</span >工单信息：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.orderNumber
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -115,7 +128,7 @@ ...@@ -115,7 +128,7 @@
>产品编号：</span >产品编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.productCode
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -123,7 +136,7 @@ ...@@ -123,7 +136,7 @@
>产品名称：</span >产品名称：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.productName
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -131,7 +144,7 @@ ...@@ -131,7 +144,7 @@
>工件编号：</span >工件编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.sn
}}</span> }}</span>
</p> </p>
</div> </div>
...@@ -149,7 +162,7 @@ ...@@ -149,7 +162,7 @@
>储位编号：</span >储位编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.location
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -157,7 +170,7 @@ ...@@ -157,7 +170,7 @@
>工装编号：</span >工装编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.code orderDetail.fixtureGuid
}}</span> }}</span>
</p> </p>
</div> </div>
...@@ -277,7 +290,8 @@ export default { ...@@ -277,7 +290,8 @@ export default {
], ],
data2: [], data2: [],
orderDetail: {}, orderDetail: {},
detailobj:{} detailobj: {},
sectionid: 0,
}; };
}, },
created() { created() {
...@@ -327,6 +341,7 @@ export default { ...@@ -327,6 +341,7 @@ export default {
change2(index) { change2(index) {
this.b = index; this.b = index;
let status = this.stationList[index].status; let status = this.stationList[index].status;
this.sectionid = this.stationList[index].section;
if (status == 1) { if (status == 1) {
this.attr2 = true; this.attr2 = true;
} }
...@@ -354,8 +369,12 @@ export default { ...@@ -354,8 +369,12 @@ export default {
this.request("/acc/AutomationOperate/ScanCode", data, "get") this.request("/acc/AutomationOperate/ScanCode", data, "get")
.then((res) => { .then((res) => {
if (res.data.ret == 1) { if (res.data.ret == 1) {
console.log(res.data.data); let obj = res.data.data;
this.orderDetail = res.data.data; this.orderDetail = Object.assign(
{},
this.orderDetail,
obj
);
} else { } else {
this.$Message.error(this.$t(res.data, msg)); this.$Message.error(this.$t(res.data, msg));
} }
...@@ -367,14 +386,19 @@ export default { ...@@ -367,14 +386,19 @@ export default {
feedReady() { feedReady() {
// 准备上料 // 准备上料
if (this.sectionid == 0) {
this.$Message.error("请选择工位");
}
let data = { let data = {
section: 13, section: this.sectionid,
code: "234324", code: this.orderDetail.fixtureGuid,
}; };
this.request("/acc/AutomationOperate/Loading", data, "post").thne( this.request("/acc/AutomationOperate/Loading", data, "post").thne(
(res) => { (res) => {
if (res.data.ret == 1) { if (res.data.ret == 1) {
console.log(res.data.data);
} else {
this.$Message.error(this.$t(res.data.msg));
} }
} }
); );
...@@ -392,7 +416,6 @@ export default { ...@@ -392,7 +416,6 @@ export default {
}, },
handleRowChange(currentRow, oldCurrentRow) { handleRowChange(currentRow, oldCurrentRow) {
this.detailobj = currentRow; this.detailobj = currentRow;
}, },
request(url, data, type) { request(url, data, type) {
if (type == "get") { if (type == "get") {
......
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