Skip to content

M
mes-ui
Commit 78b8eba8 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents f36f4add b32140ab
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 9 deletions
pages/produce/execute/execute.less
View file @ 78b8eba8
......@@ -217,6 +217,7 @@
margin: 20px 72px;
width: 300px;
height: 240px;
border-color: #2680EB;
.ivu-card-head{
background: #d3e6fb;
border-radius: 4px 4px 0px 0px;
......@@ -259,6 +260,7 @@
}
.gs_card:hover {
border-color: #2680EB;
box-shadow: 0px 6px 9px #484040b5;
}
.gs_add{
border: 1px dashed #2680EB;
......@@ -271,4 +273,43 @@
}
}
}
}
.add_user{
.gd_userB{
border: 1px solid #ccc;
padding: 10px;
height: 440px;
overflow-x: auto;
.user_item {
max-width: 160px;
display: inline-block;
width: 160px;
height: 56px;
border-radius: 28px 4px 4px 28px;
border: 1px solid #2d8cf0;
margin: 15px 23px;
i {
font-size: 56px;
float: left;
color: #2680EB;
}
.gd_user {
padding: 6px;
}
.user_bg {
// border: 3px solid #ceb0b0;
border-radius: 25px 4px 4px 25px;
height: 54px;
background: #2680eb;
color: #fff;
i {
font-size: 56px;
color: #ffffff;
}
.gd_user {
padding: 6px;
}
}
}
}
}
\ No newline at end of file
pages/produce/execute/taskTime/add.vue
View file @ 78b8eba8
<template>
<div>
<div class="add_user">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col span="12">
<Col span="8">
<FormItem label="所属车间">
<Input v-model="entity.projectNo" disabled></Input>
<Select v-model="entity.che" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value">
{{ item.label }}
</Option>
</Select>
</FormItem>
</Col>
<Col span="12">
<Col span="8">
<FormItem label="所属班组">
<Input v-model="entity.productName" disabled></Input>
<Select v-model="entity.productName" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
</Select>
</FormItem>
</Col>
<Col span="12">
<FormItem label="数字">
<InputNumber v-model="entity.outSideTime" style="width:150px;" :min="0"></InputNumber>
<Col span="8">
<FormItem label="">
<Input search enter-button placeholder="请输入编号" />
</FormItem>
</Col>
<Col span="24" class="mb20">
<div class="gd_userB">
<a class="user_item" @click="checkItem(index)" v-for="(item,index) in listMan" :key="index">
<div :class="{user_bg:item.checked}" >
<Icon type="md-contact" />
<div class="gd_user">
<span class="user_name">{{item.userName}}</span>
<span class="user_number">{{item.userCode}}</span>
</div>
</div>
</a>
</div>
</Col>
<Col span="24">
<FormItem label="分配工时">
<InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp;
<InputNumber :max="23" :min="0" v-model="value1"></InputNumber> 小时 &nbsp;&nbsp;&nbsp;&nbsp;
<InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp;
</FormItem>
</Col>
</Row>
</Form>
<Row>
......@@ -33,13 +59,51 @@ export default {
data(){
return{
admor:1,
value1:1,
u_bgFlag:false,
entity: {
},
rules: {
outSideTime: [
{ required: true, message: "必填", type: "number", trigger: "change" }
]
}
},
cityList:[
{
value: '车间A1',
label: '车间A1'
},{
value: '车间A2',
label: '车间A2'
},{
value: '车间A3',
label: '车间A3'
},{
value: '车间A4',
label: '车间A4'
},{
value: '车间A5',
label: '车间A5'
},
],
listMan:[
{
checked:false,
userName:'张珊珊1',
userCode:'08965481',
id: 1
},{
checked:false,
userName:'张珊珊2',
userCode:'08965482',
id: 2
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
}
],
}
},
methods: {
......@@ -49,6 +113,9 @@ export default {
handleClose(){
this.$emit("on-close");
},
checkItem(i){
this.listMan[i].checked = !this.listMan[i].checked;
},
},
}
</script>
\ No newline at end of file
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