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

i18n/locale/zh-CN.js

@@ -1475,6 +1475,7 @@ export default {
     version: "版本"
   },
   order_list: {
+    Id:'工单Id',
     mesCode: '订单编号',
     status: '工单状态',
     statusOrder: '订单状态',

pages/aps/plan/index.vue

@@ -245,43 +245,12 @@ export default {
                     easy: true,
                     high: true,
                 },
-                {
-                    key: "stage",
-                    title: this.l("stage"),
-                    align: "left",
-                    easy: true,
-                    high: true,
-                    code: "plan.order.stage",
-                },
-                {
-                    key: "materialName",
-                    title: this.l("materialName"),
-                    align: "left",
-                    easy: true,
-                    high: true,
-                },
                 {
                     key: "quantity",
                     title: this.l("quantity"),
                     align: "right",
                     high: true,
                 },
-                {
-                    key: "routingMethod",
-                    title: this.l("routingMethod"),
-                    align: "left",
-                    easy: true,
-                    high: true,
-                    code: "plan.order.routingMethod",
-                },
-                {
-                    key: "materialWeight",
-                    title: this.l("materialWeight"),
-                    align: "left",
-                    high: true,
-                    hide: true,
-                },
-
                 {
                     key: "productCode",
                     title: this.l("productCode"),
@@ -290,15 +259,6 @@ export default {
                     high: true,
                     hide: true,
                 },
-
-                {
-                    key: "isPreschedule",
-                    title: this.l("isPreschedule"),
-                    align: "left",
-                    high: true,
-                    code: "mes_xingchi_plan.mes_order.is_preschedule",
-                    hide: true,
-                },
                 {
                     key: "spareQty",
                     title: this.l("spareQty"),

pages/produce/orderlist.vue

@@ -109,6 +109,12 @@ export default {
             },
             downUrl: fileUrlDown,
             columns: [{
+                    title: this.l("Id"),
+                    key: "id",
+                    width: 80,
+                    align: "left",
+                },
+                {
                     title: this.l("mesCode"),
                     key: "mesCode",
                     width: 240,