Skip to content

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

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

parents 6d876804 f15f18be
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 6 deletions
pages/produce/execute/components/orderlist.vue
View file @ 9ba0bbcd
......@@ -3,10 +3,59 @@
</style>
<template>
<div class="order_list">
<h4 class="order_title">
<!-- <h4 class="order_title">
<span class="gd_tt">工单列表</span>
<a ><Icon type="ios-list" size="18" /> 展开全部列表</a>
</h4>
</h4> -->
<div class="select_t">
<!-- <Icon type="md-arrow-dropright" /> -->
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select>
<Button class="fr">时间正序排列</Button>
</div>
<div class="card_box">
<Card class="card_order" v-for="(item,index) in listTasks"
@click.native="goPage(item)" :key="index"
:class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
(item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))"
>
<p slot="title">{{item.title}} <span class="fr" >{{item.status}}</span></p>
<p class="order_tit">{{item.shebei}}</p>
<p><Icon type="ios-pricetags" />{{item.gongxu}}</p>
<p>{{item.time}}</p>
</Card>
<!-- <Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">未开工</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">执行中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">暂停中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">交检中</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card>
<Card class="card_order">
<p slot="title">CJ_181212_002_001 <span class="fr">已完成</span></p>
<p class="order_tit">发动机</p>
<p><Icon type="ios-pricetags" />工序1：领料</p>
<p>2018-12-12 ~ 2018-12-30</p>
</Card> -->
</div>
</div>
</template>
<script>
......@@ -15,12 +64,107 @@ export default {
data(){
return{
gnFlag:0,
odermodel:'全部',
oderList:[
{
value: '全部',
label: '全部'
},{
value: '未开工',
label: '未开工'
},{
value: '执行中',
label: '执行中'
},{
value: '暂停中',
label: '暂停中'
},{
value: '交检中',
label: '交检中'
},{
value: '交接中',
label: '交接中'
},{
value: '已完成',
label: '已完成'
},
],
listTasks:[],
listTask:[
{
title: 'CJ_181212_002_001',
status: '已完成',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_002',
status: '未开工',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_003',
status: '执行中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_004',
status: '暂停中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_005',
status: '交检中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_006',
status: '交接中',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},{
title: 'CJ_181212_002_007',
status: '已完成',
shebei: '发动机',
gongxu: '工序1：领料',
time: '2018-12-12 ~ 2018-12-30',
},
],
}
},
created() {
this.loadTree();
},
methods: {
loadTree(){
this.listTasks = this.listTask
},
gnFunto(number,type){
this.gnFlag = number
}
},
goPage(item){
console.log(item)
},
searchOrder(value){
let allList = this.listTask;
let newitems = [];
if(value=="全部"){
this.loadTree();
}else{
allList.map((u,i)=>{
// console.log(i,":",u)
if(u.status==value){
newitems.push(u)
}
})
this.listTasks = newitems
}
},
},
}
</script>
\ No newline at end of file
pages/produce/execute/execute.less
View file @ 9ba0bbcd
......@@ -90,6 +90,36 @@
margin: 0 55px 0 0;
}
}
.order_list{
.select_t {
padding: 15px 20px;
}
.card_box{
padding: 0 15px;
.card_order{
margin: 15px 0;
border-left: 4px solid #ccc;
.order_tit{
color: #2680EB;
}
}
.card_border1{
border-left: 4px solid #707070;
}
.card_border2{
border-left: 4px solid #0DD78D;
}
.card_border3{
border-left: 4px solid #FE7777;
}
.card_border4{
border-left: 4px solid #FFA000;
}
.card_border5{
border-left: 4px solid #720193;
}
}
}
}
}
}
......
pages/produce/execute/index.vue
View file @ 9ba0bbcd
......@@ -14,7 +14,7 @@
</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="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>
......@@ -52,8 +52,14 @@
</div>
<a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- title="工单列表" -->
<Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode">
<!-- -->
<Drawer title="工单列表" placement="left" class="gd_box" :closable="false" v-model="orderlistMode">
<!-- <p slot="title"> -->
<!-- 55555 -->
<!-- <span class="gd_tt">工单列表222252</span>
<a ><Icon type="ios-list" size="18" /> 展开全部列表</a> -->
<!-- </p> -->
<!-- <Slot name="title">123123</Slot> -->
<orderlist ref="orderlist"/>
</Drawer>
<!-- title="功能区" -->
......
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