Merge branch 'master' of http://47.99.244.21:9999/chehuidong/saas-manage into wq

src/views/menu.vue

@@ -90,7 +90,7 @@
         <el-form-item label="等级" prop="level">
         <el-form-item label="等级" prop="level">
           <el-input style="width: 220px" v-model="editForm.level" />
           <el-input style="width: 220px" v-model="editForm.level" />
         </el-form-item>
         </el-form-item>
-        <el-form-item label="启用状态">
+        <el-form-item label="启用状态" prop="enable">
           <div style="width: 220px; display: inline-block">
           <div style="width: 220px; display: inline-block">
             <el-radio v-model="editForm.enable" :label="true">启用</el-radio>
             <el-radio v-model="editForm.enable" :label="true">启用</el-radio>
             <el-radio v-model="editForm.enable" :label="false">禁用</el-radio>
             <el-radio v-model="editForm.enable" :label="false">禁用</el-radio>
@@ -395,10 +395,7 @@ export default {
         if (item.includeNamespace && item.includeNamespace.length > 0) {
         if (item.includeNamespace && item.includeNamespace.length > 0) {
           item.includeNamespace = item.includeNamespace.split(',')
           item.includeNamespace = item.includeNamespace.split(',')
         }
         }
-        this.editForm = {
-          ...item,
-          enable: true
-        }
+        this.editForm = item
       }
       }
       // getApplication().then((res) => {
       // getApplication().then((res) => {
       //   if (res.code === 200) {
       //   if (res.code === 200) {