Merge remote-tracking branch 'origin/master'

src/views/system/role/index.vue

@@ -131,6 +131,12 @@
               </el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="供应商角色"  prop="roleId">
+            <el-radio-group v-model="form.isCustomer">
+              <el-radio  :label="0">否</el-radio>
+              <el-radio  :label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item label="菜单权限">
             <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
             <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
@@ -482,6 +488,7 @@ export default {
       this.reset();
       this.getMenuTreeselect();
       this.open = true;
+      this.form.isCustomer=0;
       this.title = "角色管理-新增";
     },
     /** 修改按钮操作 */