fix:生活号筛选UI调整

src/pages/Life-no/index.vue

@@ -13,9 +13,9 @@
         </el-form-item>
         <el-form-item label="类型">
           <el-select v-model="life_account.type" placeholder="类型">
+            <el-option value="0" label="全部"></el-option>
             <el-option value="1" label="个人"></el-option>
             <el-option value="2" label="企业"></el-option>
-            <el-option value="0" label="全部"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>

src/pages/Role/manage-role.vue

@@ -133,27 +133,6 @@
         </span>
       </template>
     </el-dialog>
-    <!-- <el-dialog :title="roleTitle" v-model="dialogVisible">
-      <el-form-item label="角色名称11111" :label-width="formLabelWidth">
-        <el-input v-model="roleName" autocomplete="off"></el-input>
-      </el-form-item>
-      <el-form-item label="角色范围" :label-width="formLabelWidth">
-        <el-cascader
-          v-model="selectedOptions"
-          :options="permissionsAll"
-          :props="props"
-          style="width: 280px"
-          @change="parentCateChange"
-          clearable
-        ></el-cascader>
-      </el-form-item>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="confirm">确 定</el-button>
-        </span>
-      </template>
-    </el-dialog> -->
   </layout>
 </template>
 <script>
@@ -206,9 +185,8 @@ export default {
         role_name: "",
       },
       permissionsAll: [],
-      // role_account_list: [],
-      // permissionsUpdate: [],
-      currenPermissionsUpdate: []
+      currenPermissionsUpdate: [],
+      currentRolePrivilege: []
     }
   },
   activated () {
@@ -394,6 +372,15 @@ export default {
     },
     //确认修改
     confirm () {
+      let checkRolePrivilege = []
+      this.edit ? checkRolePrivilege = this.currentRolePrivilege : checkRolePrivilege = this.currenPermissionsUpdate
+      if (!(this.roleName && checkRolePrivilege.length > 0)) {
+        this.$message({
+          type: 'error',
+          message: "请完善信息"
+        });
+        return false
+      }
       if (this.edit) {
         this.getEditRole()
       } else {
@@ -402,26 +389,12 @@ export default {
     },
     //编辑提交的数据
     getEditRole () {
-      if (!(this.roleName && this.currentRolePrivilege.length > 0)) {
-        this.$message({
-          type: 'error',
-          message: "请完善信息"
-        });
-        return false
-      }
       let { role_id } = this.role_info_detail
       let role_status = ''
       this.getUpdate_role(this.roleName, role_id, role_status, this.currentRolePrivilege)
     },
     //新增角色
     getAdd_role () {
-      if (!(this.roleName && this.currenPermissionsUpdate.length > 0)) {
-        this.$message({
-          type: 'error',
-          message: "请完善信息"
-        });
-        return false
-      }
       let parmasAdd_role = {
         role_name: this.roleName,
         permissions: this.currenPermissionsUpdate