Skip to content

M
mes-ui
Commit 52938112 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents 7f08beb0 79d960c7
Show whitespace changes
Inline Side-by-side
Showing with 1589 additions and 925 deletions
components/page/dataGrid.vue
View file @ 52938112
...@@ -102,6 +102,7 @@ export default { ...@@ -102,6 +102,7 @@ export default {
userId: this.$store.state.userInfo.userId, userId: this.$store.state.userInfo.userId,
treeData: [], //物料数据 treeData: [], //物料数据
codeRuleData: [], //物料编码 codeRuleData: [], //物料编码
routingHeaderData: [], //工艺规程
}; };
}, },
props: { props: {
...@@ -276,6 +277,7 @@ export default { ...@@ -276,6 +277,7 @@ export default {
//物料加载类型数据 //物料加载类型数据
this.getTreeData(); this.getTreeData();
this.getcodeRuleData(); this.getcodeRuleData();
this.getRoutingHeaderData();
}, },
methods: { methods: {
//数据加载 //数据加载
...@@ -518,10 +520,11 @@ export default { ...@@ -518,10 +520,11 @@ export default {
const tHeader = []; // 设置Excel的表格第一行的标题 const tHeader = []; // 设置Excel的表格第一行的标题
const filterVal = []; //list里对象的属性 const filterVal = []; //list里对象的属性
var tempCol = []; var tempCol = [];
var tempCol1 = []; var tempCol1 = []; //存放物料相关表头
var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata this.$refs.grid.columnsCur var tempCol2 = []; //存放工艺规程相关表头
var columnsCur = this.$u.clone(this.columnsCur); //导出列标题信息griddata this.$refs.grid.columnsCur
columnsCur.forEach((el) => { columnsCur.forEach((el) => {
if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) { if ((el.hide && el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
if (el.code) { if (el.code) {
tempCol.push({ tempCol.push({
key: el.key, key: el.key,
...@@ -534,6 +537,13 @@ export default { ...@@ -534,6 +537,13 @@ export default {
code: el.materialKey code: el.materialKey
}); //临时存放物料管理大类和子类列表 }); //临时存放物料管理大类和子类列表
} }
if (el.techKey) {
tempCol2.push({
key: el.key,
code: el.techKey
}); //临时存放工艺规程相关转换
}
tHeader.push(el.title); tHeader.push(el.title);
filterVal.push(el.key); filterVal.push(el.key);
} }
...@@ -546,7 +556,7 @@ export default { ...@@ -546,7 +556,7 @@ export default {
e[ele.key] e[ele.key]
); );
}); });
//导出数据增加对应的物料管理信息 //导出数据增加对应的物料管理信息 code： 1【rootCategoryId 大类】 2【categoryId 大类】 3【codeRuleId 编码名称】
tempCol1.forEach((elcol1) => { tempCol1.forEach((elcol1) => {
if (elcol1.code == 1) { if (elcol1.code == 1) {
e[elcol1.key] = this.getType1(e[elcol1.key]) e[elcol1.key] = this.getType1(e[elcol1.key])
...@@ -556,6 +566,12 @@ export default { ...@@ -556,6 +566,12 @@ export default {
e[elcol1.key] = this.getType3(e[elcol1.key]) e[elcol1.key] = this.getType3(e[elcol1.key])
} }
}); });
//导出工艺规程相关转换表头信息
tempCol2.forEach((elcol2) => {
if (elcol2.code == 1) {
e[elcol2.key] = this.getRoutingHeaderName(e[elcol2.key])
}
});
}); });
...@@ -620,6 +636,29 @@ export default { ...@@ -620,6 +636,29 @@ export default {
return codeRuleName return codeRuleName
}, },
//物料大类和子类的解析end //物料大类和子类的解析end
//工艺规程的解析start
//获取工艺规程名称
getRoutingHeaderData() {
let data = {
conditions: []
};
this.$api.post(`${technologyUrl}routingheader/list`, data).then((r) => {
if (r.success) {
this.routingHeaderData = r.result || []
}
});
},
getRoutingHeaderName(val) {
let routingHeaderDataList = this.$u.clone(this.routingHeaderData)
let routingHeaderName = ""
routingHeaderDataList.forEach(ele => {
if (ele.id == val) {
routingHeaderName = ele.name
}
})
return routingHeaderName
},
//工艺规程的解析end
}, },
computed: { computed: {
columnsNow() { columnsNow() {
......
components/page/import/process.vue
View file @ 52938112
...@@ -215,12 +215,13 @@ export default { ...@@ -215,12 +215,13 @@ export default {
useData.forEach(eles => { useData.forEach(eles => {
//如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id //如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id
if ( if (
eles.departmentTitle && [(eles.departmentTitle &&
eles.departmentTitle != "" && eles.departmentTitle != "") || (eles.departmentName &&
eles.departmentName != "")] &&
(!eles.departmentId || eles.departmentId == "") (!eles.departmentId || eles.departmentId == "")
) { ) {
this.departArr.forEach((e) => { this.departArr.forEach((e) => {
if (eles.departmentTitle && eles.departmentTitle == e.name) { if ((eles.departmentTitle && eles.departmentTitle == e.name) || (eles.departmentName && eles.departmentName == e.name)) {
eles.departmentId = e.id; eles.departmentId = e.id;
} }
}); });
...@@ -228,14 +229,16 @@ export default { ...@@ -228,14 +229,16 @@ export default {
//如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle //如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle
eles.departmentId && eles.departmentId &&
eles.departmentId + "" != "" && eles.departmentId + "" != "" &&
(!eles.departmentTitle || eles.departmentTitle == "") (!eles.departmentTitle || eles.departmentTitle == "") && (!eles.departmentName || eles.departmentName == "")
) { ) {
this.departArr.forEach((e) => { this.departArr.forEach((e) => {
if (eles.departmentId && eles.departmentId == e.id) { if (eles.departmentId && eles.departmentId == e.id) {
eles.departmentTitle = e.name; eles.departmentTitle = e.name;
eles.departmentName = e.name;
} }
}); });
} }
arrTitleUse.forEach((elem) => { arrTitleUse.forEach((elem) => {
if (eles[elem.key] && eles[elem.key] != "" && eles[elem.key] != null) { if (eles[elem.key] && eles[elem.key] != "" && eles[elem.key] != null) {
//如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值 //如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值
......
components/page/productSelect.vue
View file @ 52938112
<template> <template>
<Select v-model="dep" :placeholder="placeholdeinfo" clearable @on-clear="onClear"> <Select v-model="dep" :placeholder="placeholdeinfo" clearable @on-clear="onClear">
<Option <Option v-for="(item,index) in list" :key="index" :value="item.value" style="display:none" :label="item.label"></Option>
v-for="(item,index) in list"
:key="index"
:value="item.value"
style="display:none"
:label="item.label"
></Option>
<Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree> <Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
</Select> </Select>
</template> </template>
<script>
<script>
export default { export default {
name: "Add", name: "Add",
model: { model: {
...@@ -59,7 +54,10 @@ export default { ...@@ -59,7 +54,10 @@ export default {
this.selectdata = data; this.selectdata = data;
if (data[0].isProduct == "1") { if (data[0].isProduct == "1") {
this.list = []; this.list = [];
this.list.push({ label: data[0].title, value: data[0].id }); this.list.push({
label: data[0].title,
value: data[0].id
});
this.orderSearchForm.productName = data[0].title; this.orderSearchForm.productName = data[0].title;
this.orderSearchForm.productId = data[0].productId; this.orderSearchForm.productId = data[0].productId;
this.orderSearchForm.drawingNo = data[0].drawingNo; this.orderSearchForm.drawingNo = data[0].drawingNo;
...@@ -97,7 +95,11 @@ export default { ...@@ -97,7 +95,11 @@ export default {
} }
}); });
}, },
renderContent(h, { root, node, data }) { renderContent(h, {
root,
node,
data
}) {
let type = "md-folder"; let type = "md-folder";
let title = data.title; let title = data.title;
if (data.isProduct != 0) { if (data.isProduct != 0) {
...@@ -114,8 +116,7 @@ export default { ...@@ -114,8 +116,7 @@ export default {
} }
//渲染树的样式 //渲染树的样式
return h( return h(
"span", "span", {
{
on: { on: {
click: () => { click: () => {
let arrTree = []; let arrTree = [];
...@@ -134,8 +135,7 @@ export default { ...@@ -134,8 +135,7 @@ export default {
} }
}), }),
h( h(
"span", "span", {
{
style: { style: {
color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)" color: data.isProduct == 0 ? "#000" : "rgba(38, 128, 235, 1)"
} }
...@@ -171,7 +171,10 @@ export default { ...@@ -171,7 +171,10 @@ export default {
dataTemp.forEach(data => { dataTemp.forEach(data => {
if (data.isProduct == 1 && data.id == this.dep) { if (data.isProduct == 1 && data.id == this.dep) {
this.placeholdeinfo = data.title; this.placeholdeinfo = data.title;
this.list.push({ label: data.title, value: data.id }); this.list.push({
label: data.title,
value: data.id
});
} }
}); });
} }
......
i18n/locale/zh-CN.js
View file @ 52938112
...@@ -1175,10 +1175,11 @@ export default { ...@@ -1175,10 +1175,11 @@ export default {
code: '工艺文件编号', code: '工艺文件编号',
productId: '产品id', productId: '产品id',
productName: '产品名称', productName: '产品名称',
productBomId: '产品BomId',
drawingNo: '图号', drawingNo: '图号',
version: '版本', version: '版本',
author: '编制人', author: '编制人',
departmentId: '主制车间', departmentId: '主制车间Id',
departmentName: '主制车间', departmentName: '主制车间',
isMain: '主工艺', isMain: '主工艺',
upId: '父工艺', upId: '父工艺',
...@@ -1188,8 +1189,8 @@ export default { ...@@ -1188,8 +1189,8 @@ export default {
approvalStatus: '审批状态', approvalStatus: '审批状态',
remark: '工艺说明', remark: '工艺说明',
approvalStatusRemark: '审批备注', approvalStatusRemark: '审批备注',
auditUserId1: '审批人', auditUserId1: '审批人1',
auditUserId2: '审批人', auditUserId2: '审批人2',
isDeleted: '是否删除', isDeleted: '是否删除',
platesnum: '板数', platesnum: '板数',
isEffect: '有效', isEffect: '有效',
......
pages/aps/ai/index.vue
View file @ 52938112
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<Search /> <Search />
</template> </template>
<template slot="buttons"> <template slot="buttons">
应用规则：
<Select v-model="rulesAi" multiple style="width:280px;" class="tl"> <Select v-model="rulesAi" multiple style="width:280px;" class="tl">
<Option v-for="item in rulesAiList" :value="item.value" :key="item.value">{{ item.label }}</Option> <Option v-for="item in rulesAiList" :value="item.value" :key="item.value">{{ item.label }}</Option>
</Select> </Select>
......
pages/import/process.vue
View file @ 52938112
...@@ -331,15 +331,15 @@ export default { ...@@ -331,15 +331,15 @@ export default {
code: "User.base.status", code: "User.base.status",
}, },
], ],
columns3: [{ columns2: [{
key: "resourceCode", key: "resourceCode",
title: this.l3("resourceId"), title: this.l2("resourceId"),
align: "left", align: "left",
easy: true, easy: true,
}, },
{ {
key: "nameOfResource", key: "nameOfResource",
title: this.l3("nameOfResource"), title: this.l2("nameOfResource"),
align: "left", align: "left",
easy: true, easy: true,
tooltip: true, tooltip: true,
...@@ -351,56 +351,56 @@ export default { ...@@ -351,56 +351,56 @@ export default {
}, },
{ {
key: "creatorUserId", key: "creatorUserId",
title: this.l3("creatorUserId"), title: this.l2("creatorUserId"),
hide: false, hide: false,
type: "user", type: "user",
align: "left", align: "left",
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
title: this.l3("lastModificationTime"), title: this.l2("lastModificationTime"),
hide: true, hide: true,
align: "left", align: "left",
}, },
{ {
key: "lastModifierUserId", key: "lastModifierUserId",
title: this.l3("lastModifierUserId"), title: this.l2("lastModifierUserId"),
hide: true, hide: true,
align: "left", align: "left",
}, },
{ {
key: "isDeleted", key: "isDeleted",
title: this.l3("isDeleted"), title: this.l2("isDeleted"),
hide: true, hide: true,
align: "left", align: "left",
}, },
{ {
key: "deletionTime", key: "deletionTime",
title: this.l3("deletionTime"), title: this.l2("deletionTime"),
hide: true, hide: true,
align: "left", align: "left",
}, },
{ {
key: "deleterUserId", key: "deleterUserId",
title: this.l3("deleterUserId"), title: this.l2("deleterUserId"),
hide: true, hide: true,
align: "left", align: "left",
}, },
{ {
key: "totalNum", key: "totalNum",
title: this.l3("totalNum"), title: this.l2("totalNum"),
align: "right", align: "right",
easy: true, easy: true,
}, },
{ {
key: "numberAvailable", key: "numberAvailable",
title: this.l3("numberAvailable"), title: this.l2("numberAvailable"),
align: "right", align: "right",
easy: true, easy: true,
}, },
{ {
key: "measuringUnit", key: "measuringUnit",
title: this.l3("measuringUnit"), title: this.l2("measuringUnit"),
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
...@@ -408,7 +408,7 @@ export default { ...@@ -408,7 +408,7 @@ export default {
}, },
{ {
key: "qualityCharacteristics", key: "qualityCharacteristics",
title: this.l3("qualityCharacteristics"), title: this.l2("qualityCharacteristics"),
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
}, },
{ {
key: "batchNo", key: "batchNo",
title: this.l3("batchNo"), title: this.l2("batchNo"),
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
...@@ -424,24 +424,24 @@ export default { ...@@ -424,24 +424,24 @@ export default {
}, },
{ {
key: "storeId", key: "storeId",
title: this.l3("storeId"), title: this.l2("storeId"),
align: "left", align: "left",
high: true, high: true,
hide: true, hide: true,
}, },
{ {
key: "storeTitle", key: "storeTitle",
title: this.l3("storeTitle"), title: this.l2("storeTitle"),
align: "left", align: "left",
}, },
{ {
key: "state", key: "state",
title: this.l3("state"), title: this.l2("state"),
align: "center", align: "center",
code: "mes_xingchi_resource.resource.state", code: "mes_xingchi_resource.resource.state",
} }
], ],
columns4: [{ columns3: [{
key: "codeRuleType", key: "codeRuleType",
title: "类型", title: "类型",
align: "center", align: "center",
...@@ -518,6 +518,226 @@ export default { ...@@ -518,6 +518,226 @@ export default {
type: "user" type: "user"
} }
], ],
columns4: [{
key: "code",
title: this.l4("code"),
align: "left",
width: 200,
easy: true,
high: true
},
{
key: "name",
title: this.l4("name"),
align: "left",
easy: true,
high: true,
tooltip: true,
},
{
key: "phase",
title: this.l4("phase"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.phase"
},
{
key: "versionid",
title: this.l4("version"),
align: "center",
high: true,
width: 100,
code: "Process.Routing.version"
},
{
title: this.l4("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
code: "process.RoutingStatus"
},
{
key: "routingType",
title: this.l4("routingType"),
align: "center",
width: 100,
high: true,
code: "Process.Routing.routingType"
},
{
key: "drawingNo",
title: this.l4("drawingNo"),
align: "left",
high: true
},
{
key: "productName",
title: this.l4("productName"),
align: "left",
high: true,
tooltip: true,
},
{
key: "productId",
title: this.l4("productId"),
align: "left",
import: true,
hide: true,
},
{
key: "productBomId",
title: this.l4("productBomId"),
align: "left",
import: true,
hide: true,
},
{
key: "departmentName",
title: this.l4("departmentName"),
width: 100,
align: "left",
high: true,
tooltip: true,
},
{
key: "departmentId",
title: this.l4("departmentId"),
align: "left",
import: true,
hide: true,
},
{
key: "isEffect",
title: this.l4("isEffect"),
align: "center",
width: 80,
high: true,
code: "Process.Status"
}
],
columns5: [{
key: "routingDetailNo",
title: this.l5("routingDetailNo"),
align: "left",
high: true,
width: 100,
sortable: true
},
{
key: "routingHeaderId",
title: this.l5("routingHeaderName"),
hide: true,
import: true,
techKey: '1',
// render: (h, params) => {
// return h(
// "span", {},
// this.getRoutingHeaderName(params.row.routingHeaderId)
// );
// }
},
{
key: "routingDetailName",
title: this.l5("routingDetailName"),
align: "left",
high: true
},
{
key: "routingDetailId",
title: this.l5("routingDetailId"),
hide: true,
import: true,
},
{
key: "quantity",
title: this.l5("quantity"),
align: "right",
high: true,
width: 80,
},
{
key: "materialType",
title: this.l5("materialType"),
align: "center",
easy: true,
high: true,
code: "mes_xingchi_resource.material.materialReType",
width: 100,
},
{
key: "materialNumber",
title: this.l5("materialNumber"),
align: "left",
easy: true,
high: true
},
{
key: "materialId",
title: this.l5("materialId"),
align: "left",
hide: true,
import: true
},
{
key: "nameMaterial",
title: this.l5("nameMaterial"),
align: "left",
easy: true,
high: true,
},
{
key: "brand",
title: this.l5("brand"),
align: "left",
easy: true,
high: true
},
{
key: "specifications",
title: this.l5("specifications"),
align: "left",
easy: true,
high: true
},
{
key: "xhgg",
title: this.l5("xhgg"),
align: "left",
easy: true,
high: true,
hide: true,
},
{
key: "texture",
title: this.l5("texture"),
align: "left",
easy: true,
high: true
},
{
key: "procurementStandards",
title: this.l5("procurementStandards"),
align: "left",
easy: true,
high: true
},
{
key: "qualityGrade",
title: this.l5("qualityGrade"),
align: "left",
easy: true,
high: true
},
{
key: "drawNum",
title: this.l5("drawNum"),
align: "left",
easy: true,
high: true
},
],
tdHeightExcel: "", tdHeightExcel: "",
excelData: [], excelData: [],
excelDataBack: [], //临时存储原始数据 excelDataBack: [], //临时存储原始数据
...@@ -540,6 +760,7 @@ export default { ...@@ -540,6 +760,7 @@ export default {
//物料管理 //物料管理
treeData: [], //物料管理左侧类别树 treeData: [], //物料管理左侧类别树
codeRuleData: [], //物料编码等信息 codeRuleData: [], //物料编码等信息
routingHeaderData: [], //工艺规程列表信息
}; };
}, },
props: { props: {
...@@ -561,6 +782,8 @@ export default { ...@@ -561,6 +782,8 @@ export default {
//物料加载类型数据 //物料加载类型数据
this.getTreeData(); this.getTreeData();
this.getcodeRuleData(); this.getcodeRuleData();
//获取工艺规程信息
this.getRoutingHeaderData();
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
...@@ -596,7 +819,6 @@ export default { ...@@ -596,7 +819,6 @@ export default {
} }
} }
}).catch(e => { }).catch(e => {
//this.$Message.error("数据解析失败，请下载原文件后转为Excel重新进行上传！")
this.noDataText = "文件无法解析，建议下载原文件后转换为Excel文件格式重新上传！" this.noDataText = "文件无法解析，建议下载原文件后转换为Excel文件格式重新上传！"
}) })
...@@ -678,12 +900,13 @@ export default { ...@@ -678,12 +900,13 @@ export default {
useData.forEach(eles => { useData.forEach(eles => {
//如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id //如果导入文件没有departmentid，但存在departmentTitle的话，通过title获取id
if ( if (
eles.departmentTitle && [(eles.departmentTitle &&
eles.departmentTitle != "" && eles.departmentTitle != "") || (eles.departmentName &&
eles.departmentName != "")] &&
(!eles.departmentId || eles.departmentId == "") (!eles.departmentId || eles.departmentId == "")
) { ) {
this.departArr.forEach((e) => { this.departArr.forEach((e) => {
if (eles.departmentTitle && eles.departmentTitle == e.name) { if ((eles.departmentTitle && eles.departmentTitle == e.name) || (eles.departmentName && eles.departmentName == e.name)) {
eles.departmentId = e.id; eles.departmentId = e.id;
} }
}); });
...@@ -691,11 +914,12 @@ export default { ...@@ -691,11 +914,12 @@ export default {
//如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle //如果导入文件没有departmentTitle，但存在departmentid的话，通过id获取departmentTitle
eles.departmentId && eles.departmentId &&
eles.departmentId + "" != "" && eles.departmentId + "" != "" &&
(!eles.departmentTitle || eles.departmentTitle == "") (!eles.departmentTitle || eles.departmentTitle == "") && (!eles.departmentName || eles.departmentName == "")
) { ) {
this.departArr.forEach((e) => { this.departArr.forEach((e) => {
if (eles.departmentId && eles.departmentId == e.id) { if (eles.departmentId && eles.departmentId == e.id) {
eles.departmentTitle = e.name; eles.departmentTitle = e.name;
eles.departmentName = e.name;
} }
}); });
} }
...@@ -850,12 +1074,18 @@ export default { ...@@ -850,12 +1074,18 @@ export default {
case 1: case 1:
this.loadColum(this.columns1); this.loadColum(this.columns1);
break; break;
case 2:
this.loadColum(this.columns2);
break;
case 3: case 3:
this.loadColum(this.columns3); this.loadColum(this.columns3);
break; break;
case 4: case 4:
this.loadColum(this.columns4); this.loadColum(this.columns4);
break; break;
case 5:
this.loadColum(this.columns5);
break;
default: default:
this.loadColum(this.columns0); this.loadColum(this.columns0);
} }
...@@ -879,12 +1109,18 @@ export default { ...@@ -879,12 +1109,18 @@ export default {
case 0: case 0:
this.importUser(); this.importUser();
break; break;
case 3: case 2:
this.importResource(); this.importResource();
break; break;
case 4: case 3:
this.importMateriel(); this.importMateriel();
break; break;
case 4:
this.importRountingHeader();
break;
case 5:
this.importRountingBom();
break;
default: default:
//this.loadColum(this.columns1); //this.loadColum(this.columns1);
} }
...@@ -1083,6 +1319,146 @@ export default { ...@@ -1083,6 +1319,146 @@ export default {
}, },
//获取编码名称等end //获取编码名称等end
//插入物料管理end //插入物料管理end
//插入工艺规程 及工艺相关start
importRountingHeader() {
let tempData = this.$u.clone(this.dataIm);
let tempList = [];
tempData.forEach((ele) => {
let obj = {
classId: null,
unicode: "",
name: ele.name ? ele.name : '',
code: ele.code ? ele.code : '',
productId: ele.productId ? ele.productId : '', //?
productName: ele.productName ? ele.productName : "", //?
productBomId: ele.productBomId ? ele.productBomId : "", //?
drawingNo: ele.drawingNo ? ele.drawingNo : "", //?
version: "",
versionid: ele.versionid ? ele.versionid : "",
author: null,
departmentId: ele.departmentId ? ele.departmentId : null, //?
departmentName: ele.departmentName ? ele.departmentName : "", //?
isMain: 1,
upId: null,
upDetailId: null,
routingType: ele.routingType ? ele.routingType : null,
status: 0,
approvalStatus: 4, //?
remark: "",
approvalStatusRemark: "",
auditUserId1: "",
auditUserId2: "",
platesnum: null,
versionnotes: "",
isSendPpm: 1,
fileId: "",
phase: ele.phase ? ele.phase : null,
isEffect: ele.isEffect ? ele.isEffect : 1
};
if (ele.name && ele.name != '') {
tempList.push(obj);
}
});
if (tempList.length == 0) {
this.$Message.error("所有导入的数据均不合法！");
} else {
let parms = {
list: tempList,
};
let url = `${technologyUrl}routingheaderimportservice/import`
this.$api.post(url, parms).then((r) => {
if (r.success) {
this.$Message.success("成功批量导入工艺规程模块 " + tempList.length + " 条数据");
this.imBtn = false;
this.cancelExcel();
} else {
this.$Message.error("批量导入失败")
}
}).catch(err => {
this.$Message.error("数据异常！");
});
}
},
//导入工艺bom
importRountingBom() {
let tempData = this.$u.clone(this.dataIm);
let tempList = [];
tempData.forEach((ele) => {
let obj = {
routingHeaderId: Number(this.getRoutingHeaderId(ele.routingHeaderId)),
routingDetailId: ele.routingDetailId ? Number(ele.routingDetailId) : null,
routingDetailNo: ele.routingDetailNo ? Number(ele.routingDetailNo) : null,
routingDetailName: ele.routingDetailName ? ele.routingDetailName : '',
routingStepId: 0,
quantity: ele.quantity ? Number(ele.quantity) : 0,
materialId: ele.materialId ? ele.materialId : '',
materialType: ele.materialType ? Number(ele.materialType) : '',
materialNumber: ele.materialNumber ? ele.materialNumber : '',
nameMaterial: ele.nameMaterial ? ele.nameMaterial : '',
brand: ele.brand ? ele.brand : '',
specifications: ele.specifications ? ele.specifications : '',
xhgg: ele.xhgg ? ele.xhgg : '',
texture: ele.texture ? ele.texture : '',
procurementStandards: ele.procurementStandards ? ele.procurementStandards : '',
qualityGrade: ele.qualityGrade ? ele.qualityGrade : '',
state: null,
extend: "",
remark: "",
drawNum: ele.drawNum ? ele.drawNum : ''
};
if (ele.routingDetailId && ele.routingDetailId != null) {
tempList.push(obj);
}
});
if (tempList.length == 0) {
this.$Message.error("所有导入的数据均不合法！");
} else {
let parms = {
list: tempList,
};
let url = `${technologyUrl}productinfoimportservice/import`
this.$api.post(url, parms).then((r) => {
if (r.success) {
this.$Message.success("成功批量导入工艺Bom模块 " + tempList.length + " 条数据");
this.imBtn = false;
this.cancelExcel();
} else {
this.$Message.error("批量导入失败")
}
}).catch(err => {
this.$Message.error("数据异常！");
});
}
},
//获取工艺规程列表
getRoutingHeaderData() {
let url = `${technologyUrl}routingheader/list`;
let data = {
conditions: []
};
this.$api.post(url, data).then((r) => {
if (r.success) {
this.routingHeaderData = r.result || []
}
});
},
//根据工艺规程ID获得name
getRoutingHeaderId(val) {
let routingHeaderDataList = this.$u.clone(this.routingHeaderData)
let routingHeaderId = 0
routingHeaderDataList.forEach(ele => {
if (ele.name == val) {
routingHeaderId = ele.id
}
})
return routingHeaderId
},
//插入工艺规程 及工艺相关end
//切换列表和excel按钮 //切换列表和excel按钮
changeExcel(val) { changeExcel(val) {
...@@ -1107,10 +1483,18 @@ export default { ...@@ -1107,10 +1483,18 @@ export default {
key = "user" + "." + key; key = "user" + "." + key;
return this.$t(key); return this.$t(key);
}, },
l3(key) { l2(key) {
key = "resource" + "." + key; key = "resource" + "." + key;
return this.$t(key); return this.$t(key);
}, },
l4(key) {
key = "routingHeader" + "." + key;
return this.$t(key);
},
l5(key) {
key = "routingsupporting" + "." + key;
return this.$t(key);
},
}, },
watch: { watch: {
eid(v) { eid(v) {
......
pages/materiel/masterData/masterData.vue
View file @ 52938112
...@@ -74,12 +74,16 @@ export default { ...@@ -74,12 +74,16 @@ export default {
key: "codeRuleType", key: "codeRuleType",
title: "类型", title: "类型",
align: "center", align: "center",
code: "material.code.type" code: "material.code.type",
import: true,
hide: true,
}, },
{ {
key: "codeRuleId", key: "codeRuleId",
title: "编码名称", title: "编码名称",
materialKey: '3', materialKey: '3',
import: true,
hide: true,
render: (h, params) => { render: (h, params) => {
return h( return h(
"span", {}, "span", {},
...@@ -92,6 +96,8 @@ export default { ...@@ -92,6 +96,8 @@ export default {
title: "大类", title: "大类",
align: "right", align: "right",
materialKey: '1', materialKey: '1',
import: true,
hide: true,
render: (h, params) => { render: (h, params) => {
return h( return h(
"span", {}, "span", {},
...@@ -104,6 +110,8 @@ export default { ...@@ -104,6 +110,8 @@ export default {
title: "子类", title: "子类",
align: "right", align: "right",
materialKey: '2', materialKey: '2',
import: true,
hide: true,
render: (h, params) => { render: (h, params) => {
return h( return h(
"span", {}, "span", {},
......
pages/technology/add.vue
View file @ 52938112
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="110"> <Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row> <Row>
<!-- <Col :span="12"> <!-- <Col :span="12">
<FormItem :label="l('classId')" prop="classId"> <FormItem :label="l('classId')" prop="classId">
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</Col> </Col>
<Col :span="8"> <Col :span="8">
<FormItem :label="l('departmentName')" prop="departmentId"> <FormItem :label="l('departmentName')" prop="departmentId">
<departmentSelect v-model="entity.departmentId" type="3" @on-change="departChange"></departmentSelect> <departmentSelect v-model="entity.departmentId" :type="3" @on-change="departChange"></departmentSelect>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="8"> <Col :span="8">
...@@ -151,9 +151,11 @@ ...@@ -151,9 +151,11 @@
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button> <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script>
<script>
import Api from "./api"; import Api from "./api";
import ApiWorkflow from "../workflow/process/api"; import ApiWorkflow from "../workflow/process/api";
import iQuill from "@/components/quill"; import iQuill from "@/components/quill";
...@@ -197,16 +199,22 @@ export default { ...@@ -197,16 +199,22 @@ export default {
fileId: "" fileId: ""
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
code: [{ required: true, message: "必填", trigger: "blur" }], required: true,
routingType: [ message: "必填",
{ trigger: "blur"
}],
code: [{
required: true,
message: "必填",
trigger: "blur"
}],
routingType: [{
required: true, required: true,
message: "请选择工艺类型", message: "请选择工艺类型",
trigger: "change", trigger: "change",
type: "number" type: "number"
} }]
]
}, },
parms: { parms: {
app: "technology", app: "technology",
...@@ -328,7 +336,9 @@ export default { ...@@ -328,7 +336,9 @@ export default {
} }
}, },
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({
id: v
}).then(r => {
this.entity = r.result; this.entity = r.result;
this.entity.isEffect = parseInt(r.result.isEffect); this.entity.isEffect = parseInt(r.result.isEffect);
this.entity.id = 0; this.entity.id = 0;
...@@ -336,7 +346,10 @@ export default { ...@@ -336,7 +346,10 @@ export default {
this.getCodNumber(); this.getCodNumber();
}, },
getCodNumber() { getCodNumber() {
Api.getCodeNumber({ code: "GY", count: "1" }).then(r => { Api.getCodeNumber({
code: "GY",
count: "1"
}).then(r => {
if (r.success) { if (r.success) {
this.entity.code = r.result[0]; this.entity.code = r.result[0];
} else { } else {
......
pages/technology/details/routingsupporting/api.js
View file @ 52938112
...@@ -27,4 +27,8 @@ export default { ...@@ -27,4 +27,8 @@ export default {
getmaterialids(params) { getmaterialids(params) {
return Api.get(`${technologyUrl}productinfo/getmaterialids`, params); return Api.get(`${technologyUrl}productinfo/getmaterialids`, params);
}, },
//获取所有工艺规程
getRoutingheaderList(params) {
return Api.post(`${technologyUrl}routingheader/list`, params);
},
} }
pages/technology/details/routingsupporting/index.vue
View file @ 52938112
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button> <Button type="primary" @click="add" v-show="headerStatus==0||headerStatus==4">新增</Button>
<Button @click="openModalIm">导入</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide> <Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" :headid="hid" :productBomId="productBomId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" :headid="hid" :productBomId="productBomId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
<ImportExcel ref="importExcel" @on-get-data="getData" :modalTitle="temTitle" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
</div> </div>
</template> </template>
...@@ -56,7 +58,9 @@ export default { ...@@ -56,7 +58,9 @@ export default {
detail: null, detail: null,
curId: 0, curId: 0,
hid: 0, hid: 0,
columns: [{ columns: [
{
key: "routingDetailNo", key: "routingDetailNo",
title: this.l("routingDetailNo"), title: this.l("routingDetailNo"),
align: "left", align: "left",
...@@ -64,12 +68,31 @@ export default { ...@@ -64,12 +68,31 @@ export default {
width: 100, width: 100,
sortable: true sortable: true
}, },
{
key: "routingHeaderId",
title: this.l("routingHeaderName"),
hide: true,
import: true,
techKey: '1',
render: (h, params) => {
return h(
"span", {},
this.getRoutingHeaderName(params.row.routingHeaderId)
);
}
},
{ {
key: "routingDetailName", key: "routingDetailName",
title: this.l("routingDetailName"), title: this.l("routingDetailName"),
align: "left", align: "left",
high: true high: true
}, },
{
key: "routingDetailId",
title: this.l("routingDetailId"),
hide: true,
import: true,
},
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
...@@ -93,6 +116,13 @@ export default { ...@@ -93,6 +116,13 @@ export default {
easy: true, easy: true,
high: true high: true
}, },
{
key: "materialId",
title: this.l("materialId"),
align: "left",
hide: true,
import: true
},
{ {
key: "nameMaterial", key: "nameMaterial",
title: this.l("nameMaterial"), title: this.l("nameMaterial"),
...@@ -229,6 +259,9 @@ export default { ...@@ -229,6 +259,9 @@ export default {
], ],
headerStatus: -1, headerStatus: -1,
productBomId: -1, productBomId: -1,
ModalIm: false,
temTitle: "工艺Bom",
routingHeaderData: [],
}; };
}, },
created() { created() {
...@@ -243,6 +276,7 @@ export default { ...@@ -243,6 +276,7 @@ export default {
}, },
mounted() { mounted() {
console.log(this); console.log(this);
this.getRoutingHeaderData();
this.search(); this.search();
}, },
async fetch({ async fetch({
...@@ -298,6 +332,81 @@ export default { ...@@ -298,6 +332,81 @@ export default {
this.curId = 0; this.curId = 0;
this.modal = false; this.modal = false;
}, },
//批量导入start
//导入功能
openModalIm() {
this.ModalIm = true
},
ModalImCancel() {
this.ModalIm = false
},
getData(val) {
let url = `${technologyUrl}productinfoimportservice/import`;
this.$refs.importExcel.deelData(url, this.cols, this.formatMethod(val))
},
//根据页面二次处理数据
formatMethod(val) {
// alert(JSON.stringify(val))
let tempData = this.$u.clone(val);
let tempList = [];
tempData.forEach((ele) => {
let obj = {
routingHeaderId: Number(this.headerid),
routingDetailId: ele.routingDetailId ? Number(ele.routingDetailId) : null,
routingDetailNo: ele.routingDetailNo ? Number(ele.routingDetailNo) : null,
routingDetailName: ele.routingDetailName ? ele.routingDetailName : '',
routingStepId: 0,
quantity: ele.quantity ? Number(ele.quantity) : 0,
materialId: ele.materialId ? ele.materialId : '',
materialType: ele.materialType ? Number(ele.materialType) : '',
materialNumber: ele.materialNumber ? ele.materialNumber : '',
nameMaterial: ele.nameMaterial ? ele.nameMaterial : '',
brand: ele.brand ? ele.brand : '',
specifications: ele.specifications ? ele.specifications : '',
xhgg: ele.xhgg ? ele.xhgg : '',
texture: ele.texture ? ele.texture : '',
procurementStandards: ele.procurementStandards ? ele.procurementStandards : '',
qualityGrade: ele.qualityGrade ? ele.qualityGrade : '',
state: null,
extend: "",
remark: "",
drawNum: ele.drawNum ? ele.drawNum : ''
};
if (ele.routingDetailId && ele.routingDetailId != null) {
obj.ico = false
} else {
obj.ico = true
}
tempList.push(obj);
});
return tempList
},
//批量导入end
//工艺规程id和name之间的转换
//获取工艺规程信息
getRoutingHeaderData() {
let data = {
conditions: []
};
Api.getRoutingheaderList(data).then((r) => {
if (r.success) {
this.routingHeaderData = r.result || []
}
});
},
//根据工艺规程ID获得name
getRoutingHeaderName(val) {
let routingHeaderDataList = this.$u.clone(this.routingHeaderData)
let routingHeaderName = ""
routingHeaderDataList.forEach(ele => {
if (ele.id == Number(val)) {
routingHeaderName = ele.name
}
})
return routingHeaderName
},
l(key) { l(key) {
let vkey = "routingsupporting" + "." + key; let vkey = "routingsupporting" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
......
pages/technology/index.vue
View file @ 52938112
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
// right: 100%; // right: 100%;
z-index: 100; z-index: 100;
background-color: white; background-color: white;
// background: red; // background: red;
.top { .top {
height: 42px; height: 42px;
...@@ -21,7 +22,7 @@ ...@@ -21,7 +22,7 @@
} }
</style> </style>
<template> <template>
<Layout class="lay100"> <Layout class="lay100">
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" /> <ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider> </Sider>
...@@ -31,16 +32,11 @@ ...@@ -31,16 +32,11 @@
</a> </a>
</div> </div>
<Content class="con" :class="!showMenu?'con_bord':''"> <Content class="con" :class="!showMenu?'con_bord':''">
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action" exportTitle="工艺规程">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input <Input placeholder="请输入工艺名称/工艺编号" v-width="200" v-model="easySearch.keys.value" clearable />
placeholder="请输入工艺名称/工艺编号"
v-width="200"
v-model="easySearch.keys.value"
clearable
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -52,28 +48,13 @@ ...@@ -52,28 +48,13 @@
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
<Button @click="openModalIm">导入</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1120" footer-hide> <Modal v-model="modal" :title="title" width="1120" footer-hide>
<component <component :is="detail" :eid="curId" :uid="uId" :title="title" :headid="hid" @on-close="cancel" @on-ok="ok" />
:is="detail"
:eid="curId"
:uid="uId"
:title="title"
:headid="hid"
@on-close="cancel"
@on-ok="ok"
/>
</Modal> </Modal>
<Modal <Modal v-model="documentShow" title="送审" :mask-closable="false" :scrollable="true" ok-text="确定" cancel-text="取消" fullscreen>
v-model="documentShow"
title="送审"
:mask-closable="false"
:scrollable="true"
ok-text="确定"
cancel-text="取消"
fullscreen
>
<sendAudit ref="sendAudit"></sendAudit> <sendAudit ref="sendAudit"></sendAudit>
<div slot="footer"> <div slot="footer">
...@@ -111,8 +92,9 @@ ...@@ -111,8 +92,9 @@
<iframe width="100%" id="infoFrame" height="100%" frameborder="0" :src="src"></iframe> <iframe width="100%" id="infoFrame" height="100%" frameborder="0" :src="src"></iframe>
</div> </div>
</div> </div>
<ImportExcel ref="importExcel" @on-get-data="getData" :modalTitle="temTitle" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
</Content> </Content>
</Layout> </Layout>
</template> </template>
<script> <script>
...@@ -142,7 +124,10 @@ export default { ...@@ -142,7 +124,10 @@ export default {
treeHeight: "", treeHeight: "",
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "unicode,name,code", value: null } keys: {
op: "unicode,name,code",
value: null
}
}, },
hid: 0, hid: 0,
modal: false, modal: false,
...@@ -154,8 +139,7 @@ export default { ...@@ -154,8 +139,7 @@ export default {
curId: 0, curId: 0,
uId: "", uId: "",
documentShow: false, documentShow: false,
columns: [ columns: [{
{
key: "code", key: "code",
title: this.l("code"), title: this.l("code"),
align: "left", align: "left",
...@@ -169,7 +153,7 @@ export default { ...@@ -169,7 +153,7 @@ export default {
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
tooltip:true, tooltip: true,
}, },
{ {
key: "phase", key: "phase",
...@@ -185,14 +169,14 @@ export default { ...@@ -185,14 +169,14 @@ export default {
align: "center", align: "center",
high: true, high: true,
width: 100, width: 100,
code:"Process.Routing.version" code: "Process.Routing.version"
}, },
{ {
title: this.l("approvalStatus"), title: this.l("approvalStatus"),
key: "approvalStatus", key: "approvalStatus",
align: "center", align: "center",
width: "120", width: "120",
code:"process.RoutingStatus" code: "process.RoutingStatus"
}, },
{ {
key: "routingType", key: "routingType",
...@@ -213,7 +197,21 @@ export default { ...@@ -213,7 +197,21 @@ export default {
title: this.l("productName"), title: this.l("productName"),
align: "left", align: "left",
high: true, high: true,
tooltip:true, tooltip: true,
},
{
key: "productId",
title: this.l("productId"),
align: "left",
import: true,
hide: true,
},
{
key: "productBomId",
title: this.l("productBomId"),
align: "left",
import: true,
hide: true,
}, },
{ {
key: "departmentName", key: "departmentName",
...@@ -221,7 +219,14 @@ export default { ...@@ -221,7 +219,14 @@ export default {
width: 100, width: 100,
align: "left", align: "left",
high: true, high: true,
tooltip:true, tooltip: true,
},
{
key: "departmentId",
title: this.l("departmentId"),
align: "left",
import: true,
hide: true,
}, },
{ {
key: "isEffect", key: "isEffect",
...@@ -257,7 +262,7 @@ export default { ...@@ -257,7 +262,7 @@ export default {
title: this.$t("creatorUserId"), title: this.$t("creatorUserId"),
align: "left", align: "left",
hide: true, hide: true,
type:"user" type: "user"
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
...@@ -270,7 +275,7 @@ export default { ...@@ -270,7 +275,7 @@ export default {
title: this.$t("lastModifierUserId"), title: this.$t("lastModifierUserId"),
align: "left", align: "left",
hide: true, hide: true,
type:"user" type: "user"
}, },
{ {
title: "操作", title: "操作",
...@@ -278,61 +283,84 @@ export default { ...@@ -278,61 +283,84 @@ export default {
width: 260, width: 260,
align: "left", align: "left",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "detail" }, oprate: "detail"
on: { click: () => this.viewprocess(params.row) } },
on: {
click: () => this.viewprocess(params.row)
}
}, },
"预览" "预览"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "detail" }, oprate: "detail"
on: { click: () => this.view(params.row) } },
on: {
click: () => this.view(params.row)
}
}, },
"查看" "查看"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "copy" }, oprate: "copy"
on: { click: () => this.copy(params.row.id) } },
on: {
click: () => this.copy(params.row.id)
}
}, },
"克隆" "克隆"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "edit" }, oprate: "edit"
on: { click: () => this.edit(params.row) } },
on: {
click: () => this.edit(params.row)
}
}, },
'编辑' '编辑'
// params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "编辑" : "" // params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "delete" }, oprate: "delete"
on: { click: () => this.remove(params.row.id) }
}, },
params.row.approvalStatus == 4||params.row.approvalStatus == 0 ? "删除" : "" on: {
click: () => this.remove(params.row.id)
}
},
params.row.approvalStatus == 4 || params.row.approvalStatus == 0 ? "删除" : ""
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "detail" }, oprate: "detail"
on: { click: () => this.TechnologyChange(params.row) } },
on: {
click: () => this.TechnologyChange(params.row)
}
}, },
params.row.approvalStatus == 1 ? "新增更改单" : "" params.row.approvalStatus == 1 ? "新增更改单" : ""
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "detail" }, oprate: "detail"
on: { click: () => this.sendAuditFun(params.row) } },
on: {
click: () => this.sendAuditFun(params.row)
}
}, },
params.row.approvalStatus == 4 ? "送审" : "" params.row.approvalStatus == 4 ? "送审" : ""
) )
...@@ -347,13 +375,18 @@ export default { ...@@ -347,13 +375,18 @@ export default {
version: "", //工艺版本 version: "", //工艺版本
departmentName: null //车间 departmentName: null //车间
}, },
processviewModal: false processviewModal: false,
ModalIm: false,
temTitle: "工艺规程",
}; };
}, },
created() { created() {
this.treeHeight = window.innerHeight - 120; this.treeHeight = window.innerHeight - 120;
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
...@@ -375,7 +408,12 @@ export default { ...@@ -375,7 +408,12 @@ export default {
this.showMenu = true; this.showMenu = true;
}, },
productSearch(id, item, ids) { productSearch(id, item, ids) {
let where = { productId: { op: "In", value: ids } }; let where = {
productId: {
op: "In",
value: ids
}
};
this.$refs.grid.reload(where); this.$refs.grid.reload(where);
}, },
// 详情页面 // 详情页面
...@@ -390,7 +428,7 @@ export default { ...@@ -390,7 +428,7 @@ export default {
}; };
// this.info=()=>import("./details") // this.info=()=>import("./details")
this.src = "/technology/details?id=" + row.id+"&headerStatus="+row.approvalStatus+"&productBomId="+row.productBomId; this.src = "/technology/details?id=" + row.id + "&headerStatus=" + row.approvalStatus + "&productBomId=" + row.productBomId;
}, },
viewClose() { viewClose() {
this.viewModal = false; this.viewModal = false;
...@@ -497,7 +535,9 @@ export default { ...@@ -497,7 +535,9 @@ export default {
this.seleId = data.row.id; this.seleId = data.row.id;
this.$refs.changelist.seleId = data.row.id; this.$refs.changelist.seleId = data.row.id;
let url = `${designUrl}/routingheaderchangeorder/getpaged`; let url = `${designUrl}/routingheaderchangeorder/getpaged`;
service.get(`${url}`, { routing_header_id: this.seleId }).then(res => { service.get(`${url}`, {
routing_header_id: this.seleId
}).then(res => {
//console.log(res) //console.log(res)
this.$refs.changelist.data2 = res.result.items; this.$refs.changelist.data2 = res.result.items;
this.$refs.changelist.myloading = false; this.$refs.changelist.myloading = false;
...@@ -508,7 +548,66 @@ export default { ...@@ -508,7 +548,66 @@ export default {
} }
this.$refs.changelist.show3 = true; this.$refs.changelist.show3 = true;
}); });
},
//批量导入start
//导入功能
openModalIm() {
this.ModalIm = true
},
ModalImCancel() {
this.ModalIm = false
},
getData(val) {
let url = `${technologyUrl}routingheaderimportservice/import`;
this.$refs.importExcel.deelData(url, this.columns, this.formatMethod(val))
},
//根据页面二次处理数据
formatMethod(val) {
let tempData = this.$u.clone(val);
let tempList = [];
tempData.forEach((ele) => {
let obj = {
classId: null,
unicode: "",
name: ele.name ? ele.name : '',
code: ele.code ? ele.code : '',
productId: ele.productId ? ele.productId : '', //?
productName: ele.productName ? ele.productName : "", //?
productBomId: ele.productBomId ? ele.productBomId : "", //?
drawingNo: ele.drawingNo ? ele.drawingNo : "", //?
version: "",
versionid: ele.versionid ? ele.versionid : "",
author: null,
departmentId: ele.departmentId ? ele.departmentId : null, //?
departmentName: ele.departmentName ? ele.departmentName : "", //?
isMain: 1,
upId: null,
upDetailId: null,
routingType: ele.routingType ? ele.routingType : null,
status: 0,
approvalStatus: 4, //?
remark: "",
approvalStatusRemark: "",
auditUserId1: "",
auditUserId2: "",
platesnum: null,
versionnotes: "",
isSendPpm: 1,
fileId: "",
phase: ele.phase ? ele.phase : null,
isEffect: ele.isEffect ? ele.isEffect : 1
};
if (ele.name && ele.name != '') {
obj.ico = false
} else {
obj.ico = true
} }
tempList.push(obj);
});
return tempList
},
//批量导入end
} }
}; };
</script> </script>
......
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