Merge remote-tracking branch 'origin/dev' into dev

src/api/basicData/configuration.js

@@ -112,7 +112,7 @@ export function detailList(data) {
 }
 export const getList = (current, size, params, goodsTypeId) => {
     return request({
-        url: '/api//blade-client/goodsdesc/selectGoods',
+        url: '/api/blade-client/goodsdesc/selectGoods',
         method: 'get',
         params: {
             ...params,

src/components/crop-select/configuration/mainList.json

@@ -15,39 +15,46 @@
             "label": "编码",
             "prop": "code",
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },{
             "label": "名称",
             "prop": "cname",
             "search": true,
             "searchSpan": 16,
             "index": 2,
-            "width":180
-        },{
+            "width":180,
+        "overHidden": true
+      },{
             "label": "区域",
             "prop": "belongtoarea",
             "index": 4,
-            "width":180
-        },{
+            "width":180,
+        "overHidden": true
+      },{
             "label": "所属公司",
             "prop": "belongtocompany",
             "index": 5,
-            "width":100
-        },{
+            "width":100,
+        "overHidden": true
+      },{
             "label": "联系人",
             "prop": "attn",
             "index": 6,
-            "width":100
-        },{
+            "width":100,
+        "overHidden": true
+      },{
             "label": "代理品牌",
             "prop": "goodtypes",
             "index": 7,
-            "width":100
-        },{
+            "width":100,
+        "overHidden": true
+      },{
             "label": "等级",
             "prop": "creditLevel",
             "index": 8,
-            "width":100
-        }
+            "width":100,
+        "overHidden": true
+      }
     ]
 }