Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

pages/aps/results/api.js

@@ -17,7 +17,4 @@ export default {
     processschemedispatch(params) {
         return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch`, params);
     },
-    moveintoaps() {//跳转进入排产池前判断
-        return Api.post(`${PlanUrl}/messchedule/moveintoaps`);
-    },
 }

pages/aps/results/index.vue

@@ -66,14 +66,14 @@ export default {
         },
         {
           title: "超期预警",
-          key: "id",
+          key: "alert",
           align: "center",
           render: (h, params) => {
             return h("div", [
               h("Icon", {
                 props: {
                   type:
-                    params.row.id == 1
+                    params.row.alert == true
                       ? "ios-information-circle-outline"
                       : "ios-remove-circle-outline"
                 },
@@ -81,7 +81,7 @@ export default {
                   marginRight: "5px",
                   fontSize: "18px",
                   fontWeight: "bold",
-                  color: params.row.id == 1 ? "#FE7777" : "#0DD78D"
+                  color: params.row.alert == true ? "#FE7777" : "#0DD78D"
                 }
               })
             ]);
@@ -89,7 +89,7 @@ export default {
         },
         {
           title: "零件图号",
-          key: "part_number",
+          key: "part_id",
           align: "center"
         },
         {
@@ -175,7 +175,6 @@ export default {
               if (r.success) {
                 this.$Message.success("清空列表成功");
                 this.orderlist();
-                this.data = [];
               }
             });
           },
@@ -193,7 +192,6 @@ export default {
         if (r.result) {
           this.$Message.success(r.result.retmsg);
           this.orderlist();
-          this.data = [];
         } else {
           this.$Message.success("下发失败");
         }
@@ -201,19 +199,6 @@ export default {
     },
     comeBlck() {
       this.$router.push({ path: "/aps/aps" });
-      Api.moveintoaps().then(res => {
-        if (res.success) {
-          if (res.result.res) {
-            this.$router.push({
-              name: "aps-aps"
-            });
-          } else {
-            this.$router.push({
-              name: "aps-plan"
-            });
-          }
-        }
-      });
     }
   }
 };
@@ -240,6 +225,7 @@ export default {
     line-height: 38px;
     border-bottom: 1px solid #e4e6ed;
     margin-bottom: 15px;
+    margin-right: 15px;
   }
   .left-body:hover {
     cursor: pointer;
@@ -268,6 +254,7 @@ export default {
     .btn {
       float: right;
       margin-top: -52px;
+      margin-right: 15px;
     }
   }
 }