ZaiZai 1 year ago
parent
commit
053c47976e
1 changed files with 10 additions and 28 deletions
  1. 10 28
      src/views/system/user.vue

+ 10 - 28
src/views/system/user.vue

@@ -10,40 +10,31 @@
                 <hc-icon class="text-white" name="add" />
                 <hc-icon class="text-white" name="add" />
                 <span class="text-white">新增</span>
                 <span class="text-white">新增</span>
             </el-button>
             </el-button>
-            <el-button
-                :disabled="tableCheckedKeys.length === 0" color="#FF6C6C" :loading="batchDelLoad"
-                @click="batchDelClick"
-            >
+            <el-button :disabled="tableCheckedKeys.length === 0" color="#FF6C6C" :loading="batchDelLoad" @click="batchDelClick">
                 <hc-icon class="text-white" name="delete-bin-2" />
                 <hc-icon class="text-white" name="delete-bin-2" />
                 <span class="text-white">删除</span>
                 <span class="text-white">删除</span>
             </el-button>
             </el-button>
-            <el-button
-                v-yes-com:[refreshPassword1] :disabled="tableCheckedKeys.length === 0" type="info"
-                yes-com-text="是否重置密码为 123456"
-            >
+            <el-button v-yes-com:[refreshPassword1] :disabled="tableCheckedKeys.length === 0" type="info" yes-com-text="是否重置密码为 123456">
                 <hc-icon name="refresh" />
                 <hc-icon name="refresh" />
                 <span>重置密码</span>
                 <span>重置密码</span>
             </el-button>
             </el-button>
-            <el-button
-                v-yes-com:[exportClick] color="#6CC2FF" yes-com-text="确定导出用户数据?"
-                :loading="downloadLoading"
-            >
+            <el-button v-yes-com:[exportClick] color="#6CC2FF" yes-com-text="确定导出用户数据?" :loading="downloadLoading">
                 <hc-icon class="text-white" name="download" />
                 <hc-icon class="text-white" name="download" />
                 <span class="text-white">导出</span>
                 <span class="text-white">导出</span>
             </el-button>
             </el-button>
         </template>
         </template>
         <hc-table
         <hc-table
-            :column="tableColumn" :datas="tableData" class="user-page-table" is-check :loading="tableLoading"
-            @selection-change="tableSelectionChange"
+            :column="tableColumn" :datas="tableData" class="user-page-table" :loading="tableLoading"
+            is-check @selection-change="tableSelectionChange"
         >
         >
             <template #action="{ row }">
             <template #action="{ row }">
                 <el-link type="success" @click="rowEditClick(row)">
                 <el-link type="success" @click="rowEditClick(row)">
                     <hc-icon name="edit" />
                     <hc-icon name="edit" />
-                    编辑
+                    <span>编辑</span>
                 </el-link>
                 </el-link>
                 <el-link type="success" @click="rowDelClick(row)">
                 <el-link type="success" @click="rowDelClick(row)">
                     <hc-icon name="delete-bin-2" />
                     <hc-icon name="delete-bin-2" />
-                    删除
+                    <span>删除</span>
                 </el-link>
                 </el-link>
             </template>
             </template>
         </hc-table>
         </hc-table>
@@ -70,15 +61,9 @@
                         <el-input v-model="baseForm.realName" clearable placeholder="请输入" />
                         <el-input v-model="baseForm.realName" clearable placeholder="请输入" />
                     </el-form-item>
                     </el-form-item>
                     <el-form-item label="角色:" prop="roleId">
                     <el-form-item label="角色:" prop="roleId">
-                        <!-- <el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" /> -->
                         <el-tree-select
                         <el-tree-select
-                            v-model="roleIdArr"
-                            :props="defaultProps"
-                            :data="roleOptions"
-                            multiple
-                            :render-after-expand="false"
-                            style="width: 100%"
-                            @change="changeRole"
+                            v-model="roleIdArr" :props="defaultProps" :data="roleOptions" multiple
+                            :render-after-expand="false" style="width: 100%" @change="changeRole"
                         />
                         />
                     </el-form-item>
                     </el-form-item>
                 </div>
                 </div>
@@ -164,7 +149,6 @@ const getTableData = async () => {
     } else {
     } else {
         tableData.value = []
         tableData.value = []
     }
     }
-
 }
 }
 //分页被点击
 //分页被点击
 const pageChange = ({ current, size }) => {
 const pageChange = ({ current, size }) => {
@@ -191,7 +175,6 @@ const batchDelClick = () => {
         await removeUser(ids)
         await removeUser(ids)
         resolve() //关闭弹窗的回调
         resolve() //关闭弹窗的回调
     })
     })
-
 }
 }
 const batchDelLoad = ref(false)
 const batchDelLoad = ref(false)
 const rowDelClick = (row) => {
 const rowDelClick = (row) => {
@@ -294,6 +277,7 @@ const addsaveClose = () => {
     addModal.value = false
     addModal.value = false
     addsaveLoading.value = false
     addsaveLoading.value = false
     baseForm.value = {}
     baseForm.value = {}
+    roleIdArr.value = []
 }
 }
 
 
 const roleOptions = ref([])
 const roleOptions = ref([])
@@ -309,7 +293,5 @@ const getRoleOptions = async () => {
     } else {
     } else {
         roleOptions.value = []
         roleOptions.value = []
     }
     }
-
-
 }
 }
 </script>
 </script>