Skip to content

L
Laisi_AutoMES2
Commit af0348f8 by yiyu.li
Options

bug

parent 0a021699
Showing with 46 additions and 35 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
>工单信息：</span >工单信息：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.orderNumber orderDetail2.orderNumber
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
>产品编号：</span >产品编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.productCode orderDetail2.productCode
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
>产品名称：</span >产品名称：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.productName orderDetail2.productName
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
>工件编号：</span >工件编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.sn orderDetail2.sn
}}</span> }}</span>
</p> </p>
</div> </div>
...@@ -188,11 +188,11 @@ ...@@ -188,11 +188,11 @@
>状态：</span >状态：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.status == 1 orderDetail2.status == 1
? "待上料" ? "待上料"
: orderDetail.status == 2 : orderDetail2.status == 2
? "运行中" ? "运行中"
: orderDetail.status == 3 : orderDetail2.status == 3
? "待下料" ? "待下料"
: "" : ""
}}</span> }}</span>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
>储位编号：</span >储位编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.location orderDetail2.location
}}</span> }}</span>
</p> </p>
<p class="flex"> <p class="flex">
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
>工装编号：</span >工装编号：</span
> >
<span class="info">{{ <span class="info">{{
orderDetail.fixtureGuid orderDetail2.fixtureGuid
}}</span> }}</span>
</p> </p>
</div> </div>
...@@ -277,7 +277,7 @@ export default { ...@@ -277,7 +277,7 @@ export default {
a: -1, a: -1,
b: -1, b: -1,
attr1: false, //上料、下料、上下料 attr1: false, //上料、下料、上下料
attr2: true, //上料、下料、上下料 attr2: false, //上料、下料、上下料
modal: false, modal: false,
code: "", //工令单 code: "", //工令单
columns1: [ columns1: [
...@@ -331,6 +331,7 @@ export default { ...@@ -331,6 +331,7 @@ export default {
], ],
data2: [], data2: [],
orderDetail: {}, orderDetail: {},
orderDetail2: {},
detailobj: {}, detailobj: {},
sectionid: 0, sectionid: 0,
tabindex: "1", tabindex: "1",
...@@ -385,20 +386,23 @@ export default { ...@@ -385,20 +386,23 @@ export default {
let status = this.stationList[index].status; let status = this.stationList[index].status;
this.sectionid = this.stationList[index].section; this.sectionid = this.stationList[index].section;
// status = 2; // status = 2;
if (status == 3) { // if (status == 3) {
this.attr1 = true; // this.attr1 = true;
this.tabindex = "2"; // this.tabindex = "2";
this.getRunningDetail(index); this.getRunningDetail(index);
} else { // } else {
this.attr2 = true; // this.attr2 = true;
} // }
if (status == 2) { // // if (status == 2) {
this.getRunningDetail(index); // this.getRunningDetail(index);
} // }
}, },
getIndex(name) { getIndex(name) {
this.tabindex = name; this.tabindex = name;
if(this.tabindex == '2'){
this.orderDetail = {};
}
this.getStorages(); this.getStorages();
}, },
//获取储位 //获取储位
...@@ -430,22 +434,27 @@ export default { ...@@ -430,22 +434,27 @@ 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) {
let obj = res.data.data; if (this.tabindex == "2") {
if ( this.orderDetail = {};
obj.url == null ||
obj.url == "" ||
obj.url == undefined
) {
obj.url = "";
} else { } else {
obj.url = this.axios.publicPath + obj.url.slice(4); let obj = res.data.data;
if (
obj.url == null ||
obj.url == "" ||
obj.url == undefined
) {
obj.url = "";
} else {
obj.url =
this.axios.publicPath + obj.url.slice(4);
}
this.orderDetail = Object.assign(
{},
this.orderDetail,
obj
);
this.getStorages();
} }
this.orderDetail = Object.assign(
{},
this.orderDetail,
obj
);
this.getStorages();
} else { } else {
this.$Message.error(this.$t(res.data.msg)); this.$Message.error(this.$t(res.data.msg));
this.orderDetail = {}; this.orderDetail = {};
...@@ -482,6 +491,7 @@ export default { ...@@ -482,6 +491,7 @@ export default {
obj obj
); );
if (this.tabindex == "2") { if (this.tabindex == "2") {
this.orderDetail2 = res.data.data;
this.getStorages(); this.getStorages();
} }
} else { } else {
...@@ -592,6 +602,7 @@ export default { ...@@ -592,6 +602,7 @@ export default {
this.orderDetail.fixtureGuid = this.detailobj.fixtureguid; this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
this.orderDetail.location = this.detailobj.locationid; this.orderDetail.location = this.detailobj.locationid;
if (this.locationobj.id) { if (this.locationobj.id) {
// this.getRunningDetail();
this.request( this.request(
"/acc/AutomationOperate/ScanCode?id=" + this.locationobj.id, "/acc/AutomationOperate/ScanCode?id=" + this.locationobj.id,
"", "",
...@@ -600,9 +611,9 @@ export default { ...@@ -600,9 +611,9 @@ export default {
.then((res) => { .then((res) => {
if (res.data.ret == 1) { if (res.data.ret == 1) {
let obj = res.data.data; let obj = res.data.data;
this.orderDetail = Object.assign( this.orderDetail2 = Object.assign(
{}, {},
this.orderDetail, this.orderDetail2,
obj obj
); );
} else { } else {
......
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