Skip to content

L
Laisi_AutoMES2
Commit ba07d071 by xin.yang
Options

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

parents ee0f5d9d b7db37a4
Showing with 52 additions and 29 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
type="text" type="text"
class="searchInput" class="searchInput"
style="width: 300px" style="width: 300px"
@keyup.enter="getWorkOrderInfo()" v-model="code"
@on-keyup.enter="getWorkOrderInfo()"
/> />
</div> </div>
<div class="row"> <div class="row">
...@@ -105,25 +106,33 @@ ...@@ -105,25 +106,33 @@
<span class="infoLabel" <span class="infoLabel"
>工单信息：</span >工单信息：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel" <span class="infoLabel"
>产品编号：</span >产品编号：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel" <span class="infoLabel"
>产品名称：</span >产品名称：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel" <span class="infoLabel"
>工件编号：</span >工件编号：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
</div> </div>
<div class="row"> <div class="row">
...@@ -131,19 +140,25 @@ ...@@ -131,19 +140,25 @@
<span class="infoLabel" <span class="infoLabel"
>状态：</span >状态：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel" <span class="infoLabel"
>储位编号：</span >储位编号：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
<p class="flex"> <p class="flex">
<span class="infoLabel" <span class="infoLabel"
>工装编号：</span >工装编号：</span
> >
<span class="info"></span> <span class="info">{{
orderDetail.code
}}</span>
</p> </p>
</div> </div>
<div> <div>
...@@ -173,7 +188,8 @@ ...@@ -173,7 +188,8 @@
class="tableClass" class="tableClass"
:data="data1" :data="data1"
:columns="columns1" :columns="columns1"
:max-height="200" @on-current-change="handleRowChange"
highlight-row
></Table> ></Table>
</div> </div>
<div slot="footer"> <div slot="footer">
...@@ -209,15 +225,13 @@ export default { ...@@ -209,15 +225,13 @@ export default {
attr1: false, //上料、下料、上下料 attr1: false, //上料、下料、上下料
attr2: false, //上料、下料、上下料 attr2: false, //上料、下料、上下料
modal: false, modal: false,
code: "", //工令单
columns1: [ columns1: [
{ {
title: this.$t("1008"), title: this.$t("1008"),
key: "xuhao", key: "xuhao",
render: (h, params) => { render: (h, params) => {
return h( return h("span", params.index + 1);
"span",
params.index + 1
);
}, },
width: 70, width: 70,
}, },
...@@ -244,10 +258,7 @@ export default { ...@@ -244,10 +258,7 @@ export default {
title: this.$t("1008"), title: this.$t("1008"),
key: "xuhao", key: "xuhao",
render: (h, params) => { render: (h, params) => {
return h( return h("span", params.index + 1);
"span",
params.index+ 1
);
}, },
width: 70, width: 70,
}, },
...@@ -265,6 +276,8 @@ export default { ...@@ -265,6 +276,8 @@ export default {
}, },
], ],
data2: [], data2: [],
orderDetail: {},
detailobj:{}
}; };
}, },
created() { created() {
...@@ -326,7 +339,6 @@ export default { ...@@ -326,7 +339,6 @@ export default {
if (res.data.ret == 1) { if (res.data.ret == 1) {
this.data1 = res.data.data; this.data1 = res.data.data;
this.data2 = res.data.data; this.data2 = res.data.data;
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -335,9 +347,17 @@ export default { ...@@ -335,9 +347,17 @@ export default {
}, },
// 获取工单信息 // 获取工单信息
getWorkOrderInfo() { getWorkOrderInfo() {
this.request("", "", "") let data = {
code: this.code,
};
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);
this.orderDetail = res.data.data;
} else {
this.$Message.error(this.$t(res.data, msg));
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -349,28 +369,31 @@ export default { ...@@ -349,28 +369,31 @@ export default {
// 准备上料 // 准备上料
let data = { let data = {
section: 13, section: 13,
code: "234324", code: "234324",
}; };
this.request("/acc/AutomationOperate/Loading", data, "post").thne((res) => { this.request("/acc/AutomationOperate/Loading", data, "post").thne(
if (res.data.ret == 1) { (res) => {
if (res.data.ret == 1) {
}
} }
}); );
}, },
installOver() { installOver() {
// 安装完成 // 安装完成
let data = { let data = {
section: 13 section: 13,
}; };
this.request("", data, "post").thne( this.request("", data, "post").thne((res) => {
(res) => { if (res.data.ret == 1) {
if (res.data.ret == 1) {
}
} }
); });
}, },
handleRowChange(currentRow, oldCurrentRow) {
this.detailobj = currentRow;
},
request(url, data, type) { request(url, data, type) {
if (type == "get") { if (type == "get") {
return this.axios return this.axios
......
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