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

pages/aps/aps/components/excute.vue

@@ -63,15 +63,32 @@ export default {
           high: true,
           width: 60,
           render: (h, params) => {
-            return h("Icon", {
-              attrs: {
-                type:
-                  params.row.insert_flag == 1 ? "ios-flag" : "ios-flag-outline",
-                size: 20,
-                color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
+            return h(
+              "Tooltip",
+              {
+                props: {
+                  content:
+                    params.row.insert_flag == 1 ? "取消插单" : "进行插单",
+                  placement: "top"
+                },
+                class: "ico"
               },
-              on: { click: () => this.changeFlag(params.row.id, params.index) }
-            });
+              [
+                h("Icon", {
+                  attrs: {
+                    type:
+                      params.row.insert_flag == 1
+                        ? "ios-flag"
+                        : "ios-flag-outline",
+                    size: 20,
+                    color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
+                  },
+                  on: {
+                    click: () => this.changeFlag(params.row.id, params.index)
+                  }
+                })
+              ]
+            );
           }
         },
         {
@@ -107,21 +124,24 @@ export default {
           key: "put_into_qty",
           title: this.l("put_into_qty"),
           align: "left",
-          high: true
+          high: true,
+          hide: true
         },
         {
           key: "plan_start",
           title: this.l("plan_start"),
           align: "center",
           high: true,
-          width: 140
+          width: 140,
+          hide: true
         },
         {
           key: "plan_finish",
           title: this.l("plan_finish"),
           align: "center",
           high: true,
-          width: 140
+          width: 140,
+          hide: true
         },
         {
           key: "setup_time",
@@ -234,6 +254,13 @@ export default {
           easy: true,
           high: true
         },
+        {
+          key:"first_equip",
+          title:this.l("first_equip"),
+          align:"left",
+          easy:true,
+          high:true,
+        },
         {
           key: "notes",
           title: this.l("notes"),
@@ -348,7 +375,7 @@ export default {
       Api.getbyorderid(params).then(res => {
         if (res.success) {
           this.gridHeight = 50;
-          this.gridHeight = (res.result.length +1) * 48;
+          this.gridHeight = (res.result.length + 1) * 48;
           this.data1 = res.result;
         }
       });
@@ -409,7 +436,7 @@ export default {
         }
       });
     },
-    
+
     //删除工序时间end-----
     cancel() {
       this.curId = 0;
@@ -422,7 +449,7 @@ export default {
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
-    },
+    }
   }
 };
 </script>

src/assets/css/base.css

@@ -646,7 +646,7 @@ html [type=button] {
 }
 .waitTask {
   /*flex 布局*/
-  display: flex;
+  display: flex!important;
   align-items: center;
   width: 200px;
   height: 100px;