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

src/views/ccgl/cxfx/sapkcdb/index.vue

@@ -58,13 +58,8 @@
             },
             {
               title: "库存地点",
-              field: "sapCkid",
-              width: 140,
-              transform: {
-                "url": "lxyl/cxfx/sapKcdb/initCk",
-                "label": "name",
-                "value": "id"
-              }
+              field: "sapckCode",
+              width: 140
             },
             {
               title: "WMS库存总数",
@@ -80,6 +75,11 @@
               title: "库存差异数量",
               field: "cysl",
               fieldType: "float"
+            },
+            {
+              title: "计量单位",
+              field: "jldwName",
+              fieldType: "float"
             }
 
           ],
@@ -163,18 +163,18 @@
        * @author: lisu
        */
       checkQueryParams(params, tbapp) {
-        if (!params.hzid) {
-          this.$warning('请选择工厂')
-          tbapp.loading = false
-          tbapp.isactive = false
-          throw new Error('请选择工厂')
-        }
-        if (!params.sapCkid) {
-          this.$warning('请选择库存地点')
-          tbapp.loading = false
-          tbapp.isactive = false
-          throw new Error('请选择库存地点')
-        }
+        // if (!params.hzid) {
+        //   this.$warning('请选择工厂')
+        //   tbapp.loading = false
+        //   tbapp.isactive = false
+        //   throw new Error('请选择工厂')
+        // }
+        // if (!params.sapCkid) {
+        //   this.$warning('请选择库存地点')
+        //   tbapp.loading = false
+        //   tbapp.isactive = false
+        //   throw new Error('请选择库存地点')
+        // }
       },
       pageQueryFinally(list, res) {
         let serverTime = res.data.serverTime