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

pages/aps/results/index.vue

@@ -41,7 +41,7 @@
           </Col>
         </Row>
 
-        <component :is="detail" :eid="id" :schemas="schemas"/>
+        <component :is="detail" :eid="id" :schemas="schemas" @ok-claer="clearS" />
       </Content>
     </Layout>
     <div class="footer" v-if="showFooter">
@@ -77,8 +77,8 @@ export default {
       total: 0,
       blacks: false,
       gant: false,
-      gantt:null,
-      curPage:null
+      gantt: null,
+      curPage: null
     };
   },
   async fetch({ store, params }) {
@@ -121,6 +121,8 @@ export default {
               if (r.success) {
                 this.$Message.success("清空列表成功");
                 this.orderlist();
+                this.id = 0;
+                this.listData();
               }
             });
           },
@@ -130,6 +132,16 @@ export default {
         });
       }
     },
+    clearS() {
+      this.id = 0;
+      Api.clearall().then(r => {
+        if (r.success) {
+          this.orderlist();
+          this.id = 0;
+          this.listData();
+        }
+      });
+    },
     // 返回
     comeBlck() {
       this.$router.push({ path: "/aps/aps" });
@@ -151,26 +163,26 @@ export default {
       this.modal1Gant = true;
       this.gantt = () => import("./gantt");
     },
-    changeCheck(item,i) {
-      this.$set(this.list,i,item);
-      if(this.title!='排产方案对比'){
-          this.showFooter=true;
+    changeCheck(item, i) {
+      this.$set(this.list, i, item);
+      if (this.title != "排产方案对比") {
+        this.showFooter = true;
       }
     },
     submit() {
-        this.detail = () => import("./compare");
-        this.title = "排产方案对比";
-        this.showFooter=false;
+      this.detail = () => import("./compare");
+      this.title = "排产方案对比";
+      this.showFooter = false;
     },
     cancel() {
       this.showFooter = false;
     }
   },
-  computed:{
-    schemas(){
-      return this.list.filter(u=>{
-        return u.checked==true;
-      })
+  computed: {
+    schemas() {
+      return this.list.filter(u => {
+        return u.checked == true;
+      });
     }
   }
 };

pages/aps/results/result.vue

@@ -76,7 +76,7 @@ export default {
         },
         {
           title: "计划结束时间",
-          key: "plan_start",
+          key: "plan_finish",
           width: 200,
           align: "center"
         },
@@ -138,7 +138,8 @@ export default {
                 }).then(r => {
                   if (r.result) {
                     this.$Message.success(r.result.retmsg);
-                    this.orderlist();
+                   this.$emit('ok-claer')
+
                   } else {
                     this.$Message.error("下发失败");
                   }
@@ -150,7 +151,7 @@ export default {
                 }).then(r => {
                   if (r.result) {
                     this.$Message.success(r.result.retmsg);
-                    this.orderlist();
+                    this.$emit('ok-claer')
                   } else {
                     this.$Message.error("下发失败");
                   }