Merge remote-tracking branch 'origin/master'

src/views/system/role/index.vue

@@ -213,7 +213,6 @@
         </el-tab-pane>
 
 
-
       </el-tabs>
 
       <!-- 添加或修改角色配置对话框 -->
@@ -623,7 +622,6 @@ export default {
       this.reset();
       this.getMenuTreeselect();
       this.open = true;
-      this.form.isCustomer=0;
       this.title = "角色管理-新增";
     },
     /** 修改按钮操作 */
@@ -680,11 +678,13 @@ export default {
       //   return
       // }
       debugger
+      if(this.form.isCustomer == null){
         if (this.userStatus == 0) {
           this.form.isCustomer = 0;
         } else {
           this.form.isCustomer = 1;
         }
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.roleId != undefined) {