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

assets/css/base.less

@@ -977,6 +977,7 @@ html [type=button] {
             background: #1890FF;
             color: #fff;
         }
+        background: transparent;
     }
 
     a.detail{

pages/produce/execute/execute.less

 
 .execute_box{
     position: relative;
-    
+    margin: 0px -10px;
     .top_title{
         height: 50px;
         line-height: 49px;
         text-align: center;
         font-weight: 600;
+        padding: 0 15px;
         border-bottom: 1px solid #CACBD0;
     }
     .star{
@@ -332,4 +333,62 @@
 }
 .wu_bg{
     height: calc(100vh - 165px);
+}
+.case_top{
+    padding: 15px 70px 10px;
+    .sear_btn{
+        width: calc(100% - 80px);
+        display: inline-block;
+        .search_box{
+            width: 200px;
+            float: left;
+        }
+        a{
+            display: inline-block;
+            width: 65px;
+            height: 33px;
+            line-height: 40px;
+            text-align: center;
+            i{
+                font-size: 24px;
+            }
+        }
+    }
+    .slip{
+        margin-right: 20px;
+        i.ivu-icon{
+            font-size: 32px;
+            transform:rotate(90deg);
+            -ms-transform:rotate(90deg); /* Internet Explorer */
+            -moz-transform:rotate(90deg); /* Firefox */
+            -webkit-transform:rotate(90deg); /* Safari 和 Chrome */
+            -o-transform:rotate(90deg); /* Opera */
+        }
+    }
+}
+.case_box{
+    padding: 10px 20px;
+    height: calc(100vh - 210px);
+    overflow-y: auto;
+    .file_card{
+        background: #F5F6FA;
+        margin: 10px 50px;
+        width: 360px;
+        padding: 18px;
+        height: 110px;
+        line-height: 24px;
+        .ivu-checkbox {
+            display: none;
+        }
+        .file {
+            display: block;
+            width: 60px;
+            height: 64px;
+            float: left;
+            margin: 0 8px 0 0;
+            i{
+                font-size: 58px;
+            }
+        }
+    }
 }
\ No newline at end of file

pages/produce/execute/index.vue

@@ -4,7 +4,7 @@
 <template>
     <div class="execute_box">
         <div class="top_title">
-            <span class="fl">{{orderTitle}}--{{orderindex}}</span> 
+            <span class="fl">{{orderTitle}}</span> 
             <div>工单编号: 12001011</div>
         </div>
         <component :is="detail" :gdid="gdId"/>

pages/produce/execute/taskTime/index.vue

@@ -87,11 +87,11 @@ export default {
         },
         delItem(){
             this.$Modal.confirm({
-            title: this.title,
-            content: "<p>" + this.msg + "</p>",
-            onOk: () => {
-                this.$Message.success("删除工时...")
-            }
+                title: this.title,
+                content: "<p>" + this.msg + "</p>",
+                onOk: () => {
+                    this.$Message.success("删除工时...")
+                }
             });
         },
         cancel(){

pages/test/u.vue

@@ -28,6 +28,14 @@
     <div>
       <i-switch v-model="sitch"/>
     </div>
+<div style="text-align:center">
+ <User  value="46"/>
+ <User  value="43"/>
+ <User  value="44"/>
+ <User  value="115"/>
+ <User  value="37"/>
+</div>
+    <User  value="46"/>
   </div>
 </template>
 <script>