Skip to content

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

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

parents 8aee2646 abc532dd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 979 additions and 616 deletions
components/page/dataGrid.vue
View file @ ca559b17
...@@ -100,6 +100,8 @@ export default { ...@@ -100,6 +100,8 @@ export default {
userConfig: null, //用户页面配置信息。, userConfig: null, //用户页面配置信息。,
// userId: 1 // userId: 1
userId: this.$store.state.userInfo.userId, userId: this.$store.state.userInfo.userId,
treeData: [], //物料数据
codeRuleData: [], //物料编码
}; };
}, },
props: { props: {
...@@ -271,6 +273,9 @@ export default { ...@@ -271,6 +273,9 @@ export default {
this.$dragging.$on("dragend", (e) => { this.$dragging.$on("dragend", (e) => {
this.saveUserconfig(); this.saveUserconfig();
}); });
//物料加载类型数据
this.getTreeData();
this.getcodeRuleData();
}, },
methods: { methods: {
//数据加载 //数据加载
...@@ -513,6 +518,7 @@ export default { ...@@ -513,6 +518,7 @@ export default {
const tHeader = []; // 设置Excel的表格第一行的标题 const tHeader = []; // 设置Excel的表格第一行的标题
const filterVal = []; //list里对象的属性 const filterVal = []; //list里对象的属性
var tempCol = []; var tempCol = [];
var tempCol1 = [];
var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata this.$refs.grid.columnsCur var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息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")) {
...@@ -522,6 +528,12 @@ export default { ...@@ -522,6 +528,12 @@ export default {
code: el.code code: el.code
}); //临时存放code数据字典的字段及对应的数据字典code }); //临时存放code数据字典的字段及对应的数据字典code
} }
if (el.materialKey) {
tempCol1.push({
key: el.key,
code: el.materialKey
}); //临时存放物料管理大类和子类列表
}
tHeader.push(el.title); tHeader.push(el.title);
filterVal.push(el.key); filterVal.push(el.key);
} }
...@@ -534,7 +546,19 @@ export default { ...@@ -534,7 +546,19 @@ export default {
e[ele.key] e[ele.key]
); );
}); });
//导出数据增加对应的物料管理信息
tempCol1.forEach((elcol1) => {
if (elcol1.code == 1) {
e[elcol1.key] = this.getType1(e[elcol1.key])
} else if (elcol1.code == 2) {
e[elcol1.key] = this.getType2(e[elcol1.key])
} else if (elcol1.code == 3) {
e[elcol1.key] = this.getType3(e[elcol1.key])
}
});
}); });
let nowDate = this.$u.getNowTime(); //年月日时分秒yyyyMMddhhmmss let nowDate = this.$u.getNowTime(); //年月日时分秒yyyyMMddhhmmss
//获取导出数据结束 //获取导出数据结束
this.$u.outExcel(this.exportTitle + this.$u.outExcel(this.exportTitle +
...@@ -545,6 +569,57 @@ export default { ...@@ -545,6 +569,57 @@ export default {
); );
}); });
}, },
//物料大类和子类的解析start
getTreeData() {
let data = {
conditions: []
};
this.$api.post(`${material}/category/list`, data).then((r) => {
this.treeData = r.result
});
},
getType1(val) {
let tempTreeList = this.$u.clone(this.treeData)
let rootName = ""
tempTreeList.forEach(ele => {
if (ele.upId == 0 && ele.id == val) {
rootName = ele.name
}
})
return rootName
},
getType2(val) {
let tempTreeList = this.$u.clone(this.treeData)
let childrenName = ""
tempTreeList.forEach(ele => {
if (ele.upId > 0 && ele.id == val) {
childrenName = ele.name
}
})
return childrenName
},
//获取编码名称
getcodeRuleData() {
let data = {
conditions: []
};
this.$api.post(`${material}/coderule/paged`, data).then((r) => {
if (r.success) {
this.codeRuleData = r.result.items || []
}
});
},
getType3(val) {
let codeRuleDataList = this.$u.clone(this.codeRuleData)
let codeRuleName = ""
codeRuleDataList.forEach(ele => {
if (ele.id == val) {
codeRuleName = ele.name
}
})
return codeRuleName
},
//物料大类和子类的解析end
}, },
computed: { computed: {
columnsNow() { columnsNow() {
......
components/page/import/process.vue
View file @ ca559b17
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</FormItem> </FormItem>
</Form> </Form>
</FooterToolbar> </FooterToolbar>
<Modal v-model="infoModal" :title="titleInfo" fullscreen> <Modal v-model="infoModal" :title="modalTitles" fullscreen>
<DataGrid :tool="false" :page="false" :columns="colsIm" :data="dataIm" :height="tdHeightExcel+30" ref="dataImport"></DataGrid> <DataGrid :tool="false" :page="false" :columns="colsIm" :data="dataIm" :height="tdHeightExcel+30" ref="dataImport"></DataGrid>
<div slot="footer"> <div slot="footer">
<Button @click="infoModal=false">关闭</Button> <Button @click="infoModal=false">关闭</Button>
...@@ -236,7 +236,6 @@ export default { ...@@ -236,7 +236,6 @@ export default {
} }
}); });
} }
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，然后赋值
...@@ -246,9 +245,9 @@ export default { ...@@ -246,9 +245,9 @@ export default {
); );
} }
}); });
}) })
this.dataIm = useData; this.dataIm = useData;
let tempData = this.$u.clone(this.dataIm); let tempData = this.$u.clone(this.dataIm);
this.$emit("on-get-data", tempData) this.$emit("on-get-data", tempData)
}, },
......
pages/import/process.vue
View file @ ca559b17
This diff is collapsed.
pages/materiel/masterData/index.vue
View file @ ca559b17
<template> <template>
<div class="classification"> <div class="classification">
<Layout> <Layout>
<Sider width="300" v-if="showMenu"> <Sider width="300" v-if="showMenu">
<div class="p-list"> <div class="p-list">
...@@ -10,25 +10,13 @@ ...@@ -10,25 +10,13 @@
<Icon type="ios-arrow-down"></Icon> <Icon type="ios-arrow-down"></Icon>
</a> </a>
<DropdownMenu slot="list"> <DropdownMenu slot="list">
<DropdownItem <DropdownItem v-for="item in cityList" :key="item.id" :name="item.id">{{ item.name }}</DropdownItem>
v-for="item in cityList"
:key="item.id"
:name="item.id"
>{{ item.name }}</DropdownItem>
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
<div class="fr mr10 mt10"> <div class="fr mr10 mt10">
<ButtonGroup class="fr ddi" size="small"> <ButtonGroup class="fr ddi" size="small">
<Button <Button :icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'" @click="toggle" title="展开/合并"></Button>
:icon="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'" <Button icon="md-refresh" title="刷新" @click="loadTree(model8,nodeInfo.codeRuleType)"></Button>
@click="toggle"
title="展开/合并"
></Button>
<Button
icon="md-refresh"
title="刷新"
@click="loadTree(model8,nodeInfo.codeRuleType)"
></Button>
<Button icon="md-rewind" title="收起" @click="hide"></Button> <Button icon="md-rewind" title="收起" @click="hide"></Button>
</ButtonGroup> </ButtonGroup>
</div> </div>
...@@ -52,7 +40,7 @@ ...@@ -52,7 +40,7 @@
<MasterData ref="dataTable" :nodeInfo="nodeInfo" @on-ok="ok" /> <MasterData ref="dataTable" :nodeInfo="nodeInfo" @on-ok="ok" />
</Content> </Content>
</Layout> </Layout>
</div> </div>
</template> </template>
<script> <script>
...@@ -93,7 +81,10 @@ export default { ...@@ -93,7 +81,10 @@ export default {
categoryId: null, categoryId: null,
}; };
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
created() { created() {
...@@ -149,10 +140,13 @@ export default { ...@@ -149,10 +140,13 @@ export default {
this.curId = 0; this.curId = 0;
this.modal = false; this.modal = false;
}, },
renderContent(h, { root, node, data }) { renderContent(h, {
root,
node,
data
}) {
return h( return h(
"span", "span", {
{
on: { on: {
click: () => { click: () => {
this.handleSelect(root, data); //手动选择树节点 this.handleSelect(root, data); //手动选择树节点
...@@ -161,9 +155,9 @@ export default { ...@@ -161,9 +155,9 @@ export default {
}, },
data.title + data.title +
"(" + "(" +
(data.totalMaterialCount == undefined (data.totalMaterialCount == undefined ?
? "0" "0" :
: data.totalMaterialCount) + data.totalMaterialCount) +
")" ")"
); );
}, },
...@@ -200,8 +194,7 @@ export default { ...@@ -200,8 +194,7 @@ export default {
}, },
loadTree(id, codeRuleType) { loadTree(id, codeRuleType) {
let data = { let data = {
conditions: [ conditions: [{
{
fieldName: "codeRuleId", fieldName: "codeRuleId",
fieldValue: id, fieldValue: id,
conditionalType: "Equal", conditionalType: "Equal",
......
pages/materiel/masterData/masterData.vue
View file @ ca559b17
...@@ -47,6 +47,8 @@ export default { ...@@ -47,6 +47,8 @@ export default {
selectRows: [], selectRows: [],
rowsTable: [], rowsTable: [],
fullscreen: false, fullscreen: false,
treeData: [],
codeRuleData: [],
detail: null, detail: null,
temTitle: "物料管理", temTitle: "物料管理",
sets: v => { sets: v => {
...@@ -74,15 +76,40 @@ export default { ...@@ -74,15 +76,40 @@ export default {
align: "center", align: "center",
code: "material.code.type" code: "material.code.type"
}, },
{
key: "codeRuleId",
title: "编码名称",
materialKey: '3',
render: (h, params) => {
return h(
"span", {},
this.getType3(params.row.codeRuleId)
);
}
},
{ {
key: "rootCategoryId", key: "rootCategoryId",
title: "大类编号", title: "大类",
align: "right", align: "right",
materialKey: '1',
render: (h, params) => {
return h(
"span", {},
this.getType1(params.row.rootCategoryId)
);
}
}, },
{ {
key: "categoryId", key: "categoryId",
title: "子类编号", title: "子类",
align: "right", align: "right",
materialKey: '2',
render: (h, params) => {
return h(
"span", {},
this.getType2(params.row.categoryId)
);
}
}, },
{ {
key: "code", key: "code",
...@@ -214,6 +241,8 @@ export default { ...@@ -214,6 +241,8 @@ export default {
}); });
}, },
mounted() { mounted() {
this.getTreeData()
this.getcodeRuleData()
window.onresize = () => { window.onresize = () => {
///浏览器窗口大小变化 ///浏览器窗口大小变化
return (() => { return (() => {
...@@ -401,6 +430,7 @@ export default { ...@@ -401,6 +430,7 @@ export default {
categoryId: this.nodeInfo.categoryId, //左侧树点击的id categoryId: this.nodeInfo.categoryId, //左侧树点击的id
customProperties: {}, customProperties: {},
rootCategoryId: this.nodeInfo.rootCategoryId, //左侧树点击的数据的最顶层id rootCategoryId: this.nodeInfo.rootCategoryId, //左侧树点击的数据的最顶层id
codeRuleType: this.nodeInfo.codeRuleType
}; };
this.addCol.forEach(el => { this.addCol.forEach(el => {
obj[el.field] = ele[el.field] obj[el.field] = ele[el.field]
...@@ -417,6 +447,57 @@ export default { ...@@ -417,6 +447,57 @@ export default {
}, },
//批量导入end //批量导入end
//物料大类和子类的解析start
getTreeData() {
let data = {
conditions: []
};
Api.list(data).then((r) => {
this.treeData = r.result
});
},
getType1(val) {
let tempTreeList = this.$u.clone(this.treeData)
let rootName = ""
tempTreeList.forEach(ele => {
if (ele.upId == 0 && ele.id == val) {
rootName = ele.name
}
})
return rootName
},
getType2(val) {
let tempTreeList = this.$u.clone(this.treeData)
let childrenName = ""
tempTreeList.forEach(ele => {
if (ele.upId > 0 && ele.id == val) {
childrenName = ele.name
}
})
return childrenName
},
//获取编码名称
getcodeRuleData() {
let data = {
conditions: []
};
Api.pagedSlecet(data).then((r) => {
if (r.success) {
this.codeRuleData = r.result.items || []
}
});
},
getType3(val) {
let codeRuleDataList = this.$u.clone(this.codeRuleData)
let codeRuleName = ""
codeRuleDataList.forEach(ele => {
if (ele.id == val) {
codeRuleName = ele.name
}
})
return codeRuleName
},
//物料大类和子类的解析end
}, },
watch: { watch: {
nodeInfo: { nodeInfo: {
......
pages/technology/details/routingsupporting/index.vue
View file @ ca559b17
<template> <template>
<div> <div>
<DataGrid :columns="columns" ref="grid" :conditions="easySearch" :action="action"> <DataGrid :columns="columns" ref="grid" :conditions="easySearch" :action="action" exportTitle="工艺Bom">
<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-model="easySearch.keys.value" v-width="260" />
placeholder="请输入关键字物料名称"
v-model="easySearch.keys.value"
v-width="260"
/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
...@@ -16,7 +12,7 @@ ...@@ -16,7 +12,7 @@
</Form> </Form>
</template> </template>
<template slot="searchForm"> <template slot="searchForm">
<Search :headid="hid"/> <Search :headid="hid" />
</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>
...@@ -25,8 +21,9 @@ ...@@ -25,8 +21,9 @@
<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>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import Search from "./search"; import Search from "./search";
...@@ -46,25 +43,26 @@ export default { ...@@ -46,25 +43,26 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { keys: {
op: op: "nameMaterial",
"nameMaterial",
value: null value: null
}, },
routingHeaderId: { op: "Equal", value: -1 } routingHeaderId: {
op: "Equal",
value: -1
}
}, },
modal: false, modal: false,
title: "新增", title: "新增",
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",
high: true, high: true,
width: 100, width: 100,
sortable:true sortable: true
}, },
{ {
key: "routingDetailName", key: "routingDetailName",
...@@ -77,7 +75,7 @@ export default { ...@@ -77,7 +75,7 @@ export default {
title: this.l("quantity"), title: this.l("quantity"),
align: "right", align: "right",
high: true, high: true,
width:80, width: 80,
}, },
{ {
key: "materialType", key: "materialType",
...@@ -86,7 +84,7 @@ export default { ...@@ -86,7 +84,7 @@ export default {
easy: true, easy: true,
high: true, high: true,
code: "mes_xingchi_resource.material.materialReType", code: "mes_xingchi_resource.material.materialReType",
width:100, width: 100,
}, },
{ {
key: "materialNumber", key: "materialNumber",
...@@ -122,7 +120,7 @@ export default { ...@@ -122,7 +120,7 @@ export default {
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
hide:true, hide: true,
}, },
{ {
key: "texture", key: "texture",
...@@ -157,30 +155,30 @@ export default { ...@@ -157,30 +155,30 @@ export default {
title: this.l("creationTime"), title: this.l("creationTime"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
}, },
{ {
key: "creatorUserId", key: "creatorUserId",
title: this.l("creatorUserId"), title: this.l("creatorUserId"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
type:'user', type: 'user',
}, },
{ {
key: "lastModificationTime", key: "lastModificationTime",
title: this.l("lastModificationTime"), title: this.l("lastModificationTime"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
}, },
{ {
key: "lastModifierUserId", key: "lastModifierUserId",
title: this.l("lastModifierUserId"), title: this.l("lastModifierUserId"),
hide: true, hide: true,
align: "left", align: "left",
hide:true, hide: true,
type:'user', type: 'user',
}, },
{ {
title: "操作", title: "操作",
...@@ -188,38 +186,49 @@ export default { ...@@ -188,38 +186,49 @@ export default {
width: 140, width: 140,
align: "center", align: "center",
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.view(params.row.id) } },
on: {
click: () => this.view(params.row.id)
}
}, },
"查看" "查看"
), ),
//h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'), //h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "edit" }, oprate: "edit"
on: { click: () => this.edit(params.row.id) } },
on: {
click: () => this.edit(params.row.id)
}
}, },
this.headerStatus == 4||this.headerStatus == 0 ? "编辑" : "" this.headerStatus == 4 || this.headerStatus == 0 ? "编辑" : ""
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "delete" }, oprate: "delete"
on: { click: () => this.remove(params.row.id) } },
on: {
click: () => this.remove(params.row.id)
}
}, },
this.headerStatus == 4||this.headerStatus == 0 ? "删除" : "" this.headerStatus == 4 || this.headerStatus == 0 ? "删除" : ""
) )
]); ]);
} }
} }
], ],
headerStatus:-1, headerStatus: -1,
productBomId:-1, productBomId: -1,
}; };
}, },
created() { created() {
...@@ -228,15 +237,18 @@ export default { ...@@ -228,15 +237,18 @@ export default {
} else { } else {
this.easySearch.routingHeaderId.value = this.$route.query.id; this.easySearch.routingHeaderId.value = this.$route.query.id;
} }
this.hid=Number(this.easySearch.routingHeaderId.value) this.hid = Number(this.easySearch.routingHeaderId.value)
this.headerStatus=this.$route.query.headerStatus this.headerStatus = this.$route.query.headerStatus
this.productBomId=Number(this.$route.query.productBomId) this.productBomId = Number(this.$route.query.productBomId)
}, },
mounted() { mounted() {
console.log(this); console.log(this);
this.search(); this.search();
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -293,5 +305,6 @@ export default { ...@@ -293,5 +305,6 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
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