Merge tag 'Hotfix-mo-3' into develop

Finish Hotfix-mo-3

src/views/setting/menu.vue

@@ -25,9 +25,9 @@
 
           <el-table-column align="right" label="操作" width="150" fixed="right">
             <template slot-scope="scope">
-              <el-button type="primary" size="mini" icon="el-icon-plus" v-if="scope.row.level == 1" @click="addOrEditChild('add', scope.row.moduleId)"></el-button>
+              <el-button type="primary" size="mini" icon="el-icon-plus" @click="addOrEditChild('add', scope.row.moduleId)"></el-button>
               <el-button type="primary" size="mini" icon="el-icon-edit" v-if="scope.row.level == 1" @click="addOrEditParent('edit', scope.row.moduleId)"></el-button>
-              <el-button type="primary" size="mini" icon="el-icon-edit" v-if="scope.row.level == 2" @click="addOrEditChild('edit', scope.row.moduleId)"></el-button>
+              <el-button type="primary" size="mini" icon="el-icon-edit" v-if="scope.row.level > 1" @click="addOrEditChild('edit', scope.row.moduleId)"></el-button>
               <el-popconfirm style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.moduleId)" >
                 <el-button slot="reference" size="mini" icon="el-icon-delete"></el-button>
               </el-popconfirm>
@@ -86,7 +86,7 @@
         <el-form-item label="图标" prop="icon">
           <div class="iconInput">
             <div class="icon" v-if="addChildForm.icon"><i :class="addChildForm.icon"></i></div>
-            <el-input placeholder="请选择图标" v-model="addChildForm.icon" readonly></el-input>
+            <el-input placeholder="请选择图标" v-model="addChildForm.icon"></el-input>
             <el-button type="primary" @click="toChooseIcon(2)">选择</el-button>
           </div>
         </el-form-item>
@@ -100,7 +100,7 @@
       </div>
     </el-dialog>
 
-    <!-- 新增编辑 二级菜单 -->
+    <!-- 选择图标 -->
     <el-dialog title="选择图标" :visible.sync="isChooseIconDialog" :show-close="true" width="600px" :close-on-click-modal="false">
       <div class="iconList">
         <div class="item" v-for="(item, index) in iconList" :key="index" @click="chooseIcon(item.value)">
@@ -179,9 +179,9 @@ export default {
         url: [
           { required: true, message: '请填写菜单URL', trigger: 'blur' }
         ],
-        icon: [
-          { required: true, message: '请选择图标', trigger: 'blur' }
-        ]
+        // icon: [
+        //   { required: true, message: '请选择图标', trigger: 'blur' }
+        // ]
       },
 
       isChooseIconDialog: false,
@@ -666,7 +666,7 @@ export default {
     chooseIcon(value) {
       if(this.chooseIconType === 1) {
         this.addParentForm.icon = value;
-      }else if(this.chooseIconType === 2) {
+      }else if(this.chooseIconType > 1) {
         this.addChildForm.icon = value;
       }
       this.isChooseIconDialog = false;