--no commit message

@@ -289,7 +289,7 @@ export default {
         this.organizationId = ''
         this.organizationId = ''
         this.departmentId = ''
         this.departmentId = ''
       } else {
       } else {
-        this.organizationId = "408dee75-bde5-45cc-80af-62d260bff8d5"
+        this.organizationId = res.organizationId
         this.departmentId = res.departmentId
         this.departmentId = res.departmentId
         this.getTableList()
         this.getTableList()
         this.getDepartData()
         this.getDepartData()
@@ -485,15 +485,27 @@ export default {
       if (data instanceof Array) {
       if (data instanceof Array) {
         data.forEach((item) => {
         data.forEach((item) => {
           ids.push(item.id)
           ids.push(item.id)
-            })
-            .catch((error) => {
-              this.$alert(error, '提示', {
-                confirmButtonText: '确定',
-                type: 'error'
-              })
-            })
->>>>>>> 72755be14f820497c6cffdc8c8f469f26c98ba3f
-     {
+        })
+      } else {
+        ids.push(data)
+      }
+      console.log(ids, 'ids')
+      if (ids.length === 0) {
+        this.$message({
+          message: '请选择需要重置密码的用户!',
+          showClose: true
+        })
+        return
+      }
+      this.$confirm(
+        `<div  class="customer-message-wrapper">
+              <h5 class="title">确定要重置密码吗</h5>
+               <p class="result">执行后，数据将
+                 <span >无法恢复</span>
+                </p>
+        </div>`,
+        '执行确认',
+        {
           dangerouslyUseHTMLString: true,
           dangerouslyUseHTMLString: true,
           customClass: 'customer-delete',
           customClass: 'customer-delete',
           confirmButtonText: '确定',
           confirmButtonText: '确定',
@@ -521,9 +533,56 @@ export default {
       this.$refs.leadingIn.import(this.tableUrl, '人员')
       this.$refs.leadingIn.import(this.tableUrl, '人员')
     }
     }
   }
   }
-};
+}
 </script>
 </script>
-<style scoped lang="scss">
-@import "~@/styles/mixin.scss";
-@import "~@/styles/public.scss";
-</style>
+
+<style scoped lang="less">
+.content {
+  .top-wrapper {
+    .el-button + .el-button {
+      margin-left: 16px;
+    }
+    .top-wrapper-search {
+      display: inline-block;
+      margin-left: 16px;
+      ::v-deep .el-input,
+      ::v-deep .el-input__inner {
+        height: 32px;
+      }
+      .select {
+        width: 120px;
+        vertical-align: middle;
+      }
+      .selectName {
+        width: 178px;
+        margin: 0 16px;
+        vertical-align: middle;
+        ::v-deep .el-input-group__append {
+          background: #e0eeff;
+          color: #3aa3f8 !important;
+          padding-right: 12px;
+          border-radius: 0;
+          .el-button {
+            padding: 8px 8px;
+          }
+        }
+      }
+    }
+  }
+  .vxe-table {
+    ::v-deep .vxe-body--row {
+      .vxe-body--column:nth-child(3) {
+        text-align: left;
+      }
+      .svg-icon {
+        width: 1.5em;
+        height: 1.5em;
+        vertical-align: middle;
+        margin-left: 5px;
+      }
+    }
+  }
+
+}
+
+