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

i18n/locale/zh-CN.js

@@ -1043,6 +1043,7 @@ export default {
         multi_machine: '多台分配',
         notes: '备注',
         insert_flag: '插单',
+        important_flag:"插单",
         outside_time: '外协时间',
         discrete_percent: '离散百分比%',
         taskseq_des: '',

pages/aps/aps/components/excute.vue

@@ -57,8 +57,8 @@ export default {
         { key: "id", title: this.l("id"), hide: true, align: "left" },
         { title: " ", width: 130 },
         {
-          key: "insert_flag",
-          title: this.l("insert_flag"),
+          key: "important_flag",//insert_flag?
+          title: this.l("important_flag"),
           align: "center",
           high: true,
           width: 60,
@@ -68,7 +68,7 @@ export default {
               {
                 props: {
                   content:
-                    params.row.insert_flag == 1 ? "取消插单" : "进行插单",
+                    params.row.important_flag == 1 ? "取消插单" : "进行插单",
                   placement: "top"
                 },
                 class: "ico"
@@ -77,11 +77,11 @@ export default {
                 h("Icon", {
                   attrs: {
                     type:
-                      params.row.insert_flag == 1
+                      params.row.important_flag == 1
                         ? "ios-flag"
                         : "ios-flag-outline",
                     size: 20,
-                    color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
+                    color: params.row.important_flag == 1 ? "#2680EB" : "#aaa"
                   },
                   on: {
                     click: () => this.changeFlag(params.row.id, params.index)
@@ -142,6 +142,13 @@ export default {
           high: true,
           width: 140,
           hide: true
+        },
+         {
+          key:"first_equip",
+          title:this.l("first_equip"),
+          align:"left",
+          easy:true,
+          high:true,
         },
         {
           key: "setup_time",
@@ -158,9 +165,8 @@ export default {
         {
           key: "outside_time",
           title: this.l("outside_time"),
-          align: "center",
+          align: "right",
           high: true,
-          width: 140
         },
         {
           key: "transport_time",
@@ -185,7 +191,7 @@ export default {
         {
           key: "machine_rule",
           title: this.l("machine_rule"),
-          align: "left",
+          align: "center",
           easy: true,
           high: true,
           width: 140
@@ -198,16 +204,16 @@ export default {
           hide: true
         },
         {
-          key: "first_equip",
-          title: this.l("first_equip"),
+          key: "equip_type",
+          title: this.l("equip_type"),
           align: "left",
           easy: true,
           high: true,
           hide: true
         },
         {
-          key: "equip_type",
-          title: this.l("equip_type"),
+          key: "first_equip",
+          title: this.l("first_equip"),
           align: "left",
           easy: true,
           high: true,
@@ -237,30 +243,23 @@ export default {
         {
           key: "isdiscrete",
           title: this.l("isdiscrete"),
-          align: "left",
+          align: "center",
           easy: true,
           high: true
         },
         {
           key: "discrete_value",
           title: this.l("discrete_value"),
-          align: "left",
+          align: "right",
           high: true
         },
         {
           key: "multi_machine",
           title: this.l("multi_machine"),
-          align: "left",
+          align: "center",
           easy: true,
           high: true
         },
-        {
-          key:"first_equip",
-          title:this.l("first_equip"),
-          align:"left",
-          easy:true,
-          high:true,
-        },
         {
           key: "notes",
           title: this.l("notes"),
@@ -384,7 +383,7 @@ export default {
     //插单事件start----
     changeFlag(id, index) {
       this.rowIndex = index;
-      if (this.data1[this.rowIndex].insert_flag == 1) {
+      if (this.data1[this.rowIndex].important_flag == 1) {
         this.insertTItle = "取消插单";
       } else {
         this.insertTItle = "插单";
@@ -393,13 +392,12 @@ export default {
     },
     insertOk() {
       //this.loadData(this.row)
-      if (this.data1[this.rowIndex].insert_flag == 1) {
+      if (this.data1[this.rowIndex].important_flag == 1) {
         //根据插单数据状态进行插单或取消插单操作
-        this.data1[this.rowIndex].insert_flag = 0;
+        this.data1[this.rowIndex].important_flag = 0;
       } else {
-        this.data1[this.rowIndex].insert_flag = 1;
+        this.data1[this.rowIndex].important_flag = 1;
       }
-
       this.setParsModal = false;
       this.detailModal = false;
       this.editModal = false;

pages/aps/aps/index.vue

@@ -326,8 +326,11 @@ export default {
       this.deletedlModal = false;
       this.apsModal = false;
     },
-    onDragDrop(a, b) {
-      this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
+    onDragDrop(a, b) {//拖拽排序
+      //this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
+      let tempArray=this.list[a]
+      this.list.splice(a,1)
+      this.list.splice(b,0,tempArray)
     },
     openParms(id) {
       this.addModal = true;