Skip to content

L
Laisi_AutoMES2
Commit 78d8a151 by yiyu.li
Options

change

parent 2525380d
Showing with 165 additions and 31 deletions
Html/src/view/fml/operation_manage/feedingBlanking.vue
......@@ -5,7 +5,7 @@
<div class="choose">
<p class="selectTitle">
1.请选择生产线
<span class="red">*</span>
<!-- <span class="red">*</span> -->
</p>
<div class="row">
<p
......@@ -19,17 +19,14 @@
</p>
</div>
<div class="choose">
<p class="selectTitle">
2.上下料工位
<span class="red">*</span>
</p>
<p class="selectTitle">2.上下料工位</p>
<div class="row">
<div
:key="index"
class="options2"
v-for="(item, index) in stationList"
@click="change(index)"
:class="{ active: a == index }"
@click="change2(index)"
:class="{ active: b == index }"
>
<p>{{ item.title }}</p>
<p>{{ item.status == 1 ? "待上料" : "运行中" }}</p>
......@@ -37,18 +34,19 @@
</div>
</div>
<div class="choose">
<p class="selectTitle">
3.操作
<span class="red">*</span>
</p>
<p class="selectTitle">3.操作</p>
<Tabs type="card">
<TabPane label="上料" :disabled="attr1">
<div class="filter">
<label style="font-size: 16px"
>上料信息：</label
>
<Input type="text" class="searchInput"
style="width: 300px"/>
<Input
type="text"
class="searchInput"
style="width: 300px"
@keyup.enter="getWorkOrderInfo()"
/>
</div>
<div class="row">
<p class="flex">
......@@ -149,8 +147,16 @@
</p>
</div>
<div>
<Button type="primary">准备上料</Button>
<Button type="primary">安装完成</Button>
<Button
type="primary"
@click="feedReady()"
>准备下料</Button
>
<Button
type="primary"
@click="installOver()"
>拆卸完成</Button
>
</div>
</div>
</div></TabPane
......@@ -199,6 +205,7 @@ export default {
productionLine: [],
stationList: [],
a: -1,
b: -1,
attr1: false, //上料、下料、上下料
attr2: false, //上料、下料、上下料
modal: false,
......@@ -209,26 +216,26 @@ export default {
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
params.index + 1
);
},
width: 70,
},
{
title: "仓库",
key: "warehouse",
key: "wavehouse",
},
{
title: "储位编号",
key: "storage_sn",
key: "locationcode",
},
{
title: "工装编号",
key: "install_sn",
key: "code",
},
{
title: "工件编号",
key: "workpiece_sn",
key: "materialsn",
},
],
data1: [],
......@@ -239,22 +246,22 @@ export default {
render: (h, params) => {
return h(
"span",
params.index + (this.page - 1) * this.pagesize + 1
params.index+ 1
);
},
width: 70,
},
{
title: "储位编号",
key: "storage_sn",
key: "locationcode",
},
{
title: "工装编号",
key: "install_sn",
key: "code",
},
{
title: "工件编号",
key: "workpiece_sn",
key: "materialsn",
},
],
data2: [],
......@@ -262,6 +269,7 @@ export default {
},
created() {
this.getProLine();
this.getStorages();
},
mounted() {
// this.getStations()
......@@ -303,11 +311,22 @@ export default {
this.a = i;
this.getStations(this.productionLine[i].id);
},
change2(index) {
this.b = index;
let status = this.stationList[index].status;
if (status == 1) {
this.attr2 = true;
}
},
//获取储位
getStorages() {
this.request("", "", "")
this.request("/acc/AutomationLocation/GetLocationList", "", "get")
.then((res) => {
console.log(res.data.data);
if (res.data.ret == 1) {
this.data1 = res.data.data;
this.data2 = res.data.data;
}
})
.catch((err) => {
......@@ -325,6 +344,33 @@ export default {
console.log(err);
});
},
feedReady() {
// 准备上料
let data = {
section: 13,
code: "234324",
};
this.request("/acc/AutomationOperate/Loading", data, "post").thne((res) => {
if (res.data.ret == 1) {
}
});
},
installOver() {
// 安装完成
let data = {
section: 13
};
this.request("", data, "post").thne(
(res) => {
if (res.data.ret == 1) {
}
}
);
},
request(url, data, type) {
if (type == "get") {
return this.axios
......
Html/src/view/fms/associate/assemblyInfo.vue
......@@ -15,7 +15,17 @@
</Select>
</div>
<div class="filter">
<label>夹具类型：</label>
<label>工装编号：</label>
<Select
label-in-value
clearable
filterable
class="searchSelect"
>
</Select>
</div>
<div class="filter">
<label>状态：</label>
<Select
label-in-value
clearable
......@@ -112,8 +122,9 @@
export default {
data() {
return {
columns1: [
columns1:[
{
type: "index2",
title: this.$t("1008"),
key: "xuhao",
render: (h, params) => {
......@@ -122,13 +133,90 @@ export default {
params.index + (this.page - 1) * this.pagesize + 1
);
},
width: 70,
},
{
title: this.$t("100089"),
key: "productcode",
minWidth: 150,
title:'工装类型',
key:'category'
},
{
title:'管理类型',
key:'managetype',
render:(h,params)=>{
let str = '';
if(params.row.managetype===1){
str = '单件';
}else if(params.row.managetype===2){
str = '批次';
}
return h('span',str);
}
},
{
title:'工装料号',
key:'partnumber'
},
{
title:'工装名称',
key:'name'
},
{
title:'工装编号',
key:'code'
},
{
title:'规格型号',
key:'specification'
},
{
title:'数量',
key:'number'
},
{
title:'状态',
key:'status',
render:(h,params)=>{
let str = '';
if(params.row.status===1){
str = '可用';
}else{
str = '停用';
}
return h('span',str);
}
},
{
title:'备注',
key:'remark'
},
{
title:'附件',
key:'filename',
render:(h,params)=>{
return h('span',{
style:{
color:'#2b85e4',
cursor:'pointer'
},
on:{
click:()=>{
let name = params.row.filename;
let url = params.row.fileurl;
if(url){
this.downFile(url,name);
}
}
}
},params.row.filename);
}
},
{
title:'维护人',
key:'updator'
},
{
title:'维护时间',
key:'updatetime'
}
],
data1: [],
total: 0,
......
Html/src/view/qms/manual/collection.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
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