Commit ca12b62f authored by renjintao's avatar renjintao

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

parents fb575232 20a710da
.execute_box{ .execute_box{
position: relative;
.top_title{ .top_title{
height: 50px; height: 50px;
line-height: 49px; line-height: 49px;
......
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
<a class="gd_list" @click="orderlistMode = true">工单列表</a> <a class="gd_list" @click="orderlistMode = true">工单列表</a>
<a class="gn_area" @click="functionalMode = true">功能区</a> <a class="gn_area" @click="functionalMode = true">功能区</a>
<!-- 工单列表 --> <!-- 工单列表 -->
<Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode"> <Drawer placement="left" class="gd_box" :closable="false"
:inner="true" :transfer="false" v-model="orderlistMode">
<div slot="header"> <div slot="header">
<div class="header"> <div class="header">
<span class="gd_tt">工单列表</span> <span class="gd_tt">工单列表</span>
<a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a> <a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a>
</div> </div>
<div class="select_t"> <div class="select_t">
<!-- <Icon type="md-arrow-dropright" /> -->
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder"> <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> <Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select> </Select>
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
</div> </div>
<orderlist ref="orderlist"/> <orderlist ref="orderlist"/>
</Drawer> </Drawer>
<!-- title="功能区" --> <!-- title="功能区" -->
<Drawer class="gn_box" :closable="false" v-model="functionalMode"> <Drawer class="gn_box" :closable="false" :inner="true" :transfer="false" v-model="functionalMode">
<functional ref="functional" /> <functional ref="functional" />
</Drawer> </Drawer>
</div> </div>
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
starmodal: true, starmodal: true,
orderlistMode:false, orderlistMode:false,
functionalMode:false, functionalMode:false,
odermodel:'全部',
oderList:[ oderList:[
{ {
value: '全部', value: '全部',
......
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