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

components/page/equipTypeSelect.vue

@@ -42,7 +42,6 @@ export default {
   },
   methods: {
     change(v) {
-      // console.log(event)
       this.name = v;
       var item;
       var items = this.data.filter(u => {
@@ -52,7 +51,6 @@ export default {
         item = items[0];
       }
       this.$emit("on-change", v, item);
-     // this.$emit("on-change", event);
     },
     getTitle() {
       var title = "";

pages/aps/ai/index.vue

@@ -55,6 +55,8 @@
   </div>
 </template>
 <script>
+var myDate = new Date();
+var nowDate = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate();
 import Api from "../aps/api";
 import Add from "./options";
 import Temp from "./temp";
@@ -82,7 +84,7 @@ export default {
       },
       resultModal: false,
       entity: {
-        setTime: "",
+        setTime:this.getFormatDate(nowDate)
       },
       editModal: false,
       detailModal: false,
@@ -501,7 +503,7 @@ export default {
                     this.$Message.success("排产成功");
                     this.circleModal = false;
                     this.$router.push({
-                      path: "/ai/results",
+                      path: "/aps/results",
                       // params: { customerId: id }
                     });
                   } else {
@@ -527,6 +529,21 @@ export default {
           }.bind(this)
         );
     },
+
+    getFormatDate(dates) {
+      const d = new Date(dates);
+      const resDate =
+        d.getFullYear() +
+        "-" +
+        this.p(d.getMonth() + 1) +
+        "-" +
+        this.p(d.getDate()) +
+        " 00:00:01";
+      return resDate;
+    },
+    p(s) {
+      return s < 10 ? "0" + s : s;
+    }
   },
 };
 </script>

pages/aps/aps/index.vue

@@ -109,6 +109,8 @@
   </div>
 </template>
 <script>
+var myDate = new Date();
+var nowDate = myDate.getFullYear() + "-" + (myDate.getMonth() + 1) + "-" + myDate.getDate();
 import Api from "./api";
 import Add from "./options";
 import Temp from "./temp";
@@ -136,7 +138,7 @@ export default {
       },
       resultModal: false,
       entity: {
-        setTime: ""
+        setTime:this.getFormatDate(nowDate)
       },
       addModal: false,
       editModal: false,
@@ -756,8 +758,22 @@ export default {
           });
       }
       this.insertlModal1 = false;
-    }
+    },
     //插单end
+    getFormatDate(dates) {
+      const d = new Date(dates);
+      const resDate =
+        d.getFullYear() +
+        "-" +
+        this.p(d.getMonth() + 1) +
+        "-" +
+        this.p(d.getDate()) +
+        " 00:00:01";
+      return resDate;
+    },
+    p(s) {
+      return s < 10 ? "0" + s : s;
+    }
   }
 };
 </script>

pages/aps/results/compare.vue

@@ -28,7 +28,7 @@
         <div v-if="items.length>0" class="fg list_box" v-for="(li,a) in items" :class="a%2 == 1?'dip_bg':''" :key="a">
           <ul class="right_ul">
             <li class="right_ul_title">
-              <span class="case">方案一{{a}}</span>
+              <span class="case">{{li.scheduleId}}</span>
               <span class="case_time">2020-03-22 13:26:35</span>
             </li>
             <li>{{li.deferNum}}&nbsp;</li>
@@ -101,7 +101,7 @@ export default {
     items(){
       var items=[];
       this.schemas.map(p=>{
-        var info=this.list.filter(u=>u.schedule_Id==p.scheduleId)[0];
+        var info=this.list.filter(u=>u.scheduleId==p.schedule_Id)[0];
         items.push(info);
       })
       return items;

pages/technology/index.vue

@@ -10,7 +10,7 @@
   right: 0;
   //   bottom:100%;
   //   right: 100%;
-  z-index: 898;
+  z-index: 100;
   background-color: white;
   // background: red;
   .top {