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

pages/produce/execute/components/orderlist.vue

@@ -3,17 +3,17 @@
 </style>
 <template>
     <div class="order_list">
-        <!-- <h4 class="order_title">
+        <!-- <div slot="header">
             <span class="gd_tt">工单列表</span>
             <a ><Icon type="ios-list" size="18" />  展开全部列表</a>
-        </h4> -->
-        <div class="select_t">
-            <!-- <Icon type="md-arrow-dropright" /> -->
+        </div> -->
+        <!-- <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> -->
         <div class="card_box">
             <Card class="card_order" v-for="(item,index) in listTasks"
                 @click.native="goPage(item)" :key="index"

pages/produce/execute/execute.less

@@ -79,6 +79,16 @@
         .ivu-drawer-left{
             width: 370px!important;
             .ivu-drawer-content{
+                .ivu-drawer-header{
+                    border: none;
+                    .header {
+                        height: 34px;
+                        border-bottom: 1px solid #ccc;
+                    }
+                    .select_t{
+                        padding: 15px 0 0 0;
+                    }
+                }
                 .ivu-drawer-body {
                     padding: 0;
                     .order_title {
@@ -95,10 +105,11 @@
                             padding: 15px 20px;
                         }
                         .card_box{
-                            padding: 0 15px;
+                            padding: 0 15px 60px;
                             .card_order{
                                 margin: 15px 0;
                                 border-left: 4px solid #ccc;
+                                cursor: pointer;
                                 .order_tit{
                                     color: #2680EB;
                                 }

pages/produce/execute/index.vue

@@ -52,14 +52,21 @@
         </div>
         <a class="gd_list" @click="orderlistMode = true">工单列表</a>
         <a class="gn_area" @click="functionalMode = true">功能区</a>
-        <!-- -->
-        <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> -->
+        <!-- 工单列表 -->
+        <Drawer placement="left" class="gd_box" :closable="false" v-model="orderlistMode">
+            <div slot="header">
+                <div class="header">
+                    <span class="gd_tt">工单列表</span>
+                    <a ><Icon type="ios-list" size="18" />  展开全部列表</a>
+                </div>
+                <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>
             <orderlist ref="orderlist"/>
         </Drawer>
          <!-- title="功能区"  -->
@@ -78,6 +85,30 @@ export default {
             starmodal: true,
             orderlistMode:false,
             functionalMode:false,
+            oderList:[
+                {
+                    value: '全部',
+                    label: '全部'
+                },{
+                    value: '未开工',
+                    label: '未开工'
+                },{
+                    value: '执行中',
+                    label: '执行中'
+                },{
+                    value: '暂停中',
+                    label: '暂停中'
+                },{
+                    value: '交检中',
+                    label: '交检中'
+                },{
+                    value: '交接中',
+                    label: '交接中'
+                },{
+                    value: '已完成',
+                    label: '已完成'
+                },
+            ],
         }
     },
     created() {
@@ -98,6 +129,21 @@ export default {
         starFun(){
             this.$Message.success("开工...")
         },
+        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>