Skip to content

L
Laisi_AutoMES2
Commit 310a784f by yiyu.li
Options

add

parent ad0b828a
Showing with 136 additions and 73 deletions
Html/src/locale/lang/en-US.js
...@@ -6643,5 +6643,13 @@ export default { ...@@ -6643,5 +6643,13 @@ export default {
'120002': '模具类型不能为空', '120002': '模具类型不能为空',
'120007': '请上传模具清单', '120007': '请上传模具清单',
// 上下料自动化
'300156': '该任务状态已经完成',
'300157': '产线模式未找到',
'300158': '设备状态不可用',
'300159': '设备正在使用中',
'300160': '任务进行中',
'300161': '产品工装未找到',
'300162': '未找到工装信息'
} }
Html/src/locale/lang/zh-CN.js
...@@ -1076,7 +1076,7 @@ export default { ...@@ -1076,7 +1076,7 @@ export default {
'1235': '播放', '1235': '播放',
'1236': '视频文件名', '1236': '视频文件名',
'1237': '不展示', '1237': '不展示',
'1238':'展示', '1238': '展示',
'100000': '部门', '100000': '部门',
'100001': '岗位', '100001': '岗位',
...@@ -1939,7 +1939,7 @@ export default { ...@@ -1939,7 +1939,7 @@ export default {
'300098': '库存格式不正确', '300098': '库存格式不正确',
'300099': '不能再减少了', '300099': '不能再减少了',
'300100': '已是最大库存', '300100': '已是最大库存',
'300101':'类型名称', '300101': '类型名称',
'3000035': '工单不一致', '3000035': '工单不一致',
'3000036': '同一料框数量不一致', '3000036': '同一料框数量不一致',
...@@ -4541,7 +4541,7 @@ export default { ...@@ -4541,7 +4541,7 @@ export default {
'901081': '仓库类别', '901081': '仓库类别',
'901082': '仓库维护', '901082': '仓库维护',
'901083': '储位类别', '901083': '储位类别',
'901084': '储位维护', '901084': '储位维护',
'901085': '入库单管理', '901085': '入库单管理',
'901086': '标签补印', '901086': '标签补印',
'901087': '件', '901087': '件',
...@@ -6913,7 +6913,16 @@ export default { ...@@ -6913,7 +6913,16 @@ export default {
'120001': '模具未找到', '120001': '模具未找到',
'120002': '模具类型不能为空', '120002': '模具类型不能为空',
'120007': '请上传模具清单', '120007': '请上传模具清单',
'120008': '请选择备模数据' '120008': '请选择备模数据',
// 上下料自动化
'300156': '该任务状态已经完成',
'300157': '产线模式未找到',
'300158': '设备状态不可用',
'300159': '设备正在使用中',
'300160': '任务进行中',
'300161': '产品工装未找到',
'300162': '未找到工装信息'
......
Html/src/view/fms/associate/assemblyInfo.vue
...@@ -102,7 +102,12 @@ ...@@ -102,7 +102,12 @@
</div> </div>
</div> </div>
<div class="divborder newTableDiv"> <div class="divborder newTableDiv">
<Table class="tableClass" :columns="columns1" :data="data1"></Table> <Table
class="tableClass"
:columns="columns1"
:data="data1"
highlight-row
></Table>
<div class="pageDiv"> <div class="pageDiv">
<div class="pageDirection"> <div class="pageDirection">
<Page <Page
...@@ -262,83 +267,85 @@ export default { ...@@ -262,83 +267,85 @@ export default {
}, },
}, },
{ {
title: "工装类型", title: "父工装类型",
key: "category", key: "category",
}, },
{ {
title: "管理类型", 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", key: "partnumber",
}, },
{ {
title: "工装名称", title: "父工装名称",
key: "name", key: "name",
}, },
{ {
title: "工装编号", title: "父工装规格",
key: "code", key: "specfication",
},
{
title: "规格型号",
key: "specification",
}, },
{ {
title: "数量", title: "父工装编号",
key: "number", key: "code",
}, },
// {
// // type: "expand",
// title: "装配详情",
// key: "children",
// render: (h, params) => {
// // let str = "";
// // if (params.row.managetype === 1) {
// // str = "单件";
// // } else if (params.row.managetype === 2) {
// // str = "批次";
// // }
// // return h(Table, {
// // props:{
// // data:params.row.children,
// // columns:this.columns2
// // }
// // });
// },
// },
{ {
title: "状态", title: "状态",
key: "status", key: "status",
render: (h, params) => { // render: (h, params) => {
let str = ""; // let str = "";
if (params.row.status === 1) { // if (params.row.status === 1) {
str = "可用"; // str = "可用";
} else { // } else {
str = "停用"; // str = "停用";
} // }
return h("span", str); // return h("span", str);
}, // },
},
{
title: "备注",
key: "remark",
}, },
// {
// title: "备注",
// key: "remark",
// },
{ {
title: "附件", title: "附件",
key: "filename", key: "filename",
render: (h, params) => { // render: (h, params) => {
return h( // return h(
"span", // "span",
{ // {
style: { // style: {
color: "#2b85e4", // color: "#2b85e4",
cursor: "pointer", // cursor: "pointer",
}, // },
on: { // on: {
click: () => { // click: () => {
let name = params.row.filename; // let name = params.row.filename;
let url = params.row.fileurl; // let url = params.row.fileurl;
if (url) { // if (url) {
this.downFile(url, name); // this.downFile(url, name);
} // }
}, // },
}, // },
}, // },
params.row.filename // params.row.filename
); // );
}, // },
}, },
{ {
title: "维护人", title: "维护人",
...@@ -353,6 +360,28 @@ export default { ...@@ -353,6 +360,28 @@ export default {
total: 0, total: 0,
page: 1, page: 1,
pagesize: 10, pagesize: 10,
columns2: [
{
title: "父工装类型",
key: "category",
},
{
title: "父工装料号",
key: "category",
},
{
title: "父工装名称",
key: "category",
},
{
title: "父工装规格",
key: "category",
},
{
title: "父工装编号",
key: "category",
},
],
modal: false, modal: false,
type: 0, type: 0,
typeTree: [], typeTree: [],
...@@ -379,7 +408,7 @@ export default { ...@@ -379,7 +408,7 @@ export default {
created() { created() {
this.columns1 = this.$time.initTableTitle(this.columns1); this.columns1 = this.$time.initTableTitle(this.columns1);
this.initFrockType(); this.initFrockType();
this.search(1,10) this.search(1, 10);
}, },
methods: { methods: {
search(page, pagesize) { search(page, pagesize) {
...@@ -398,18 +427,27 @@ export default { ...@@ -398,18 +427,27 @@ export default {
"get" "get"
).then((res) => { ).then((res) => {
if (res.data.ret == 1) { if (res.data.ret == 1) {
this.data1 = res.data.data; this.total = res.data.total;
let arr = [];
arr = res.data.data;
arr.forEach(ele=>{
ele.parentcate_guid = '';
})
this.data1 = arr;
console.log(this.data1);
// this.data1 = res.data.data;
} }
}); });
}, },
add() { add() {
this.parentType = []; this.parentType = [];
this.parentId = 0; this.parentId = 0;
this.sonType= []; this.sonType = [];
this.sonId = 0; this.sonId = 0;
this.remark = ''; this.remark = "";
this.fileurl = ''; this.fileurl = "";
this.filename = ''; this.filename = "";
this.modal = true; this.modal = true;
this.type = 1; this.type = 1;
}, },
...@@ -490,11 +528,13 @@ export default { ...@@ -490,11 +528,13 @@ export default {
"get" "get"
).then((res) => { ).then((res) => {
if (res.data.ret == 1) { if (res.data.ret == 1) {
let arr = res.data.data;
this.contentTree(arr);
if (index == 1) { if (index == 1) {
this.toolingList1 = res.data.data; this.toolingList1 = arr;
} }
if (index == 2) { if (index == 2) {
this.toolingList2 = res.data.data; this.toolingList2 = arr;
} }
} else { } else {
this.$Message.error(this.$t(res.data.msg)); this.$Message.error(this.$t(res.data.msg));
...@@ -548,13 +588,19 @@ export default { ...@@ -548,13 +588,19 @@ export default {
url: url, url: url,
params: data, params: data,
method: type, method: type,
}); }).then((res) => {
return res;
})
.catch((error) => error);
} else { } else {
return this.axios.request({ return this.axios.request({
url: url, url: url,
data, data,
method: type, method: type,
}); }).then((res) => {
return res;
})
.catch((error) => error);
} }
}, },
}, },
......
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