Merge branch 'master' of gitlab.gavelinfo.com:lisu/lxyl-vue

src/views/ccgl/jcsj/gwwh/index.vue

@@ -38,26 +38,6 @@
               field: "name",
               width: 140
             },
-            // {
-            //   title: "工站id",
-            //   field: "stationid",
-            //   width: 140
-            // },
-            // {
-            //   title: "工位状态",
-            //   field: "status",
-            //   width: 140,
-            //   "transform": {
-            //     "url": "lxyl/jcsj/ugw/init/status",
-            //     "label": "name",
-            //     "value": "id"
-            //   }
-            // },
-            {
-              title: "工位别名",
-              field: "alias",
-              width: 140
-            },
             {
               title: "类型",
               field: "type",

src/views/ccgl/jcsj/kwgl/index.vue

@@ -43,6 +43,16 @@
                 "value": "id"
               }
             },
+            {
+              title: "存储状态",
+              field: "kczt",
+              width: 80,
+              "transform": {
+                "url": "wms/jcsj/kw/init/kczt",
+                "label": "name",
+                "value": "id"
+              }
+            },
             {
               title: "库位编码",
               field: "code",
@@ -81,16 +91,6 @@
               field: "kwz",
               width: 80,
             },
-            {
-              title: "存储状态",
-              field: "kczt",
-              "transform": {
-                "url": "wms/jcsj/kw/init/kczt",
-                "label": "name",
-                "value": "id"
-              }
-
-            },
             {
               title: "外侧库位",
               field: "wcKwCode",

src/views/ccgl/jcsj/lkrck/index.vue

@@ -39,13 +39,13 @@
            
             {
               title: "垛机取货工位",
-              field: "rkgwid",
-              width: 140
+              field: "rkgwCode",
+              width: 120
             },
             {
               title: "垛机放货工位",
-              field: "ckgwid",
-              width: 140
+              field: "ckgwCode",
+              width: 120
             },
             {
               title: "类型",

src/views/ccgl/rkgl/slk/top/index.vue

@@ -50,6 +50,16 @@
               },
               width: 100
             },
+            {
+              title: "任务号",
+              field: "djid",
+              width: 140
+            },
+            {
+              title: "业务日期",
+              field: "ywrq",
+              fieldType: "ftDate"
+            },
             {
               title: "仓库",
               field: "ckName",

src/views/ccgl/wcsrwgl/lkrw/index.vue

@@ -54,7 +54,7 @@
                 "value": "id"
               },
 
-              width: 80
+              width: 120
             }, {
               title: "任务号",
               field: "djid",
@@ -69,11 +69,6 @@
                 return a.kwName||a.gwName
               }
             },
-            // {
-            //   title: "库位",
-            //   field: "kwCode",
-            //   width: 140
-            // },
             {
               title: "目标位",
               field: "mbkwCode",
@@ -86,6 +81,11 @@
               title: "容器",
               field: "rqCode",
               width: 140
+            },
+             {
+              title: "垛机取/放货口",
+              field: "rcgwCode",
+              width: 140
             },
             {
               title: "开始时间",