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

pages/produce/execute/execute.less

@@ -354,6 +354,35 @@
         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{

pages/produce/execute/judgment/index.vue

@@ -2,12 +2,35 @@
 <template>
     <div class="wu_bg">
         <div class="mass_box">
-            <h3>合格（51）</h3>
+            <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="chuanse"></div>
+            <div class="">
+                <h1 class="rangb">让步</h1>
+            </div>
             <div class="">
-                <h3>让步</h3>
+                <h1 class="fanxiu">返修</h1>
             </div>
             <div class="">
-                <h3>送审</h3>
+                <h1 class="feipin">废品</h1>
             </div>
         </div>
         <!-- <div class="star flex fc-b" v-else-if="starmodal">
@@ -23,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() {