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

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>