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

components/page/outputTime.vue

@@ -34,23 +34,23 @@ export default {
       let outStr = "";
       if (day) {
         if (second == 0 && minute > 0 && hour > 0) {
-          outStr = day + "天" + hour + "时" + minute + "分";
+          outStr = day + "天" + hour + "小时" + minute + "分";
         } else if (second == 0 && minute == 0 && hour > 0) {
-          outStr = day + "天" + hour + "时";
+          outStr = day + "天" + hour + "小时";
         } else if (second == 0 && minute == 0 && hour == 0) {
           outStr = day + "天";
         } else {
-          outStr = day + "天" + hour + "时" + minute + "分" + second + "秒";
+          outStr = day + "天" + hour + "小时" + minute + "分" + second + "秒";
         }
         return outStr;
       } else {
         if (hour) {
           if (second == 0 && minute > 0) {
-            outStr = hour + "时" + minute + "分";
+            outStr = hour + "小时" + minute + "分";
           } else if (second == 0 && minute == 0) {
-            outStr = hour + "时";
+            outStr = hour + "小时";
           } else {
-            outStr = hour + "时" + minute + "分" + second + "秒";
+            outStr = hour + "小时" + minute + "分" + second + "秒";
           }
           return outStr;
         } else {

pages/produce/execute/execute.less

@@ -332,4 +332,61 @@
 }
 .wu_bg{
     height: calc(100vh - 165px);
+}
+.case_top{
+    padding: 15px 40px 10px;
+    .sear_btn{
+        width: calc(100% - 50px);
+        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{
+        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: 20px 20px;
+        width: calc(25% - 40px);//
+        padding: 18px;//
+        height: auto;
+        line-height: 20px;
+        .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/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/produce/orderlist.vue

+
+<template>
+    <div class="">
+        <div class="">
+            <Button @click="toExecute">工单执行</Button>
+        </div>        
+    </div>
+</template>
+<script>
+export default {
+    name:'starOrder',
+    data(){
+        return{
+            starmodal: false,
+        }
+    },
+    created() { },
+    async fetch({ store, params }) {
+        await store.dispatch("loadDictionary"); // 加载数据字典
+    },
+    mounted() { },
+    methods: {
+        toExecute(){
+            this.$router.push("/produce/execute");
+        },
+    },
+}
+</script>