Skip to content

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

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

parents 8b46ebfa 912901d5
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 48 deletions
pages/produce/execute/ProcessCase/index.vue
View file @ a7f752ce
......@@ -6,7 +6,7 @@
<Input search class="search_box mr10" enter-button placeholder="请输入文件名" />
<a @click="allChecked" ><Icon type="md-checkbox-outline" />全选</a>
<!-- <a @click="copyCard" ><Icon type="ios-browsers-outline" />复制</a> -->
<a @click="importCard" ><Icon type="ios-log-in" />导入</a>
<!-- <a @click="importCard" ><Icon type="ios-log-in" />导入</a> -->
<a @click="addCard" ><Icon type="ios-add-circle-outline" />新建</a>
<span>共 {{cardlist.length}} 个案例；</span>
</div>
......@@ -48,12 +48,12 @@
</Checkbox>
</CheckboxGroup>
</div>
<FooterToolbar style="height:65px" v-show="checkCards!=0">
<span>已选择 {{checkCards}} 个案例</span>
<Button class="span ml20" type="primary" @click="deliteCard"><Icon type="ios-trash-outline" />删除</Button>
<Button class="span ml20" type="primary" @click="exportCard"><Icon type="ios-log-out" />导出</Button>
<Button @click="cancel">取消</Button>
</FooterToolbar>
<div class="footer" v-if="checkCards!=0">
<span>已选: {{checkCards}} 个案例</span>
<Button class="span ml20 mr15" type="primary" @click="deliteCard"><Icon type="ios-trash-outline" />删除</Button>
<!-- <Button class="span ml20" type="primary" @click="exportCard"><Icon type="ios-log-out" />导出</Button> -->
<Button type="default" @click="cancel">取消</Button>
</div>
</div>
</template>
<script>
......
pages/produce/execute/execute.less
View file @ a7f752ce
......@@ -339,8 +339,52 @@
}
}
.wu_bg{
height: calc(100vh - 165px);
height: calc(100vh - 150px);
.mass_box{
padding: 0 50px;
}
.footer {
width: 100%;
position: absolute;
left: 0;
bottom: -5px;
height: 60px;
line-height: 60px;
background: rgba(0, 0, 0, 0.6);
color: #fff;
padding-left: 50px;
}
.mass_box{
.heger{ color: #2680EB;}
.rangb{ color: #515A6E;}
.fanxiu{ color: #FFA000;}
.feipin{ color: #FE7777;}
.mass_list{
border: 1px solid #CACBD0;
border-radius: 4px;
padding: 16px 20px;
.btn_play{
margin: 0 0 20px 0;
}
.list01{
.file_card{
.ivu-checkbox{ display: none;}
.file{
float: left;
}
.hege{ i{color: #2680EB;} }
.rang{ i{color: #515A6E;} }
.fanxiu{ i{color: #FFA000;} }
.feipin{ i{color: #FE7777;} }
}
.ivu-checkbox-wrapper{
margin: 0 24px 0 0;
}
}
}
}
}
.tech_box{
height: calc(100vh - 165px);
.ivu-layout-header{
......
pages/produce/execute/judgment/index.vue
View file @ a7f752ce
<template>
<div class="">
<div class="star" v-if="!starmodal">
<a class="start" @click="starFun" >
<Icon type="md-play" />
质量判定</a>
<div class="wu_bg">
<div class="mass_box">
<h1 class="heger">合格（{{cardlist.length}}）</h1>
<div class="mass_list">
<p class="btn_play">
<Button class="button" type="primary">全选</Button>
<Button class="button" type="primary">反选</Button>
</p>
<div class="list01">
<CheckboxGroup v-model="caseLise" @on-change="changeCards">
<Checkbox class="file_card" border @on-change="changeCard" :checked="item.checked"
v-for="(item,index) in cardlist" :label="item.id" :key="index">
<div class="file hege">
<!-- :class="item.status == 1 ? 'rang' : (item.status == 2 ? 'fanxiu' : (item.status == 3 ? 'feipin' :'hege'))" -->
<Icon type="ios-radio-button-on" />
<i>●</i>
{{item.code}}
</div>
</Checkbox>
</CheckboxGroup>
</div>
</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 class="chuanse"></div>
<div class="">
<h1 class="rangb">让步</h1>
</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 class="">
<h1 class="fanxiu">返修</h1>
</div>
<div class="img_box fl">
图片区
<div class="">
<h1 class="feipin">废品</h1>
</div>
</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>
</template>
<script>
......@@ -51,7 +46,49 @@ export default {
name:'starOrder',
data(){
return{
starmodal: false,
cardlist:[
{
status:0,
code:1001,
id:1,
checked:false,
},{
status:1,
code:1002,
id:2,
checked:false,
},{
status:2,
code:1003,
id:3,
checked:false,
},{
status:3,
code:1004,
id:4,
checked:false,
},{
status:0,
code:1001,
id:1,
checked:false,
},{
status:1,
code:1002,
id:2,
checked:true,
},{
status:2,
code:1003,
id:3,
checked:false,
},{
status:3,
code:1004,
id:4,
checked:false,
},
],
}
},
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