zc

src/api/commonality/permission.js

@@ -242,14 +242,15 @@ export function systemUserResetPasswd(data) {
 }
 
 
-/*                自定义用户查询
-* userType        0.系统用户 1.教职工 2.学生  (必传)
-* userName        用户名
-* mobile          手机号
-* cardNum         卡号
-* account         账号
-* userIds         用户IDS
-* pageSize        不传默认返回10条
+/*                      自定义用户查询
+* userType              0.系统用户 1.教职工 2.学生  (必传)
+* userName              用户名
+* mobile                手机号
+* cardNum               卡号
+* account               账号
+* userIds               指定用户IDS
+* selectedUserIds       过滤用户IDS
+* pageSize              不传默认返回10条
 */
 export function systemUserSelect(data) {
   return request({

src/api/integratedManagement/index.js

@@ -513,6 +513,7 @@ export function systemTopicDetail(query) {
     params: query
   })
 }
+
 //课题组-删除
 export function systemTopicTopicDel(data) {
   return request({
@@ -521,6 +522,7 @@ export function systemTopicTopicDel(data) {
     data: data
   })
 }
+
 //课题组-启用/停用
 export function systemTopicEditTopicStart(data) {
   return request({
@@ -529,3 +531,21 @@ export function systemTopicEditTopicStart(data) {
     data: data
   })
 }
+
+//课题组-查询成员
+export function systemTopicMemberList(data) {
+  return request({
+    url: '/system/topic/memberList',
+    method: 'post',
+    data: data
+  })
+}
+
+//课题组成员-启用/停用
+export function systemTopicEditMemberStart(data) {
+  return request({
+    url: '/system/topic/editMemberStart',
+    method: 'post',
+    data: data
+  })
+}

src/views/integratedManagement/personnelManage/researchGroupManage/addPage.vue

@@ -3,6 +3,7 @@
     <div class="page-top-title-box">
       <p class="page-top-title-name-p">{{addForm.id?'编辑课题组':'新增课题组'}}</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-add-p" @click="submitForm">提交</p>
     </div>
     <div class="content-box scrollbar-box">
       <el-form class="add-form-box" :model="addForm" ref="form" :rules="rules" label-width="160px">
@@ -30,6 +31,7 @@
               filterable
               remote
               reserve-keyword
+              @change="userChange"
               placeholder="搜索选择课题负责人"
               :remote-method="userSelectList">
               <el-option
@@ -58,12 +60,12 @@
           >+  添加成员</p>
         </div>
         <div class="page-content-box">
-          <el-table class="table-box" border :data="dataList">
-            <el-table-column label="序号" prop="name"  show-overflow-tooltip/>
-            <el-table-column label="姓名" prop="content" width="180" show-overflow-tooltip/>
-            <el-table-column label="联系电话" prop="content" width="230" show-overflow-tooltip/>
-            <el-table-column label="所属部门" prop="content" width="470" show-overflow-tooltip/>
-            <el-table-column label="状态" prop="state" width="200" show-overflow-tooltip>
+          <el-table class="table-box" border :data="addForm.memberList">
+            <el-table-column label="序号" prop="name" width="50" type="index" show-overflow-tooltip/>
+            <el-table-column label="姓名" prop="userName" show-overflow-tooltip/>
+            <el-table-column label="联系电话" prop="userPhone" width="230" show-overflow-tooltip/>
+            <el-table-column label="所属部门" prop="deptName" width="470" show-overflow-tooltip/>
+            <el-table-column label="状态" prop="isStart" width="200" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-switch
                   class="switch captcha-img"
@@ -71,7 +73,7 @@
                   :inactive-value="false"
                   active-color="#0183FA"
                   inactive-color="#999"
-                  v-model="scope.row.state"
+                  v-model="scope.row.isStart"
                   active-text="启用"
                   inactive-text="停用"
                 ></el-switch>
@@ -89,22 +91,17 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination :page-sizes="[20, 30, 40, 50]"
-                      v-show="total>0"
-                      :total="total"
-                      :page.sync="queryParams.page"
-                      :limit.sync="queryParams.pageSize"
-                      @pagination="getList"
-          />
+          <!--<pagination :page-sizes="[20, 30, 40, 50]"-->
+                      <!--v-show="total>0"-->
+                      <!--:total="total"-->
+                      <!--:page.sync="queryParams.page"-->
+                      <!--:limit.sync="queryParams.pageSize"-->
+                      <!--@pagination="getList"-->
+          <!--/>-->
         </div>
       </el-form>
     </div>
-    <div class="page-bottom-button-box">
-      <p class="page-bottom-button-null-p"></p>
-      <p class="page-bottom-button-submit-p" @click="submitForm">提交</p>
-      <p class="page-bottom-button-null-p"></p>
-    </div>
-    <user-dialog ref="userDialog"></user-dialog>
+    <user-dialog :addDialogData="addDialogData" ref="userDialog"></user-dialog>
   </div>
 </template>
 
@@ -113,7 +110,7 @@
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
 
-  import { systemTopicDetail } from "@/api/integratedManagement/index";
+  import { systemTopicDetail,systemTopicAdd,systemTopicEdit } from "@/api/integratedManagement/index";
   import { systemUserSelectUser } from "@/api/commonality/permission";
   import userDialog from "./userDialog.vue";
   export default {
@@ -126,9 +123,17 @@
     },
     data(){
       return{
-        showType:false,
         optionsUser:[],
-        addForm:{},
+        addForm:{
+          topicName:'',
+          isStart:'',
+          userId:'',
+          userName:'',
+          userPhone:'',
+          deptName:'',
+          deptId:'',
+          memberList:[]
+        },
         rules:{
           topicName: [
             { required: true, message: "请输入课题名称", trigger: "blur" },
@@ -149,10 +154,12 @@
           pageSize:20,
         },
         //列表数据
-        dataList:[{}],
+        dataList:[],
         //数据数量
         total:0,
         maxUserNum:999,
+        //子组件传参
+        addDialogData:{},
       }
     },
     created(){
@@ -179,18 +186,18 @@
           this.userSelectList(obj.userName);
           this.$set(this,'addForm',obj);
         });
-      },
-      getList(){
-
       },
       //操作按钮
-      tableButton(type,row){
+      tableButton(type){
         let self = this;
         if(type == 1){
           //新增
+          let list = [];
+          for(let i=0;i<self.addForm.memberList.length;i++){
+            list.push(self.addForm.memberList[i].userId);
+          }
+          this.$set(this.addDialogData,'userList',list);
           this.$refs['userDialog'].userDialogOpen();
-        }else if(type == 2){
-          //启用停用
         }else if(type == 3){
           //删除
         }
@@ -199,10 +206,36 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-
+            if(!this.addForm.memberList[0]){
+              this.msgError('请添加课题组成员')
+              return
+            }
+            if(this.propsData.id){
+              systemTopicEdit(this.addForm).then(response => {
+                this.msgSuccess(response.message)
+                this.backPage();
+              });
+            }else{
+              systemTopicAdd(this.addForm).then(response => {
+                this.msgSuccess(response.message)
+                this.backPage();
+              });
+            }
           }
         })
       },
