Skip to content

M
mes-ui
Commit 3adafb5d authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents 9f7bccf6 1ff0d1f2
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 145 deletions
pages/order/monitoring/index.vue
View file @ 3adafb5d
......@@ -346,7 +346,7 @@ export default {
h(
"op",
{
attrs: { oprate: "record", class: "edit",title:'暂停记录' },
attrs: { oprate: "record", class: "edit" },
on: { click: () => this.record(params.row.id) }
},
"暂停记录"
......
pages/order/monitoring/record.vue
View file @ 3adafb5d
......@@ -127,29 +127,38 @@ export default {
}
],
columnsProcess: [
{
key: "dispatch_id",
title: "工序Id",
{
key: "processcode",
title: "工艺文件编号",
align: "left",
width: 90
width: 200,
tooltip:true,
},
{
key: "processname",
title: "工艺名称",
align: "left",
tooltip:true,
},
{
key: "dispatch_id",
key: "taskSeq",
title: "工序号",
align: "left",
width: 90
},
{
key: "dispatch_id",
key: "detailName",
title: "工序名称",
align: "left",
width: 350
width: 350,
tooltip:true,
},
{
key: "desc",
title: "暂停原因",
align: "left"
align: "left",
tooltip:true,
},
{
key: "creatorUserId",
......@@ -162,7 +171,7 @@ export default {
{
key: "creationTime",
title: "暂停时间",
align: "left",
align: "center",
width: 180
}
],
......@@ -190,16 +199,9 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
// tabClick(tabIndex) {
// if (tabIndex == 2) {
// this.loadList();
// } else {
// this.$refs.grid.reload(this.easySearch);
// }
// },
loadList() {
let params = {
FilterText: "dispatch_id=104"
FilterText: 'order_id="'+this.eid+'"'
};
Api.pauseCauseGetpaged(params)
.then(res => {
......@@ -229,6 +231,7 @@ export default {
eid(v) {
this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition);
this.loadList()
}
}
};
......
pages/produce/execute/MaterialCollec/index.vue
View file @ 3adafb5d
<template>
<div class="">
<div class="wu_bg">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
物料领用</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</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>
</template>
......
pages/produce/execute/ProcessCheck/index.vue
View file @ 3adafb5d
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
工艺查看</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="footer_box">
<div class="ul_box fl">
<ul>
<li>名称：名称1</li>
<li>图号：UIGT-763245</li>
<li>状态：未开工</li>
<li>订单编号：097543346</li>
<li>订单属性1：</li>
<li>订单属性2：</li>
<li>订单属性3：</li>
<li>计划数量：10</li>
<li>节点日期：2020-02-25</li>
</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 class="wu_bg">
<div class="wu_top">
工艺查看
</div>
</div>
</template>
<script>
......
pages/produce/execute/execute.less
View file @ 3adafb5d
......@@ -24,10 +24,25 @@
line-height: 176px;
font-size: 22px;
color: #fff;
}
}
.button{
margin: 0 9%;
}
.star_step{
padding: 24px;
.step_item{
display: inline-block;
width: 200px;
.icon_B{
i{
font-size: 40px;
}
}
ul,li{
list-style: disc;
}
}
}
}
.gd_list{
position: absolute;
......@@ -295,6 +310,7 @@
}
.gd_user {
padding: 6px;
color: #707070;
}
.user_bg {
// border: 3px solid #ceb0b0;
......@@ -308,8 +324,12 @@
}
.gd_user {
padding: 6px;
color: #fff;
}
}
}
}
}
.wu_bg{
height: calc(100vh - 165px);
}
\ No newline at end of file
pages/produce/execute/index.vue
View file @ 3adafb5d
......@@ -4,21 +4,10 @@
<template>
<div class="execute_box">
<div class="top_title">
<span class="fl">{{orderTitle}}--{{orderindex}}</span>
<span class="fl">{{orderTitle}}--{{orderindex}}</span>
<div>工单编号: 12001011</div>
</div>
<starOrder v-if="orderindex==0" ref="starOrder"/>
<MaterialCollec v-else-if="orderindex==1" ref="MaterialCollec"/>
<productSet v-else-if="orderindex==2" ref="productSet"/>
<taskTime v-else-if="orderindex==3" ref="taskTime"/>
<preparation v-else-if="orderindex==4" ref="preparation"/>
<ProcessCheck v-else-if="orderindex==5" ref="ProcessCheck"/>
<ProcessCase v-else-if="orderindex==6" ref="ProcessCase"/>
<judgment v-else-if="orderindex==7" ref="judgment"/>
<datafilling v-else-if="orderindex==8" ref="datafilling"/>
<testdata v-else-if="orderindex==9" ref="testdata"/>
<component :is="detail" :gdid="gdId"/>
<a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- 工单列表 -->
......@@ -47,29 +36,17 @@
<script>
import functional from "./components/functional";
import orderlist from "./components/orderlist";
import starOrder from "./starOrder/index";
import MaterialCollec from "./MaterialCollec/index";
import productSet from "./productSet/index";
import taskTime from "./taskTime/index";
import preparation from "./preparation/index";
import ProcessCheck from "./ProcessCheck/index";
import ProcessCase from "./ProcessCase/index";
import judgment from "./judgment/index";
import datafilling from "./datafilling/index";
import testdata from "./testdata/index";
export default {
components: { functional, orderlist,
starOrder,MaterialCollec,productSet,taskTime,preparation,
ProcessCheck,ProcessCase,judgment,datafilling,testdata
},
components: { functional, orderlist,},
data(){
return{
orderTitle:'进度汇报',
orderindex:0,
gdId:0,
starmodal: true,
orderlistMode:false,
functionalMode:false,
detail: null,
odermodel:'全部',
oderList:[
{
......@@ -98,19 +75,12 @@ export default {
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
this.detail = () => import("./starOrder/index");
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
mounted() {},
methods: {
starFun(){
this.$Message.success("开工...")
......@@ -122,7 +92,6 @@ export default {
this.$refs.orderlist.loadTree();
}else{
allList.map((u,i)=>{
// console.log(i,":",u)
if(u.status==value){
newitems.push(u)
}
......@@ -133,6 +102,16 @@ export default {
changeTitle(number,type){
this.orderTitle = type
this.orderindex = number
if(number==0){ this.detail = () => import("./starOrder/index");}//进度汇报
if(number==1){ this.detail = () => import("./MaterialCollec/index");}//物料领用
if(number==2){ this.detail = () => import("./productSet/index");}//产品装配
if(number==3){ this.detail = () => import("./taskTime/index");}//工时分配
if(number==4){ this.detail = () => import("./preparation/index");}//生产准备
if(number==5){ this.detail = () => import("./ProcessCheck/index");}//工艺查看
if(number==6){ this.detail = () => import("./ProcessCase/index");}//工艺案例
if(number==7){ this.detail = () => import("./judgment/index");}//质量判定
if(number==8){ this.detail = () => import("./datafilling/index");}//数据填报
if(number==9){ this.detail = () => import("./testdata/index");}//测试数据
},
},
}
......
pages/produce/execute/starOrder/index.vue
View file @ 3adafb5d
......@@ -6,11 +6,31 @@
<Icon type="md-play" />
开工</a>
</div>
<div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
<div class="star" v-else-if="starmodal">
<div class=" flex fc-b">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button>
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button>
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button>
</div>
<div class="star_step">
<div class="step_item" v-for="i of 6" :key="i">
<p class="icon_B">
<Icon type="md-arrow-dropright-circle" />
</p>
<p><a> 开工</a></p>
<ul>
<li>暂停 2020-02-06 15:35</li>
<li>继续 2020-02-06 15:35</li>
</ul>
</div>
<!-- <p><span></span>
2020-02-06 15:35
</p> -->
<!-- <Steps :current="6">
<Step icon="md-arrow-dropright-circle" v-for="i of 6" :key="i" :content="contentMsge"></Step>
</Steps> -->
</div>
</div>
<div class="footer_box">
<div class="ul_box fl">
......@@ -52,6 +72,7 @@ export default {
data(){
return{
starmodal: true,
contentMsge:"<ul><li>暂停 2020-02-06 15:35</li><li>继续 2020-02-06 15:35</li></ul>",
}
},
created() {
......
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