Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/platformModule/menuManagement.vue

@@ -147,6 +147,15 @@
             </td>
           </tr>
           <tr>
+            <td>
+              <el-form-item label="系统菜单" prop="menutype">
+                <el-select filterable class='w200' v-model='addMsg.menutype' :placeholder="$t('pub.pleaseSel')">
+                  <el-option  label="ERP菜单" :value="1"></el-option>
+                  <el-option  label="资产菜单" :value="2"></el-option>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </td>
             <td>
               <el-form-item label="状态">
                 <el-switch v-model="addMsg.MenuStatus" active-value="0" inactive-value="1"></el-switch>
@@ -212,7 +221,8 @@
           'MenuName': '',
           'ParentId': '',
           'MenuStatus': '0',
-          'Tier': ''
+          'Tier': '',
+          
         },
         addMsg: {
           'MenuId': '0',
@@ -224,7 +234,8 @@
           'MenuStatus': '0',
           MenuStyleIcon: '',
           MenuStyleColor: '',
-          Sort: 0
+          Sort: 0,
+          menutype:1,
         },
         rules: {
           Sort: [{
@@ -246,6 +257,11 @@
             validator: validateParent,
             trigger: 'change'
           }],
+          menutype:[{
+            required: true,
+            message: '请选择系统菜单',
+            trigger: 'change'
+          }],
           MenuUrl: [{
             validator: validateUrl,
             trigger: 'blur'
@@ -346,7 +362,9 @@
           this.addMsg.MenuStatus = updateList.MenuStatus.toString()
           let style = JSON.parse(updateList.MenuStyle)
           this.addMsg.MenuStyleIcon = style.icon
+          this.addMsg.MenuStyleIcon = style.menutype
           this.addMsg.MenuStyleColor = style.color
+          
           this.currentUpdateIndex = index
         }, err => {})