diff --git a/src/api/system/user.js b/src/api/system/user.js
index c7b67a2..ddf7f9e 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -10,6 +10,22 @@ export function listUser(query) {
   })
 }
 
+export function selectUserAgencyleft(query) {
+  return request({
+    url: '/system/user/selectUserAgency',
+    method: 'get',
+    params: query
+  
+  })
+}
+export function selectUserAgency(userName) {
+  return request({
+    url: `/system/user/selectUserBelongAgency?userName=${userName}`,
+    method: 'get',
+  
+  })
+}
+// /system/user/selectUserAgency 这个是右边的接口，传值不变
 // 查询用户详细
 export function getUser(userId) {
   return request({
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a9ed055..d52d3aa 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -25,225 +25,412 @@
             @node-click="handleNodeClick"
           />
         </div>
-      </el-col>
+      </el-col> -->
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-select
-              v-model="queryParams.status"
-              placeholder="用户状态"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
+      <!-- <el-col :span="20" :xs="24"> -->
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="用户名称" prop="userName">
+          <el-input
+            v-model="queryParams.userName"
+            placeholder="请输入用户名称"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="手机号码" prop="phonenumber">
+          <el-input
+            v-model="queryParams.phonenumber"
+            placeholder="请输入手机号码"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="queryParams.status"
+            placeholder="用户状态"
+            clearable
+            style="width: 240px"
           >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-option
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
 
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['system:user:add']"
+            >新增</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:user:edit']"
+            >修改</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:user:remove']"
+            >删除</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImport"
+            v-hasPermi="['system:user:import']"
+            >导入</el-button
+          >
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['system:user:export']"
+            >导出</el-button
+          >
+        </el-col>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+          :columns="columns"
+        ></right-toolbar>
+      </el-row>
+
+      <el-table
+        v-loading="loading"
+        :data="userList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="50" align="center" />
+        <!-- <el-table-column
+          label="用户编号"
+          align="center"
+          key="userId"
+          prop="userId"
+          v-if="columns[0].visible"
+        /> -->
+        <el-table-column
+          label="姓名"
+          align="center"
+          prop="nickName"
+          v-if="columns[1].visible"
+          :show-overflow-tooltip="true"
         />
-      </el-col>
+        <el-table-column
+          label="系统账号"
+          align="center"
+          prop="userName"
+          v-if="columns[1].visible"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="所属机构"
+          align="center"
+          prop="nickName"
+          v-if="columns[2].visible"
+          :show-overflow-tooltip="true"
+        />
+        <!-- <el-table-column
+          label="部门"
+          align="center"
+          key="deptName"
+          prop="dept.deptName"
+          v-if="columns[3].visible"
+          :show-overflow-tooltip="true"
+        /> -->
+        -->
+        <el-table-column
+          label="手机号码"
+          align="center"
+          key="phonenumber"
+          prop="phonenumber"
+          v-if="columns[4].visible"
+          width="120"
+        />
+        <el-table-column
+          label="账号状态"
+          align="center"
+          key="status"
+          v-if="columns[5].visible"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.status"
+              active-value="0"
+              inactive-value="1"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="创建时间"
+          align="center"
+          prop="createTime"
+          v-if="columns[6].visible"
+          width="160"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:user:edit']"
+              >修改</el-button
+            >
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleinnerVisibleshow(scope.row)"
+              v-hasPermi="['system:user:edit']"
+              >设置机构</el-button
+            >
+
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['system:user:remove']"
+              >删除</el-button
+            >
+            <el-dropdown
+              size="mini"
+              @command="(command) => handleCommand(command, scope.row)"
+              v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
+            >
+              <span class="el-dropdown-link">
+                <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item
+                  command="handleResetPwd"
+                  icon="el-icon-key"
+                  v-hasPermi="['system:user:resetPwd']"
+                  >重置密码</el-dropdown-item
+                >
+                <el-dropdown-item
+                  command="handleAuthRole"
+                  icon="el-icon-circle-check"
+                  v-hasPermi="['system:user:edit']"
+                  >分配角色</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <!-- </el-col> -->
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <div class="information">基本信息</div>
+        <div class="systemcontent">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="姓名" prop="nickName">
+                <el-input
+                  v-model="form.nickName"
+                  placeholder="请输入用户昵称"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="性别" prop="sex">
+                <el-select v-model="form.sex" placeholder="请选择性别">
+                  <el-option
+                    v-for="dict in dict.type.sys_user_sex"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="出生日期" prop="userBirthDate">
+                <el-date-picker
+                  clearable
+                  v-model="form.userBirthDate"
+                  type="date"
+                  style="width: 250px"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择出生日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="身份证号" prop="userCardNo">
+                <el-input
+                  v-model="form.userCardNo"
+                  placeholder="请输入身份证号"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="手机号码" prop="phonenumber">
+                <el-input
+                  v-model="form.phonenumber"
+                  placeholder="请输入手机号码"
+                  maxlength="11"
+                />
+              </el-form-item>
+            </el-col>
+
+            <!-- <el-col :span="12">
+              <el-form-item label="归属部门" prop="deptId">
+                <treeselect
+                  v-model="form.deptId"
+                  :options="deptOptions"
+                  :show-count="true"
+                  placeholder="请选择归属部门"
+                />
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+        </div>
+        <div class="information">账号信息</div>
+        <div class="systemcontent">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="系统账号" prop="userName">
+                <el-input
+                  v-model="form.userName"
+                  placeholder="请输入系统账号"
+                  maxlength="30"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="账号类型" prop="email">
+                <el-input
+                  v-model="form.email"
+                  placeholder="请输入邮箱"
+                  maxlength="50"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+          <!-- <el-col :span="12">
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户名称"
+              prop="userName"
+            >
+              <el-input
+                v-model="form.userName"
+                placeholder="请输入用户名称"
+                maxlength="30"
+              />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item
+              v-if="form.userId == undefined"
+              label="用户密码"
+              prop="password"
+            >
+              <el-input
+                v-model="form.password"
+                placeholder="请输入用户密码"
+                type="password"
+                maxlength="20"
+                show-password
+              />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
                 <el-option
@@ -254,36 +441,26 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
-            <el-form-item label="状态">
+            <el-form-item label="账号状态">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
                   :key="dict.value"
                   :label="dict.value"
-                >{{dict.label}}</el-radio>
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select
+                v-model="form.roleIds"
+                multiple
+                placeholder="请选择角色"
+              >
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -295,12 +472,36 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <!-- <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select
+                v-model="form.postIds"
+                multiple
+                placeholder="请选择岗位"
+              >
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
+        </el-row>
+        <el-row>
+          <!-- <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                placeholder="请输入内容"
+              ></el-input>
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -308,9 +509,167 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 设置机构 -->
+    <el-dialog :title="title" :visible.sync="innerVisibleshow" width="1200px">
+      <el-row :gutter="20">
+        <el-col :span="10">
+          <div class="table-title">
+            <span v-if="agencyNum">可设置机构:{{ agencyNum }}条</span>
+            <span v-else>可设置机构:0条</span>
+          </div>
+          <div style="margin-top: 3%">
+            <el-form
+              ref="queryForm"
+              :model="formmat"
+              :rules="rules"
+              label-width="80px"
+              :inline="true"
+            >
+              <el-form-item
+                label="机构名称"
+                prop="agencyName"
+                label-width="120"
+              >
+                <el-input
+                  v-model="formmat.agencyName"
+                  placeholder="请输入机构名称"
+                  clearable
+                />
+              </el-form-item>
+
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="info"
+                  >搜索</el-button
+                >
+                <el-button
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="addresetQuerylist"
+                  >重置</el-button
+                >
+              </el-form-item>
+            </el-form>
+          </div>
+          <!-- 穿梭框左边 -->
+          <el-table
+            ref="multipleTable"
+            :data="tableData1"
+            height="300"
+          
+            tooltip-effect="dark"
+            style="width: 100%"
+            @selection-change="handleSelectionChangen"
+            class="el-table-dialog"
+            row-key="id"
+          >
+            <el-table-column type="selection" width="55" align="center">
+            </el-table-column>
+            <!-- <el-table-column type="index" label="序号" align="center">
+            </el-table-column> -->
+
+            <el-table-column label="机构名称" align="center">
+              <template slot-scope="{ row }">
+                <span>{{ row.agencyName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="机构编码" align="center">
+              <template slot-scope="{ row }">
+                <span>{{ row.agencyCode }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="totalag > 0"
+            :total="totalag"
+            :page.sync="formmat.pageNum"
+            :limit.sync="formmat.pageSize"
+            @pagination="info"
+          />
+        </el-col>
+        <el-col :span="4" class="el-btn-dialog">
+          <el-button
+            @click="leftcontent"
+            type="primary"
+            :disabled="nowSelectRightData.length ? false : true"
+            icon="el-icon-arrow-left"
+            style="margin-left: 0; margin-top: 10px"
+          ></el-button>
+          <el-button
+            @click="rightcontent()"
+            type="primary"
+            :disabled="nowSelectData.length ? false : true"
+            icon="el-icon-arrow-right"
+          ></el-button>
+        </el-col>
+        <el-col :span="10">
+          <div class="table-title">
+            <span v-if="belongAgencyNum != ''"
+              >已设置机构:{{ belongAgencyNum }}条</span
+            >
+            <span v-else>已设置机构:0条</span>
+          </div>
+          <!-- 穿梭框右边 -->
+          <div style="margin-top: 5%">
+            <el-table
+              ref="multipleTables"
+              :data="tableData2"
+              max-height="300"
+              tooltip-effect="dark"
+              style="width: 100%"
+              @selection-change="handleSelectionChangenright"
+              row-key="id"
+              class="el-table-dialog"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+              ></el-table-column>
+              <!-- <el-table-column type="index" label="序号" align="center">
+              </el-table-column> -->
+
+              <el-table-column label="机构名称" align="center" width="110">
+                <template slot-scope="{ row }">
+                  <span>{{ row.agencyName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="机构编码" align="center">
+                <template slot-scope="{ row }">
+                  <span>{{ row.agencyCode }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-col>
+      </el-row>
+      <!-- <el-transfer
+    :titles="['可设置机构', '已设置机构']"
+    :format="{
+        noChecked: '${total}',
+        hasChecked: '${checked}/${total}'
+      }"
+    filterable
+    :filter-method="filterMethod"
+    filter-placeholder="请输入机构名称"
+    v-model="value"
+    @change="change"
+    @left-check-change="handleChange"
+    @right-check-change="rightchange"
+    :data="datalist">
+  </el-transfer> -->
+    </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
       <el-upload
         ref="upload"
         :limit="1"
@@ -327,10 +686,17 @@
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport" />
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -342,7 +708,17 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import {
+  listUser,
+  getUser,
+  delUser,
+  addUser,
+  updateUser,
+  resetUserPwd,
+  selectUserAgency,
+  changeUserStatus,
+  selectUserAgencyleft,
+} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -350,10 +726,26 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ["sys_normal_disable", "sys_user_sex"],
   components: { Treeselect },
   data() {
     return {
+      // 右边列表
+      formmat: {
+        pageNum: 1,
+        pageSize: 10,
+        agencyName: null,
+        userId: null,
+      },
+
+      totalag2: 0,
+      agencyNum: "",
+      belongAgencyNum: "",
+      tableData1: [],
+      tableData2: [],
+      nowSelectData: [], // 左边选中列表数据
+      nowSelectRightData: [], // 右边选中列表数据
+      innerVisibleshow: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -388,7 +780,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 用户导入参数
       upload: {
@@ -403,8 +795,9 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData",
       },
+      totalag: 0,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -412,7 +805,17 @@ export default {
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
-        deptId: undefined
+        deptId: undefined,
+      },
+      formlist: {
+        userId: "",
+        agencyId: "",
+        userName: "",
+      },
+      formlists: {
+        userId: "",
+        agencyId: "",
+        userName: "",
       },
       // 列信息
       columns: [
@@ -422,56 +825,133 @@ export default {
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
         { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 6, label: `创建时间`, visible: true },
       ],
+      userName: undefined,
       // 表单校验
       rules: {
         userName: [
           { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {
+            min: 2,
+            max: 20,
+            message: "用户名称长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
+            min: 5,
+            max: 20,
+            message: "用户密码长度必须介于 5 和 20 之间",
+            trigger: "blur",
+          },
         ],
         email: [
           {
             type: "email",
             message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
+            trigger: ["blur", "change"],
+          },
         ],
         phonenumber: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
     this.getTreeselect();
-    this.getConfigKey("sys.user.initPassword").then(response => {
+    this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
   },
   methods: {
+    // 左边选中事件
+    handleSelectionChangen(selection) {
+      console.log(selection, "56");
+      if (selection.length > 1) {
+        this.$refs.multipleTable.clearSelection(); // 清空所有选择
+        this.$refs.multipleTable.toggleRowSelection(selection.pop()); // 设置选择项
+      }
+      this.formlist.agencyId = selection[0].agencyId;
+      // this.formlist.agencyCode = selection[0].agencyCode;
+
+      // console.log(this.formlist.agencyId, "99999999");
+      this.nowSelectData = selection;
+      this.nowSelectRightData=[]
+    },
+    // 右边选中事件
+    handleSelectionChangenright(selection) {
+      console.log(selection, "56");
+      if (selection.length > 1) {
+        this.$refs.multipleTables.clearSelection(); // 清空所有选择
+        this.$refs.multipleTables.toggleRowSelection(selection.pop()); // 设置选择项
+      }
+      this.nowSelectRightData = selection;
+      this.nowSelectData=[]
+    },
+    addresetQuerylist() {
+      this.formmat.agencyName = "";
+      this.info();
+    },
+    // 点击去右边
+    rightcontent() {
+      console.log(this.tableData2, "78798");
+      if (this.tableData2.length == 1) {
+        this.$message.error("只能选择一个机构");
+      } else {
+        updateUser(this.formlist).then((response) => {
+          if (response.code == 200) {
+            this.info();
+            this.info2();
+          }
+        });
+      }
+    },
+    // 点击去左边
+    leftcontent() {
+      updateUser(this.formlists).then((response) => {
+        if (response.code == 200) {
+          this.info();
+          this.info2();
+        }
+      });
+    },
+    // 方法
+    handleRemoveTabList(isNeedArr, originalArr) {
+      if (isNeedArr.length && originalArr.length) {
+        for (let i = 0; i < isNeedArr.length; i++) {
+          for (let k = 0; k < originalArr.length; k++) {
+            // 注意，nickName为唯一值，如果不为唯一值那么会出错
+            if (isNeedArr[i]["id"] === originalArr[k]["id"]) {
+              console.log("-----------1111");
+              originalArr.splice(k, 1);
+            }
+          }
+        }
+      }
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
           this.userList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -480,7 +960,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      treeselect().then(response => {
+      treeselect().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -497,13 +977,17 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
+      this.$modal
+        .confirm('确认要"' + text + '""' + row.userName + '"用户吗？')
+        .then(function () {
+          return changeUserStatus(row.userId, row.status);
+        })
+        .then(() => {
+          this.$modal.msgSuccess(text + "成功");
+        })
+        .catch(function () {
+          row.status = row.status === "0" ? "1" : "0";
+        });
     },
     // 取消按钮
     cancel() {
@@ -520,11 +1004,13 @@ export default {
         password: undefined,
         phonenumber: undefined,
         email: undefined,
+        userCardNo: undefined,
+        userBirthDate: undefined,
         sex: undefined,
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
       };
       this.resetForm("form");
     },
@@ -541,7 +1027,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map((item) => item.userId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -562,7 +1048,7 @@ export default {
     handleAdd() {
       this.reset();
       this.getTreeselect();
-      getUser().then(response => {
+      getUser().then((response) => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
         this.open = true;
@@ -570,12 +1056,55 @@ export default {
         this.form.password = this.initPassword;
       });
     },
+    info() {
+      console.log(this.formmat);
+      selectUserAgencyleft(this.formmat).then((res) => {
+        // console.log(res)
+        if (res.rows.length > 0) {
+          this.tableData1 = res.rows;
+          this.agencyNum = res.rows[0].agencyNum;
+        }
+        this.totalag = res.total;
+      });
+    },
+    info2() {
+      selectUserAgency(this.userName).then((res) => {
+        // console.log(res);
+        // this.agencyNum = res.data.agencyNum;
+        if (res.rows.length > 0) {
+          this.tableData2 = res.rows;
+          this.belongAgencyNum = res.rows[0].agencyNum;
+        }
+      });
+    },
+    handleinnerVisibleshow(row) {
+      console.log(row);
+      this.title = "设置机构";
+      this.innerVisibleshow = true;
+      this.userName = row.userName;
+      this.formlist.userId = row.userId;
+      this.formlist.userName = row.userName;
+
+      this.formlists.userId = row.userId;
+      this.formlists.userName = row.userName;
+      this.formmat.userName = row.userName;
+      console.log(this.formmat.userId, "898");
+      this.info();
+
+      this.info2();
+      // selectUserAgency(this.userName).then((res) => {
+      //   console.log(res);
+      //   this.tableData1 = res.data.agencyList;
+      //   this.agencyNum = res.data.agencyNum;
+      //   this.belongAgencyNum = res.data.belongAgencyNum;
+      // });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
       const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
+      getUser(userId).then((response) => {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -593,30 +1122,32 @@ export default {
         cancelButtonText: "取消",
         closeOnClickModal: false,
         inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.userId, value).then((response) => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        }).catch(() => {});
+        })
+        .catch(() => {});
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            addUser(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -628,18 +1159,26 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+        .then(function () {
+          return delUser(userIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/user/export",
+        {
+          ...this.queryParams,
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -648,8 +1187,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      this.download(
+        "system/user/importTemplate",
+        {},
+        `user_template_${new Date().getTime()}.xlsx`
+      );
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -660,13 +1202,42 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
-    }
-  }
+    },
+  },
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="scss">
+.information {
+  border-left: 3px solid #4d9de7;
+  width: 85px;
+  height: 24px;
+  font-size: 18px;
+  color: black;
+  padding-left: 10px;
+}
+.systemcontent {
+  margin: 20px 0 0 0;
+  // width: 200px;
+  // height: 100px;
+  // background: red;
+}
+.el-table__header-wrapper .el-table__header .el-checkbox {
+  display: none;
+}
+.table-title {
+  font-size: 17px;
+  color: black;
+}
+</style>
\ No newline at end of file