Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/partner/level-config/components/list/list.component.ts

@@ -110,12 +110,12 @@ export class ParterLevelConfigListComponent implements OnInit {
           {
             text: '禁用',
             click: (_record, _modal, _instance) => this.stop(_record),
-            iif: item => !item.stateLocked
+            iif: item => item.stateLocked
           },
           {
             text: '启用',
             click: (_record, _modal, _instance) => this.restart(_record),
-            iif: item => item.stateLocked
+            iif: item => !item.stateLocked
           }
         ]
       }

src/app/routes/vehicle/components/list/carauth/carauth.component.ts

@@ -181,6 +181,14 @@ export class CarSettleCarauthComponent implements OnInit {
           placeholder:'请上传行驶证自动带出'
           },
         },
+        carEnergyType: {
+          title: '车辆能源类型',
+          type: 'string',
+          readOnly: true,
+          ui: {
+          placeholder:'请输入车辆能源类型'
+          },
+        },
         carLength: {
           title: '车长',
           type: 'string',