Skip to content

M
mes-ui
Commit 3081f0de authored by 康振飞's avatar 康振飞
Browse files
Options

质量判定

parent f45149c1
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 43 deletions
pages/produce/execute/components/functional.vue
View file @ 3081f0de
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<template> <template>
<div class="addd"> <div class="addd">
<ul> <ul>
<li><a @click="gnFunto(0,'进度汇报')" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li> <!-- <li><a @click="gnFunto(0,'进度汇报')" :class="{active:gnFlag == 0}"><Icon type="ios-clipboard" /> 进度汇报</a></li>
<li><a @click="gnFunto(1,'物料领用')" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li> <li><a @click="gnFunto(1,'物料领用')" :class="{active:gnFlag == 1}"><Icon type="ios-cube" /> 物料领用</a></li>
<li><a @click="gnFunto(2,'产品装配')" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li> <li><a @click="gnFunto(2,'产品装配')" :class="{active:gnFlag == 2}"><Icon type="md-build" /> 产品装配</a></li>
<li><a @click="gnFunto(3,'工时分配')" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li> <li><a @click="gnFunto(3,'工时分配')" :class="{active:gnFlag == 3}"><Icon type="ios-time" /> 工时分配</a></li>
...@@ -11,7 +11,29 @@ ...@@ -11,7 +11,29 @@
<li><a @click="gnFunto(6,'工艺案例')" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li> <li><a @click="gnFunto(6,'工艺案例')" :class="{active:gnFlag == 6}"><Icon type="ios-paper" /> 工艺案例</a></li>
<li><a @click="gnFunto(7,'质量判定')" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li> <li><a @click="gnFunto(7,'质量判定')" :class="{active:gnFlag == 7}"><Icon type="ios-medal" /> 质量判定</a></li>
<li><a @click="gnFunto(8,'数据填报')" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li> <li><a @click="gnFunto(8,'数据填报')" :class="{active:gnFlag == 8}"><Icon type="ios-create" /> 数据填报</a></li>
<li><a @click="gnFunto(9,'测试数据')" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li> <li><a @click="gnFunto(9,'测试数据')" :class="{active:gnFlag == 9}"><Icon type="logo-codepen" /> 测试数据</a></li> -->
<li><a @click="gnFunto(0,'进度汇报')" :class="{active:gnFlag == 0}">
<img src="@/assets/imgicon/execute/ex01.png" alt=""/>
进度汇报</a></li>
<li><a @click="gnFunto(1,'物料领用')" :class="{active:gnFlag == 1}">
<img src="@/assets/imgicon/execute/ex02.png" alt=""/>
物料领用</a></li>
<li><a @click="gnFunto(2,'产品装配')" :class="{active:gnFlag == 2}">
<img src="@/assets/imgicon/execute/ex03.png" alt=""/> 产品装配</a></li>
<li><a @click="gnFunto(3,'工时分配')" :class="{active:gnFlag == 3}">
<img src="@/assets/imgicon/execute/ex04.png" alt=""/> 工时分配</a></li>
<li><a @click="gnFunto(4,'生产准备')" :class="{active:gnFlag == 4}">
<img src="@/assets/imgicon/execute/ex05.png" alt=""/> 生产准备</a></li>
<li><a @click="gnFunto(5,'工艺查看')" :class="{active:gnFlag == 5}">
<img src="@/assets/imgicon/execute/ex06.png" alt=""/> 工艺查看</a></li>
<li><a @click="gnFunto(6,'工艺案例')" :class="{active:gnFlag == 6}">
<img src="@/assets/imgicon/execute/ex07.png" alt=""/> 工艺案例</a></li>
<li><a @click="gnFunto(7,'质量判定')" :class="{active:gnFlag == 7}">
<img src="@/assets/imgicon/execute/ex08.png" alt=""/> 质量判定</a></li>
<li><a @click="gnFunto(8,'数据填报')" :class="{active:gnFlag == 8}">
<img src="@/assets/imgicon/execute/ex09.png" alt=""/> 数据填报</a></li>
<li><a @click="gnFunto(9,'测试数据')" :class="{active:gnFlag == 9}">
<img src="@/assets/imgicon/execute/ex10.png" alt=""/> 测试数据</a></li>
</ul> </ul>
</div> </div>
</template> </template>
......
pages/produce/execute/execute.less
View file @ 3081f0de
...@@ -189,6 +189,10 @@ ...@@ -189,6 +189,10 @@
} }
} }
.addd{ .addd{
ul li a img{
vertical-align: middle;
margin: 0 7px 3px 0;
}
a.active{ a.active{
background: #2680EB; background: #2680EB;
} }
...@@ -359,30 +363,86 @@ ...@@ -359,30 +363,86 @@
.rangb{ color: #515A6E;} .rangb{ color: #515A6E;}
.fanxiu{ color: #FFA000;} .fanxiu{ color: #FFA000;}
.feipin{ color: #FE7777;} .feipin{ color: #FE7777;}
.chuanse{
button{
width: 88px;
height: 40px;
font-size: 16px;
margin: 0 30px 0 0;
color: #fff;
}
.button01{ background: #515A6E; }
.button02{ background: #FFA000; }
.button03{ background: #FE7777; }
}
.mass_list{ .mass_list{
border: 1px solid #CACBD0; border: 1px solid #CACBD0;
border-radius: 4px; border-radius: 4px;
padding: 16px 20px; padding: 10px 15px;
margin: 15px 0;
.btn_play{ .btn_play{
margin: 0 0 20px 0; margin: 0 0 20px 0;
} }
.list01{ .list01{
.file_card{ .tag_card{
.ivu-checkbox{ display: none;} cursor: pointer;
.file{ margin: 0 20px 15px 0;
float: left;
}
.hege{ i{color: #2680EB;} } .hege{ i{color: #2680EB;} }
.rang{ i{color: #515A6E;} } .rang{ i{color: #515A6E;} }
.fanxiu{ i{color: #FFA000;} } .fanxiu{ i{color: #FFA000;} }
.feipin{ i{color: #FE7777;} } .feipin{ i{color: #FE7777;} }
} }
.ivu-checkbox-wrapper{ .ivu-tag-checked{
margin: 0 24px 0 0; border: 1px solid #2680EB !important;
}
.card_bor{
border: 1px solid #2680EB !important;
}
}
.list02{
.tag_card02{
margin: 0 20px 15px 0;
}
}
} }
.rangbu{
.list02{
.tag_card02{
.ivu-tag-dot-inner{
background: #515a6e;
} }
} }
} }
}
.fanxiu_box{
.list02{
.tag_card02{
.ivu-tag-dot-inner{
background: #FFA000;
}
}
}
}
.fei_box{
.list02{
.tag_card02{
.ivu-tag-dot-inner{
background: #FE7777;
}
}
}
}
.fei_box{
width: calc(100% - 520px);
display: inline-block;
margin: 0;
}
.fei_right{
float: right;
line-height: 50px;
width: 460px;
}
}
} }
.tech_box{ .tech_box{
......
pages/produce/execute/judgment/index.vue
View file @ 3081f0de
...@@ -2,93 +2,197 @@ ...@@ -2,93 +2,197 @@
<template> <template>
<div class="wu_bg"> <div class="wu_bg">
<div class="mass_box"> <div class="mass_box">
<h1 class="heger">合格（{{cardlist.length}}）</h1> <h2 class="heger">合格（{{cardlist.length}}）</h2>
<div class="mass_list"> <div class="mass_list">
<p class="btn_play"> <p class="btn_play">
<Button class="button" type="primary">全选</Button> <Button class="button" type="primary">全选</Button>
<Button class="button" type="primary">反选</Button> <Button class="button" type="primary">反选</Button>
</p> </p>
<div class="list01"> <div class="list01">
<CheckboxGroup v-model="caseLise" @on-change="changeCards"> <Tag type="dot" :checkable="true" class="tag_card" :checked="item.checked" size="large" v-for="(item,index) in cardlist" :name="item.id" :key="index"
<Checkbox class="file_card" border @on-change="changeCard" :checked="item.checked" color="primary" @on-change="changeCards" >
v-for="(item,index) in cardlist" :label="item.id" :key="index"> {{item.code}}</Tag>
<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> </div>
</Checkbox>
</CheckboxGroup>
</div> </div>
<div class="chuanse">
<Button class="button01">让步</Button>
<Button class="button02">返修</Button>
<Button class="button03">废品</Button>
</div> </div>
<div class="chuanse"></div> <div class="mass_list rangbu">
<div class=""> <h2 class="rangb">让步（{{ranglist.length}}）</h2>
<h1 class="rangb">让步</h1>
<div class="list02">
<Tag type="dot" class="tag_card02" v-for="(item,index) in ranglist" :key="index" :name="item.id" :checkable="false" closable @on-close="handleClose">{{ item.code}}</Tag>
</div> </div>
<div class="">
<h1 class="fanxiu">返修</h1>
</div> </div>
<div class=""> <div class="mass_list fanxiu_box">
<h1 class="feipin">废品</h1> <h2 class="fanxiu">返修（{{ranglist.length}}）</h2>
<div class="list02">
<Tag type="dot" class="tag_card02" v-for="(item,index) in ranglist" :key="index" :name="item.id" :checkable="false" closable @on-close="handleClose">{{ item.code}}</Tag>
</div> </div>
</div> </div>
<!-- <div class="star flex fc-b" v-else-if="starmodal">
<Button class="button" size='large' type="primary"><Icon type="ios-pause" /> 暂停</Button> <div class="mass_list fei_box">
<Button class="button" size='large' type="primary"><Icon type="logo-angular" /> 交检</Button> <h2 class="feipin">废品（{{ranglist.length}}）</h2>
<Button class="button" size='large' type="primary"><Icon type="ios-checkmark-circle-outline" /> 完工</Button> <div class="list02">
<Button class="button" size='large' type="primary"><Icon type="md-swap" /> 转序交接</Button> <Tag type="dot" class="tag_card02" v-for="(item,index) in ranglist" :key="index" :name="item.id" :checkable="false" closable @on-close="handleClose">{{ item.code}}</Tag>
<!-- <div class="file_card" v-for="(item,index) in ranglist" :label="item.id" :key="index">
{{item.code}}
<a class="del_card" @click="delCard"><Icon type="ios-close"/></a>
</div> --> </div> -->
</div> </div>
</div>
<div class="fei_right">
<p>问题原因：<Select style="width:80%">
<!-- <Option value="" class="option-text">请选择</Option> placeholder="选择问题原因" -->
<Option v-for="item in outerCodeList" :value="item" :key="item">{{ item }}</Option>
</Select></p>
<p>责任归属：<Select style="width:80%">
<!-- <Option value="" class="option-text">请选择</Option> placeholder="选择责任人" -->
<Option v-for="item in outerCodeList" :value="item" :key="item">{{ item }}</Option>
</Select></p>
</div>
</div>
<div class="star flex fc-m" >
<Button class="button" size='large' type="primary"> 提交</Button>
<Button class="button" size='large' type="primary"> 取消</Button>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
name:'starOrder', name:'starOrder',
data(){ data(){
return{ return{
checkedflag:false,
cardlist:[ cardlist:[
{ {
status:0, status:0,
code:1001, code:1001210011,
id:1,
checked:false,
},{
status:1,
code:1001210012,
id:2,
checked:false,
},{
status:2,
code:1001210013,
id:3,
checked:false,
},{
status:3,
code:1001210014,
id:4,
checked:false,
},{
status:0,
code:1001210011,
id:5,
checked:false,
},{
status:1,
code:1001210012,
id:6,
checked:false,
},{
status:2,
code:1001210013,
id:7,
checked:false,
},{
status:3,
code:1001210014,
id:8,
checked:false,
},{
status:0,
code:1001210015,
id:9,
checked:false,
},{
status:1,
code:1001210016,
id:10,
checked:false,
},{
status:2,
code:1001210017,
id:11,
checked:false,
},{
status:3,
code:1001210018,
id:12,
checked:false,
},{
status:0,
code:1001210019,
id:13,
checked:false,
},{
status:1,
code:10012100110,
id:14,
checked:false,
},{
status:2,
code:10012100111,
id:15,
checked:false,
},{
status:3,
code:10012100112,
id:16,
checked:false,
},
],
ranglist:[
{
status:0,
code:1001210011,
id:1, id:1,
checked:false, checked:false,
},{ },{
status:1, status:1,
code:1002, code:1001210012,
id:2, id:2,
checked:false, checked:false,
},{ },{
status:2, status:2,
code:1003, code:1001210013,
id:3, id:3,
checked:false, checked:false,
},{ },{
status:3, status:3,
code:1004, code:1001210014,
id:4, id:4,
checked:false, checked:false,
},{ },{
status:0, status:0,
code:1001, code:1001210011,
id:1, id:1,
checked:false, checked:false,
},{ },{
status:1, status:1,
code:1002, code:1001210012,
id:2, id:2,
checked:true, checked:true,
},{ },{
status:2, status:2,
code:1003, code:1001210013,
id:3, id:3,
checked:false, checked:false,
},{ },{
status:3, status:3,
code:1004, code:1001210014,
id:4, id:4,
checked:false, checked:false,
}, },
], ],
outerCodeList:[],
} }
}, },
created() { created() {
...@@ -109,6 +213,18 @@ export default { ...@@ -109,6 +213,18 @@ export default {
starFun(){ starFun(){
this.$Message.success("开工...") this.$Message.success("开工...")
}, },
delCard(){
this.$Message.success("删除一条")
},
changeCards(checked,name){
// console.log(checked)
// console.log(name)
},
handleClose(event,name){
console.log(name)
let index = this.ranglist.indexOf(name);
this.ranglist.splice(index, 1);
},
}, },
} }
</script> </script>
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