bug

Html/src/view/fml/statistical_analysis/lineMonitor.vue

@@ -134,19 +134,19 @@ export default {
                 {
                     title: "工装编号",
                     key: "fixtureName",
-                    render: (h, params) => {
-                        return h(
-                            "a",
-                            {
-                                on: {
-                                    click: () => {
-                                        // this.show1 = true;
-                                    },
-                                },
-                            },
-                            "look"
-                        );
-                    },
+                    // render: (h, params) => {
+                    //     return h(
+                    //         "a",
+                    //         {
+                    //             on: {
+                    //                 click: () => {
+                    //                     // this.show1 = true;
+                    //                 },
+                    //             },
+                    //         },
+                    //         "look"
+                    //     );
+                    // },
                 },
                 {
                     title: "产品编号",
@@ -155,23 +155,35 @@ export default {
                 {
                     title: "工件编号",
                     key: "sn",
-                    render: (h, params) => {
-                        return h(
-                            "a",
-                            {
-                                on: {
-                                    click: () => {
-                                        // this.show2 = true;
-                                    },
-                                },
-                            },
-                            "look"
-                        );
-                    },
+                    // render: (h, params) => {
+                    //     return h(
+                    //         "a",
+                    //         {
+                    //             on: {
+                    //                 click: () => {
+                    //                     // this.show2 = true;
+                    //                 },
+                    //             },
+                    //         },
+                    //         "look"
+                    //     );
+                    // },
                 },
                 {
                     title: "状态",
                     key: "status",
+                    render: (h, params) => {
+                        let str = "";
+                        str =
+                            params.row.status == 1
+                                ? "待上料"
+                                : params.row.status == 2
+                                ? "生产中"
+                                : params.row.status == 3
+                                ? "待下料"
+                                : "";
+                        return h("div", str);
+                    },
                 },
                 {
                     title: "最后更新时间",

Html/src/view/fms/associate/assemblyInfo.vue

@@ -399,6 +399,17 @@ export default {
             pagesize: 10,
             columns2: [
                  {
+                    type: "index2",
+                    title: this.$t("1008"),
+                    key: "xuhao",
+                    render: (h, params) => {
+                        return h(
+                            "span",
+                            params.index+ 1
+                        );
+                    },
+                },
+                {
                     title: "子工装类型",
                     key: "category",
                 },
@@ -468,7 +479,7 @@ export default {
     },
     created() {
         this.columns1 = this.$time.initTableTitle(this.columns1);
-        // this.columns2 = this.$time.initTableTitle(this.columns2);
+        this.columns2 = this.$time.initTableTitle(this.columns2);
 
         this.initFrockType();
         this.tosearch();