Skip to content

L
Laisi_AutoMES2
Commit ae082147 by lyy
Options

new change

parent 73943217
Showing with 129 additions and 20 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
...@@ -237,6 +237,122 @@ ...@@ -237,6 +237,122 @@
</div> </div>
</div></TabPane </div></TabPane
> >
<TabPane label="下料并上料" :disabled="attr2" name="3"
><div class="flex">
<div>
<Table
class="tableClass"
:data="data2"
:columns="columns2"
:max-height="200"
style="width: 680px"
highlight-row
@on-current-change="handleRowChange1"
></Table>
</div>
<div>
<div class="row">
<p class="flex">
<span class="infoLabel"
>工单信息：</span
>
<span class="info">{{
orderDetail2.orderNumber
}}</span>
</p>
<p class="flex">
<span class="infoLabel"
>产品编号：</span
>
<span class="info">{{
orderDetail2.productCode
}}</span>
</p>
<p class="flex">
<span class="infoLabel"
>产品名称：</span
>
<span class="info">{{
orderDetail2.productName
}}</span>
</p>
<p class="flex">
<span class="infoLabel"
>工件编号：</span
>
<span class="info">{{
orderDetail2.sn
}}</span>
</p>
</div>
<div class="row">
<p class="flex">
<span class="infoLabel"
>状态：</span
>
<span class="info">{{
orderDetail2.status == 1
? "待执行"
: orderDetail2.status == 2
? "执行中"
: orderDetail2.status == 3
? "执行完毕"
: ""
}}</span>
</p>
<p class="flex">
<span class="infoLabel"
>储位编号：</span
>
<span class="info">{{
orderDetail2.location
}}</span>
</p>
<p class="flex">
<span class="infoLabel"
>工装编号：</span
>
<span class="info">{{
orderDetail2.fixtureCode
}}</span>
</p>
</div>
<div>
<Button
type="primary"
@click="blankReady()"
:loading="loading3"
>准备下料</Button
>
</div>
<div class="filter">
<label style="font-size: 16px"
>上料信息：</label
>
<!-- 跟上料一样 -->
<Input
type="text"
class="searchInput"
style="width: 250px"
v-model="code"
@on-keyup.enter="getWorkOrderInfo()"
/>
<Button
type="primary"
@click="sameFeed()"
:loading="loading3"
>同工单上料</Button
>
</div>
<Button
type="primary"
@click="sameFeed()"
:loading="loading3"
>上料</Button
>
</div>
</div></TabPane
>
</Tabs> </Tabs>
<Modal <Modal
class="newModalClass" class="newModalClass"
...@@ -414,27 +530,14 @@ export default { ...@@ -414,27 +530,14 @@ 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;
this.orderDetail = {}; this.orderDetail = {};
this.locationobj ={}; this.locationobj = {};
this.code=""; this.code = "";
// status = 2;
// if (status == 3) {
// this.attr1 = true;
// this.tabindex = "2";
this.getRunningDetail(index); this.getRunningDetail(index);
// } else {
// this.attr2 = true;
// }
// // if (status == 2) {
// this.getRunningDetail(index);
// }
}, },
getIndex(name) { getIndex(name) {
this.tabindex = name; this.tabindex = name;
if (this.tabindex == "2") { if (this.tabindex == "2") {
this.orderDetail2 = {}; this.orderDetail2 = {};
} }
this.getStorages(); this.getStorages();
}, },
...@@ -447,7 +550,7 @@ export default { ...@@ -447,7 +550,7 @@ export default {
let data = { let data = {
fillsn: this.tabindex == "1" ? 0 : 1, fillsn: this.tabindex == "1" ? 0 : 1,
// productcode: code, // productcode: code,
productcode: this.tabindex == "1" ? code:"", productcode: this.tabindex == "1" ? code : "",
}; };
this.request("/acc/AutomationLocation/GetLocationList", data, "get") this.request("/acc/AutomationLocation/GetLocationList", data, "get")
.then((res) => { .then((res) => {
...@@ -464,7 +567,7 @@ export default { ...@@ -464,7 +567,7 @@ export default {
getWorkOrderInfo() { getWorkOrderInfo() {
let data = { let data = {
code: this.code, code: this.code,
section:this.sectionid section: this.sectionid,
}; };
this.request("/acc/AutomationOperate/ScanCode", data, "get") this.request("/acc/AutomationOperate/ScanCode", data, "get")
.then((res) => { .then((res) => {
...@@ -525,14 +628,14 @@ export default { ...@@ -525,14 +628,14 @@ export default {
this.orderDetail, this.orderDetail,
obj obj
); );
if (this.tabindex == "2") { if (this.tabindex == "2" || this.tabindex == "3") {
this.orderDetail2 = res.data.data; this.orderDetail2 = res.data.data;
this.getStorages(); this.getStorages();
} }
} else { } else {
this.$Message.error(this.$t(res.data.msg)); this.$Message.error(this.$t(res.data.msg));
this.orderDetail = {}; this.orderDetail = {};
this.orderDetail2 ={}; this.orderDetail2 = {};
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -645,6 +748,9 @@ export default { ...@@ -645,6 +748,9 @@ export default {
} }
}); });
}, },
sameFeed() {
// 同工单上料
},
handleRowChange(currentRow, oldCurrentRow) { handleRowChange(currentRow, oldCurrentRow) {
this.detailobj = currentRow; this.detailobj = currentRow;
this.orderDetail.fixtureGuid = this.detailobj.fixtureguid; this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
...@@ -658,7 +764,10 @@ export default { ...@@ -658,7 +764,10 @@ export default {
if (this.locationobj.id) { if (this.locationobj.id) {
// this.getRunningDetail(); // this.getRunningDetail();
this.request( this.request(
"/acc/AutomationOperate/ScanCode?id=" + this.locationobj.id +"&section="+this.sectionids, "/acc/AutomationOperate/ScanCode?id=" +
this.locationobj.id +
"&section=" +
this.sectionids,
"", "",
"get" "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