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

src/views/sbxxgl/sblxgx/edit.vue

@@ -25,7 +25,7 @@ import sbxx from './sbxx'
             "typeConfig": {
               "src": "sbgl/ujzbm/query",
               "match": {
-                "value": "id",
+                "value": "code",
                 "label": "name"
               }
             }

src/views/sbxxgl/sblxgx/index.vue

@@ -27,7 +27,7 @@
               transform: {
                 "url": "sbgl/ujzbm/query",
                 "label": "name",
-                "value": "id"
+                "value": "code"
               }
             },
             {

src/views/sbxxgl/sbxx/edit.vue

@@ -78,7 +78,7 @@
             "typeConfig": {
               "src": "sbgl/usblx/query",
               "match": {
-                "value": "id",
+                "value": "code",
                 "label": "name"
               }
             }
@@ -125,7 +125,7 @@
             "typeConfig": {
               "src": "sbgl/ujzbm/query",
               "match": {
-                "value": "id",
+                "value": "code",
                 "label": "name"
               }
             }

src/views/sbxxgl/sbxx/index.vue

@@ -93,7 +93,17 @@
               transform: {
                 "url": "sbgl/usblx/query",
                 "label": "name",
-                "value": "id"
+                "value": "code"
+              }
+            },
+            {
+              title: "机组编码",
+              field: "jzbm",
+              width: 140,
+              transform: {
+                "url": "sbgl/ujzbm/query",
+                "label": "name",
+                "value": "code"
               }
             },
             {
@@ -121,16 +131,6 @@
               field: "ltzj",
               width: 140
             },
-            {
-              title: "机组编码",
-              field: "jzbm",
-              width: 140,
-              transform: {
-                "url": "sbgl/ujzbm/query",
-                "label": "name",
-                "value": "id"
-              }
-            },
             {
               title: "备注",
               field: "bz",