+      //人员选择
+      userChange(val){
+        let self = this;
+        for(let i=0;i<self.optionsUser.length;i++){
+          if(val == self.optionsUser[i].userId){
+            this.$set(this.addForm,'userId',self.optionsUser[i].userId);
+            this.$set(this.addForm,'userName',self.optionsUser[i].userName);
+            this.$set(this.addForm,'deptId',self.optionsUser[i].deptId);
+            this.$set(this.addForm,'deptName',self.optionsUser[i].deptName);
+          }
+        }
+      },
       //人员查询
       userSelectList(query) {
         if (query !== '' && query.length>1) {

src/views/integratedManagement/personnelManage/researchGroupManage/index.vue

@@ -109,7 +109,7 @@
   </div>
 </template>
 <script>
-  import { systemTopicList,systemTopicAdd,systemTopicEdit,systemTopicTopicDel,systemTopicEditTopicStart } from "@/api/integratedManagement/index";
+  import { systemTopicList,systemTopicAdd,systemTopicTopicDel,systemTopicEditTopicStart } from "@/api/integratedManagement/index";
   import { getDeptDropList } from "@/api/commonality/permission";
   import importComponent from "@/components/importComponent/importComponent.vue";
   import addPage from "./addPage.vue";
@@ -197,10 +197,9 @@
           this.$set(this,'propsData',{});
         }else if(type == 2){
           //成员列表
-          this.$set(this,'pageType',3);
           let obj = JSON.parse(JSON.stringify(row))
-          obj.showType = true;
           this.$set(this,'propsData',obj);
+          this.$set(this,'pageType',3);
         }else if(type == 3){
           //编辑
           let obj = JSON.parse(JSON.stringify(row))
@@ -221,7 +220,7 @@
           }).catch(() => {});
         }else if(type == 5){
           //启用&停用
-          let text = row.state  ? "停用" : "启用";
+          let text = row.isStart  ? "停用" : "启用";
           this.$confirm('是否确认' + text + '?', "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

src/views/integratedManagement/personnelManage/researchGroupManage/listPage.vue

@@ -2,27 +2,27 @@
   <div class="page-container researchGroupManage-listPage">
     <div class="researchGroupManage-listPage-min" v-if="pageType == 1">
       <div class="page-top-title-box">
-        <p class="page-top-title-name-p">{{newData.researchGroupName}}</p>
+        <p class="page-top-title-name-p">{{propsData.topicName}}</p>
         <p class="page-top-title-out-p" @click="backPage">返回</p>
       </div>
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="" prop="queryParamsData0">
+          <el-form-item label="" prop="userType">
             <div class="user-table-box">
-              <p :class="queryParams.queryParamsData0 == 1 ? 'check-table' : ''" @click="tableTitleButton(1)">
+              <p :class="queryParams.userType == '' ? 'check-table' : ''" @click="tableTitleButton('')">
                 全部
               </p>
-              <p :class="queryParams.queryParamsData0 == 2 ? 'check-table' : ''" @click="tableTitleButton(2)">
+              <p :class="queryParams.userType == 1 ? 'check-table' : ''" @click="tableTitleButton(1)">
                 教职工
               </p>
-              <p :class="queryParams.queryParamsData0 == 3 ? 'check-table' : ''" @click="tableTitleButton(3)">
+              <p :class="queryParams.userType == 2 ? 'check-table' : ''" @click="tableTitleButton(2)">
                 学生
               </p>
             </div>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2" placeholder="请选择状态" style="width: 200px">
+          <el-form-item label="" prop="isStart">
+            <el-select v-model="queryParams.isStart" placeholder="请选择状态" style="width: 200px">
               <el-option
                 v-for="dict in optionList"
                 :key="dict.value"
@@ -31,36 +31,38 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData3">
-            <el-select v-model="queryParams.queryParamsData3" placeholder="请选择部门" style="width: 200px">
+          <el-form-item label="" prop="deptId">
+            <el-select v-model="queryParams.deptId" placeholder="请选择部门" style="width: 200px">
               <el-option
                 v-for="dict in sectionOptionList"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" prop="queryParamsData1">
+          <el-form-item label="" prop="searchValue">
             <el-input
               maxLength="30"
-              v-model="queryParams.queryParamsData1"
+              v-model="queryParams.searchValue"
               placeholder="姓名/工号/学号"
               style="width: 200px"
             />
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-          <p style="float: right;line-height:40px;font-size:16px;color:#0045AF;">成员数:{{newData.userNun}}</p>
+          <p style="float: right;line-height:40px;font-size:16px;color:#0045AF;margin-right:10px;">成员数：{{total}}</p>
         </el-form>
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
-          <el-table-column label="姓名" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="身份" prop="content" width="250" show-overflow-tooltip/>
-          <el-table-column label="手机号码" prop="content" width="300" show-overflow-tooltip/>
-          <el-table-column label="所属部门" prop="content" width="250" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="state" width="200" show-overflow-tooltip>
+          <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
+          <el-table-column label="身份" prop="userType" width="250" show-overflow-tooltip>
+            <template slot-scope="scope">{{scope.row.userType == 1?'老师':'学生'}}</template>
+          </el-table-column>
+          <el-table-column label="手机号码" prop="userPhone" width="300" show-overflow-tooltip/>
+          <el-table-column label="所属部门" prop="deptName" width="250" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="isStart" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-switch
                 @click.native="tableButton(2,scope.row)"
@@ -69,7 +71,7 @@
                 :inactive-value="false"
                 active-color="#0183FA"
                 inactive-color="#999"
-                v-model="scope.row.state"
+                v-model="scope.row.isStart"
                 active-text="启用"
                 inactive-text="停用"
                 disabled
@@ -103,6 +105,8 @@
 </template>
 
 <script>
+  import { systemTopicMemberList,systemTopicEditMemberStart } from "@/api/integratedManagement/index";
+  import { getDeptDropList } from "@/api/commonality/permission";
   //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
@@ -117,41 +121,42 @@
     },
     data(){
       return{
+        //页面遮罩
+        loading:false,
         tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         pageType:1,
         //状态
         optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
         //部门列表
         sectionOptionList:[],
-        newData:{
-          researchGroupName:"课题组名称等待传参",
-          userNun:"999"
-        },
         //查询条件
         queryParams:{
           page:1,
           pageSize:20,
-          queryParamsData0:1,
-          queryParamsData1:"",
-          queryParamsData2 :null,
-          queryParamsData3 :null,
+          userType:'',
+          isStart :null,
+          deptId :null,
+          searchValue:"",
         },
         //列表数据
-        dataList:[{}],
+        dataList:[],
         //数据数量
         total:0,
       }
     },
     created(){
-      this.initialize();
+
     },
     mounted(){
-
+      this.getDeptDropList();
+      this.getList();
     },
     methods:{
+      //切换状态
       tableTitleButton(type){
-        if (this.queryParams.queryParamsData0 != type){
-          this.$set(this.queryParams,'queryParamsData0',type);
+        if (this.queryParams.userType != type){
+          this.$set(this.queryParams,'userType',type);
+          this.getList();
         }
       },
       tableButton(type,row){
@@ -161,14 +166,14 @@
           this.$set(this,'pageType',2);
         }else if(type == 2){
           //启用&停用
-          let text = row.state  ? "停用" : "启用";
+          let text = row.isStart  ? "停用" : "启用";
           this.$confirm('是否确认' + text + '?', "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
           }).then(function() {
           }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
+            systemTopicEditMemberStart({id:row.id,isStart:!row.isStart,}).then(response => {
               self.msgSuccess(response.message)
               self.getList();
             });
@@ -191,19 +196,29 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          queryParamsData1:"",
-          queryParamsData2 :null,
+          userType:'',
+          isStart :null,
+          deptId :null,
+          searchValue:"",
         });
         this.getList();
       },
       //获取数据列表
       getList(){
-        // this.$set(this,'loading',true);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'loading',false);
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        obj.topicId = this.propsData.id
+        systemTopicMemberList(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //获取二级单位列表
+      getDeptDropList(){
+        getDeptDropList({level:2 }).then(response => {
+          this.$set(this,'sectionOptionList',response.data);
+        });
       },
     },
   }

src/views/integratedManagement/personnelManage/researchGroupManage/userDialog.vue

@@ -13,26 +13,26 @@
           <div class="page-form-title-box">
             <el-form :model="leftQueryParams" class="form-box" ref="queryForm"
                      :inline="true" style="width:100%;">
-              <el-form-item label="" prop="queryParamsData1">
+              <el-form-item label="" prop="searchValue">
                 <el-input
                   maxLength="30"
-                  v-model="leftQueryParams.queryParamsData1"
-                  placeholder="搜索姓名/学号/手机号/实验室"
+                  v-model="leftQueryParams.searchValue"
+                  placeholder="搜索姓名/学号/手机号"
                   style="width: 220px"
                 />
               </el-form-item>
-              <el-form-item label="" prop="queryParamsData3">
-                <el-select v-model="leftQueryParams.queryParamsData2" placeholder="部门" style="width: 140px">
+              <el-form-item label="" prop="deptId">
+                <el-select v-model="leftQueryParams.deptId" placeholder="部门" style="width: 140px">
                   <el-option
                     v-for="dict in sectionOptionList"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                    :key="dict.deptId"
+                    :label="dict.deptName"
+                    :value="dict.deptId"
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="" prop="queryParamsData3">
-                <el-select v-model="leftQueryParams.queryParamsData3" placeholder="类型" style="width: 100px">
+              <el-form-item label="" prop="userType">
+                <el-select v-model="leftQueryParams.userType" placeholder="类型" style="width: 100px">
                   <el-option
                     v-for="dict in classOptionList"
                     :key="dict.value"
@@ -48,9 +48,9 @@
           <div class="page-content-box">
             <el-table class="table-box" border :data="leftDataList" @selection-change="userChangeLeft" :row-key="getRowKeys">
               <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-              <el-table-column label="姓名" prop="name"  show-overflow-tooltip/>
-              <el-table-column label="联系电话" prop="phone" width="150" show-overflow-tooltip/>
-              <el-table-column label="所在部门" prop="section" width="220" show-overflow-tooltip/>
+              <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
+              <el-table-column label="联系电话" prop="mobile" width="150" show-overflow-tooltip/>
+              <el-table-column label="所在部门" prop="deptName" width="220" show-overflow-tooltip/>
             </el-table>
             <pagination :page-sizes="[10, 20]"
                         v-show="leftTotal>0"
@@ -63,38 +63,38 @@
         </div>
       </div>
       <div class="user-dialog-max-center-box">
-        <p class="el-icon-arrow-right"></p>
-        <p class="el-icon-arrow-left"></p>
+        <p class="el-icon-arrow-right" @click="userAdd"></p>
+        <p class="el-icon-arrow-left" @click="userDel"></p>
       </div>
       <div class="user-dialog-max-right-box">
         <div class="title-top-box">
           <p>待选人员</p>
-          <p>{{rightCheckNum}}/{{rightMaxUserNum}}</p>
+          <p>{{rightCheckNum}}/{{userList.length}}</p>
         </div>
         <div class="table-max-big-box">
           <div class="page-form-title-box">
             <el-form :model="rightQueryParams" class="form-box" ref="queryForm"
                      :inline="true" style="width:100%;">
-              <el-form-item label="" prop="queryParamsData1">
+              <el-form-item label="" prop="searchValue">
                 <el-input
                   maxLength="30"
-                  v-model="rightQueryParams.queryParamsData1"
-                  placeholder="搜索姓名/学号/手机号/实验室"
+                  v-model="rightQueryParams.searchValue"
+                  placeholder="搜索姓名/学号/手机号"
                   style="width: 220px"
                 />
               </el-form-item>
-              <el-form-item label="" prop="queryParamsData3">
-                <el-select v-model="rightQueryParams.queryParamsData2" placeholder="部门" style="width: 140px">
+              <el-form-item label="" prop="deptId">
+                <el-select v-model="rightQueryParams.deptId" placeholder="部门" style="width: 140px">
                   <el-option
                     v-for="dict in sectionOptionList"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
+                    :key="dict.deptId"
+                    :label="dict.deptName"
+                    :value="dict.deptId"
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="" prop="queryParamsData3">
-                <el-select v-model="rightQueryParams.queryParamsData3" placeholder="类型" style="width: 100px">
+              <el-form-item label="" prop="userType">
+                <el-select v-model="rightQueryParams.userType" placeholder="类型" style="width: 100px">
                   <el-option
                     v-for="dict in classOptionList"
                     :key="dict.value"
@@ -110,9 +110,9 @@
           <div class="page-content-box">
             <el-table class="table-box" border :data="rightDataList" @selection-change="userChangeRight" :row-key="getRowKeys">
               <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
-              <el-table-column label="姓名" prop="name"  show-overflow-tooltip/>
-              <el-table-column label="联系电话" prop="phone" width="150" show-overflow-tooltip/>
-              <el-table-column label="所在部门" prop="section" width="220" show-overflow-tooltip/>
+              <el-table-column label="姓名" prop="userName"  show-overflow-tooltip/>
+              <el-table-column label="联系电话" prop="mobile" width="150" show-overflow-tooltip/>
+              <el-table-column label="所在部门" prop="deptName" width="220" show-overflow-tooltip/>
             </el-table>
             <pagination :page-sizes="[10, 20]"
                         v-show="rightTotal>0"
@@ -135,7 +135,7 @@
 </template>
 
 <script>
-
+  import { systemUserSelect,getDeptDropList } from "@/api/commonality/permission";
   export default {
     name: 'addDialog',
     props:{
@@ -144,18 +144,19 @@
     data(){
       return{
         userDialogType:false,
+        userList:[],
         //左侧数据
         leftQueryParams:{
           page:1,
           pageSize:20,
-          leftQueryParamsData1:null,
-          leftQueryParamsData2:null,
-          leftQueryParamsData3:null,
+          searchValue:'',
+          deptId:'',
+          userType:'',
         },
         leftDataList:[
           {userId:'1',name:'名称',phone:'电话',section:'部门1'}
         ],
-        leftTotal:10,
+        leftTotal:0,
         leftCheckNum:0,
         leftMaxUserNum:0,
         leftCheckUserIds:[],
@@ -163,14 +164,14 @@
         rightQueryParams:{
           page:1,
           pageSize:20,
-          rightQueryParamsData1:null,
-          rightQueryParamsData2:null,
-          rightQueryParamsData3:null,
+          searchValue:'',
+          deptId:'',
+          userType:'',
         },
         rightDataList:[
           {userId:'12',name:'名称',phone:'电话',section:'部门1'}
         ],
-        rightTotal:10,
+        rightTotal:0,
         rightCheckNum:0,
         rightMaxUserNum:0,
         rightCheckUserIds:[],
@@ -192,8 +193,26 @@
 
     },
     methods:{
+      //获取二级单位列表
+      getDeptDropList(){
+        getDeptDropList({level:2 }).then(response => {
+          this.$set(this,'sectionOptionList',response.data);
+        });
+      },
+      //新增用户
+      userAdd(){
+        this.userList.push()
+      },
+      //删除用户
+      userDel(){
+
+      },
       //开启
       userDialogOpen(){
+        this.getDeptDropList();
+        this.$set(this,'userList',this.addDialogData.userList);
+        this.leftGetList();
+        this.rightGetList();
         this.$set(this,'userDialogType',true);
       },
       //关闭
@@ -206,13 +225,26 @@
       },
       //左侧查询相关
       leftHandleQuery(){
-
+        this.$set(this.leftQueryParams,'page',1);
+        this.leftGetList();
       },
       leftResetQuery(){
-
+        this.$set(this,'leftQueryParams',{
+          page:1,
+          pageSize:20,
+          searchValue:null,
+          deptId:null,
+          userType:null,
+        });
+        this.leftGetList();
       },
       leftGetList(){
-
+        let obj = JSON.parse(JSON.stringify(this.leftQueryParams))
+        obj.excludeUserIds = this.userList;
+        systemUserSelect(obj).then(response => {
+          this.$set(this,'leftDataList',response.data);
+          // this.$set(this,'leftTotal',response.data.total);
+        });
       },
       userChangeLeft(selection){
         this.leftCheckNum = selection.length;
@@ -220,13 +252,26 @@
       },
       //右侧查询相关
       rightHandleQuery(){
-
+        this.$set(this.rightQueryParams,'page',1);
+        this.rightGetList();
       },
       rightResetQuery(){
-
+        this.$set(this,'rightQueryParams',{
+          page:1,
+          pageSize:20,
+          searchValue:null,
+          deptId:null,
+          userType:null,
+        });
+        this.rightGetList();
       },
       rightGetList(){
-
+        let obj = JSON.parse(JSON.stringify(this.rightQueryParams))
+        obj.userIds = this.userList;
+        systemUserSelect(obj).then(response => {
+          this.$set(this,'rightDataList',response.data);
+          // this.$set(this,'rightTotal',response.data.total);
+        });
       },
       userChangeRight(selection){
         this.rightCheckNum = selection.length;
@@ -273,6 +318,7 @@
           flex-direction: column;
           flex:1;
           border:1px solid #E0E0E0;
+          overflow: hidden;
         }
       }
       .user-dialog-max-center-box{
@@ -319,6 +365,7 @@
           flex-direction: column;
           flex:1;
           border:1px solid #E0E0E0;
+          overflow: hidden;
         }
       }
     }