Skip to content

M
mes-ui
Commit bd2b3019 authored by renjintao's avatar renjintao
Browse files
Options

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

parents 3679cf11 b09e83b3
Hide whitespace changes
Inline Side-by-side
Showing with 475 additions and 99 deletions
pages/aps/results/index.vue
View file @ bd2b3019
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</Col> </Col>
</Row> </Row>
<component :is="detail" :eid="id" :schemas="schemas"/> <component :is="detail" :eid="id" :schemas="schemas" @ok-claer="clearS" />
</Content> </Content>
</Layout> </Layout>
<div class="footer" v-if="showFooter"> <div class="footer" v-if="showFooter">
...@@ -77,8 +77,8 @@ export default { ...@@ -77,8 +77,8 @@ export default {
total: 0, total: 0,
blacks: false, blacks: false,
gant: false, gant: false,
gantt:null, gantt: null,
curPage:null curPage: null
}; };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
...@@ -121,6 +121,8 @@ export default { ...@@ -121,6 +121,8 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success("清空列表成功"); this.$Message.success("清空列表成功");
this.orderlist(); this.orderlist();
this.id = 0;
this.listData();
} }
}); });
}, },
...@@ -130,6 +132,16 @@ export default { ...@@ -130,6 +132,16 @@ export default {
}); });
} }
}, },
clearS() {
this.id = 0;
Api.clearall().then(r => {
if (r.success) {
this.orderlist();
this.id = 0;
this.listData();
}
});
},
// 返回 // 返回
comeBlck() { comeBlck() {
this.$router.push({ path: "/aps/aps" }); this.$router.push({ path: "/aps/aps" });
...@@ -151,26 +163,26 @@ export default { ...@@ -151,26 +163,26 @@ export default {
this.modal1Gant = true; this.modal1Gant = true;
this.gantt = () => import("./gantt"); this.gantt = () => import("./gantt");
}, },
changeCheck(item,i) { changeCheck(item, i) {
this.$set(this.list,i,item); this.$set(this.list, i, item);
if(this.title!='排产方案对比'){ if (this.title != "排产方案对比") {
this.showFooter=true; this.showFooter = true;
} }
}, },
submit() { submit() {
this.detail = () => import("./compare"); this.detail = () => import("./compare");
this.title = "排产方案对比"; this.title = "排产方案对比";
this.showFooter=false; this.showFooter = false;
}, },
cancel() { cancel() {
this.showFooter = false; this.showFooter = false;
} }
}, },
computed:{ computed: {
schemas(){ schemas() {
return this.list.filter(u=>{ return this.list.filter(u => {
return u.checked==true; return u.checked == true;
}) });
} }
} }
}; };
......
pages/aps/results/result.vue
View file @ bd2b3019
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
}, },
{ {
title: "计划结束时间", title: "计划结束时间",
key: "plan_start", key: "plan_finish",
width: 200, width: 200,
align: "center" align: "center"
}, },
...@@ -138,7 +138,8 @@ export default { ...@@ -138,7 +138,8 @@ export default {
}).then(r => { }).then(r => {
if (r.result) { if (r.result) {
this.$Message.success(r.result.retmsg); this.$Message.success(r.result.retmsg);
this.orderlist(); this.$emit('ok-claer')
} else { } else {
this.$Message.error("下发失败"); this.$Message.error("下发失败");
} }
...@@ -150,7 +151,7 @@ export default { ...@@ -150,7 +151,7 @@ export default {
}).then(r => { }).then(r => {
if (r.result) { if (r.result) {
this.$Message.success(r.result.retmsg); this.$Message.success(r.result.retmsg);
this.orderlist(); this.$emit('ok-claer')
} else { } else {
this.$Message.error("下发失败"); this.$Message.error("下发失败");
} }
......
pages/produce/execute/ProcessCheck/components/guidance.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
工艺提醒
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/components/remind.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
作业指导书
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/setupDetails.vue → pages/produce/execute/ProcessCheck/components/setupDetails.vue
View file @ bd2b3019
<template> <template>
<div class=""> <div class="p20">
<div class=""> <div class="">
工艺规程 工艺规程
</div> </div>
......
pages/produce/execute/ProcessCheck/components/workSteps.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
工步导航
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/ProcessCheck/index.vue
View file @ bd2b3019
...@@ -2,21 +2,23 @@ ...@@ -2,21 +2,23 @@
<template> <template>
<div class="wu_bg"> <div class="wu_bg">
<!-- <div class="wu_top"> <!-- <div class="wu_top">
工艺查看 /technology/details/setup/setupDetails 工艺查看 /technology/details/setup/setupDetails
to="/produce/execute/ProcessCheck/setupDetails"
</div> --> </div> -->
<Layout class="tech_box"> <Layout class="tech_box">
<Header> <Header>
<div class="tech_body"> <div class="tech_body">
<Menu mode="horizontal" theme="light" active-name="1"> <Menu mode="horizontal" theme="light" active-name="1" @on-select="openSaveTip">
<MenuItem name="1" to="/produce/execute/ProcessCheck/setupDetails">工艺规程</MenuItem> <MenuItem name="1" >工艺规程</MenuItem>
<MenuItem name="2" to="/produce/execute/ProcessCheck/setupDetails">作业指导书</MenuItem> <MenuItem name="2" >作业指导书</MenuItem>
<MenuItem name="3" to="/produce/execute/ProcessCheck/setupDetails">工步导航</MenuItem> <MenuItem name="3" >工步导航</MenuItem>
<MenuItem name="4" to="/produce/execute/ProcessCheck/setupDetails">工艺提醒</MenuItem> <MenuItem name="4" >工艺提醒</MenuItem>
</Menu> </Menu>
</div> </div>
</Header> </Header>
<Layout class="bottom_box" > <Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child> <!-- <nuxt-child keep-alive></nuxt-child> -->
<component :is="detail" :eid="id" />
</Layout> </Layout>
</Layout> </Layout>
</div> </div>
...@@ -26,26 +28,26 @@ export default { ...@@ -26,26 +28,26 @@ export default {
name:'starOrder', name:'starOrder',
data(){ data(){
return{ return{
starmodal: false, id: "1",
detail: null,
} }
}, },
created() { created() {
// this.treeHeight = window.innerHeight - 120; this.detail = () => import("./components/setupDetails");
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
window.onresize = () => { // this.detail = () => import("./components/setupDetails");
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
}, },
methods: { methods: {
starFun(){ openSaveTip(key){
this.$Message.success("开工...") this.id = key
if(this.id == "1"){ this.detail = () => import("./components/setupDetails");}
if(this.id == "2"){ this.detail = () => import("./components/remind");}
if(this.id == "3"){ this.detail = () => import("./components/workSteps");}
if(this.id == "4"){ this.detail = () => import("./components/guidance");}
}, },
}, },
} }
......
pages/produce/execute/execute.less
View file @ bd2b3019
...@@ -336,22 +336,20 @@ ...@@ -336,22 +336,20 @@
} }
.tech_box{ .tech_box{
height: calc(100vh - 165px); height: calc(100vh - 165px);
.ivu-layout-header{
height: 50px;
}
.tech_body{ .tech_body{
// padding: 0 20px;
.ivu-layout-header{
height: 0;
}
.ivu-menu-horizontal{ .ivu-menu-horizontal{
height: 40px; height: 50px;
line-height: 40px; line-height: 50px;
.ivu-menu-item{ .ivu-menu-item{
width: 115px; width: 115px;
text-align: center; text-align: center;
} }
a.ivu-menu-item-active::before{ li.ivu-menu-item-active::before{
content: ""; content: "";
display: block; display: block;
border-width: 5px 6px 0; border-width: 5px 6px 0;
border-style: solid; border-style: solid;
border-color: #2d8cf0 transparent transparent; border-color: #2d8cf0 transparent transparent;
...@@ -361,7 +359,7 @@ ...@@ -361,7 +359,7 @@
bottom: -6px; bottom: -6px;
left: 43%; left: 43%;
} }
a.ivu-menu-item-active::after{ li.ivu-menu-item-active::after{
content: ""; content: "";
display: block; display: block;
border-width: 4px 4px 0; border-width: 4px 4px 0;
......
pages/produce/execute/preparation/components/annex.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
工艺附件
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/auxiliary.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
辅材
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/mainMaterial.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
主材
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/measuring.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
量具
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/program.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
数控程序
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/tool.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
工具
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/components/workClothes.vue 0 → 100644
View file @ bd2b3019
<template>
<div class="p20">
<div class="">
工装
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/preparation/index.vue
View file @ bd2b3019
<template> <template>
<div class=""> <div class="wu_bg">
<div class="star" v-if="!starmodal"> <!-- <div class="wu_top">
<a class="start" @click="starFun" > 工艺查看 /technology/details/setup/setupDetails
<Icon type="md-play" /> to="/produce/execute/ProcessCheck/setupDetails"
生产准备</a> </div> -->
</div> <Layout class="tech_box">
<div class="star flex fc-b" v-else-if="starmodal"> <Header>
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <div class="tech_body">
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <Menu mode="horizontal" theme="light" active-name="1" @on-select="openSaveTip">
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button> <MenuItem name="1" >主材</MenuItem>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button> <MenuItem name="2" >辅材</MenuItem>
</div> <MenuItem name="3" >工具</MenuItem>
<div class="footer_box"> <MenuItem name="4" >量具</MenuItem>
<div class="ul_box fl"> <MenuItem name="5" >工装</MenuItem>
<ul> <MenuItem name="6" >数控程序</MenuItem>
<li>名称：名称1</li> <MenuItem name="7" >工艺附件</MenuItem>
<li>图号：UIGT-763245</li> </Menu>
<li>状态：未开工</li> </div>
<li>订单编号：097543346</li> </Header>
<li>订单属性1：</li> <Layout class="bottom_box" >
<li>订单属性2：</li> <!-- <nuxt-child keep-alive></nuxt-child> -->
<li>订单属性3：</li> <component :is="detail" :eid="id" />
<li>计划数量：10</li> </Layout>
<li>节点日期：2020-02-25</li> </Layout>
</ul>
</div>
<div class="ul_box fl">
<ul>
<li>工序名称：名称1</li>
<li>工序序号：UIGT-763245</li>
<li>派工数量：66</li>
<li>资源名称：23366</li>
<li>资源编号：986732038</li>
<li>人员信息：</li>
<li>开始时间：</li>
<li>结束时间：</li>
<li>单件工时：10</li>
<li>准备工时：2020-02-25</li>
</ul>
</div>
<div class="img_box fl">
图片区
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
...@@ -51,26 +31,29 @@ export default { ...@@ -51,26 +31,29 @@ export default {
name:'starOrder', name:'starOrder',
data(){ data(){
return{ return{
starmodal: false, id: "1",
detail: null,
} }
}, },
created() { created() {
// this.treeHeight = window.innerHeight - 120; this.detail = () => import("./components/mainMaterial");
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() { mounted() {
window.onresize = () => { // this.detail = () => import("./components/setupDetails");
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
}, },
methods: { methods: {
starFun(){ openSaveTip(key){
this.$Message.success("开工...") this.id = key
if(this.id == "1"){ this.detail = () => import("./components/mainMaterial");}
if(this.id == "2"){ this.detail = () => import("./components/auxiliary");}
if(this.id == "3"){ this.detail = () => import("./components/tool");}
if(this.id == "4"){ this.detail = () => import("./components/measuring");}
if(this.id == "5"){ this.detail = () => import("./components/workClothes");}
if(this.id == "6"){ this.detail = () => import("./components/program");}
if(this.id == "7"){ this.detail = () => import("./components/annex");}
}, },
}, },
} }
......
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