社区学生

src/api/user.js

@@ -56,7 +56,7 @@ export function updateinst(data) {
 }
 // 查询组织高人员
 export function getAddcyPersonlist(data) {
-  return axios.get(`${baseApi}getAddcyPersonlist`, data)
+  return axios.get(`${baseApi}getAddcyPersonlist2`, data)
 }
 // 查询社区
 export function getcylist(data) {

src/components/organList.vue

@@ -297,10 +297,11 @@
             :before-close="handleClose2">
             <div class="cyConTit">
                 <div>人员列表</div>
-                <el-button type="primary" size="mini" @click="getTeacher">添加人员</el-button>
+                <el-button type="primary" size="mini" @click="getTeacher(addCyperType)">添加人员</el-button>
             </div>
              <el-table
                 :data="cypersontableData"
+                height="600"
                 style="width: 100%" v-loading="cypersonloading">
                 <el-table-column
                     prop="name"
@@ -428,66 +429,72 @@
             :before-close="handleClose"
             class="addNewPP customWidth"
             >
-            <div class="people">
-            <div class="people_top">
-            <div class="people_top_right">
-                <div class="people_search">
-                <el-input
-                    placeholder="搜索成员名称"
-                    v-model="searchTN"
-                    @keyup.enter.native="getTeacher"
-                ></el-input>
-                <div class="search_img" @click="getTeacher">
-                    <img src="../assets/search.png" alt />
-                </div>
-                </div>
-            </div>
-            <div class="people_nav" style="display: flex; align-items: center">
-                <div class="check_class_left_title">选择成员</div>
-                <div style="display: flex; align-items: center; margin-left: auto">
-                <el-checkbox
-                    v-model="checkAll"
-                    @change="handleCheckAllChange2"
-                    class="all_check"
-                    >全选</el-checkbox
-                >
-                </div>
-            </div>
-            </div>
-            <div class="t_j_box" style="padding: 15px 10px 0;box-sizing: border-box;">
-                <div>姓名</div>
-                <div>账号</div>
-                <div>学校</div>
-            </div>
-            <el-checkbox-group
-                v-model="checkboxList3"
-                class="people_name"
-                @change="handleCheckedCitiesChange"
-                v-if="teacherJuri.length"
-                >
-                <el-checkbox
-                    v-for="item in teacherJuri"
-                    :key="item.userid"
-                    :label="item.userid"
-                >
-                    <div class="t_j_box">
-                        <el-tooltip
-                            placement="top"
-                            :content="item.name ? item.name : '暂无姓名'"
-                        >
-                            <div>{{ item.name ? item.name : "暂无姓名" }}</div>
-                        </el-tooltip>
-                        <el-tooltip placement="top" :content="item.accountNumber.split('@')[0]">
-                            <div>{{ item.accountNumber.split('@')[0] }}</div>
-                        </el-tooltip>
-                        <el-tooltip placement="top" :content="item.organizationname">
-                            <div>{{ item.organizationname }}</div>
-                        </el-tooltip>
-                    </div>
-                </el-checkbox>
-            </el-checkbox-group>
-            <div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
-        </div>
+            <div class="cypersonBox">
+				<div class="cypersonBoxLeft">
+					<span @click="getTeacher(1)" :class="addCyperType == 1 ? 'cybck' : '' ">教师</span>
+					<span @click="getTeacher(2)" :class="addCyperType == 2 ? 'cybck' : '' ">学生</span>
+				</div>
+				<div class="people">
+					<div class="people_top">
+						<div class="people_top_right">
+							<div class="people_search">
+							<el-input
+								placeholder="搜索成员名称"
+								v-model="searchTN"
+								@keyup.enter.native="getTeacher(addCyperType)"
+							></el-input>
+							<div class="search_img" @click="getTeacher(addCyperType)">
+								<img src="../assets/search.png" alt />
+							</div>
+							</div>
+						</div>
+						<div class="people_nav" style="display: flex; align-items: center">
+							<div class="check_class_left_title">选择成员</div>
+							<div style="display: flex; align-items: center; margin-left: auto">
+							<el-checkbox
+								v-model="checkAll"
+								@change="handleCheckAllChange2"
+								class="all_check"
+								>全选</el-checkbox
+							>
+							</div>
+						</div>
+					</div>
+					<div class="t_j_box" style="padding: 15px 10px 0;box-sizing: border-box;">
+						<div>姓名</div>
+						<div>账号</div>
+						<div>学校</div>
+					</div>
+					<el-checkbox-group
+						v-model="checkboxList3"
+						class="people_name"
+						@change="handleCheckedCitiesChange"
+						v-if="teacherJuri.length"
+						>
+						<el-checkbox
+							v-for="item in teacherJuri"
+							:key="item.userid"
+							:label="item.userid"
+						>
+							<div class="t_j_box">
+								<el-tooltip
+									placement="top"
+									:content="item.name ? item.name : '暂无姓名'"
+								>
+									<div>{{ item.name ? item.name : "暂无姓名" }}</div>
+								</el-tooltip>
+								<el-tooltip placement="top" :content="item.accountNumber.split('@')[0]">
+									<div>{{ item.accountNumber.split('@')[0] }}</div>
+								</el-tooltip>
+								<el-tooltip placement="top" :content="item.organizationname">
+									<div>{{ item.organizationname }}</div>
+								</el-tooltip>
+							</div>
+						</el-checkbox>
+					</el-checkbox-group>
+					<div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
+				</div>
+			</div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogaddCyperson = false">取 消</el-button>
                 <el-button type="primary" @click="addcyperson">确定</el-button>
@@ -512,6 +519,8 @@ export default {
     },
     data() {
         return {
+			addCyperType: 1, //1教师 2学生
+
             // 点击组织操作添加社区弹框
             dialogcommunity:false,
             // 打开添加信息组织弹框，存储的组织信息
@@ -1333,10 +1342,13 @@ export default {
 				});
         },
         // 添加社区人员获取人员列表
-        getTeacher() {
+         getTeacher(val = 1) {
+			this.addCyperType = val
+
             let params = {
                 oid: this.cyInfo.id,
                 inp: this.searchTN,
+				typ: this.addCyperType,
                 page: 1,
                 num: 10
             };
@@ -1625,4 +1637,26 @@ export default {
     flex-direction: column;
     gap: 15px;
 }
+.cypersonBox{
+	display: flex;
+	gap: 5px;
+}
+.cypersonBoxLeft{
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+	width: 100px;
+}
+
+.cypersonBox span{
+	width: 100%;
+	padding: 10px 0;
+	text-align: center;
+	border-radius: 5px;
+	cursor: pointer;
+}
+.cybck{
+    background: #308fff;
+    color: #fff;
+}
 </style>

src/components/schoolList.vue

@@ -385,11 +385,13 @@
             :before-close="handleClose2">
             <div class="cyConTit">
                 <div>人员列表</div>
-                <el-button type="primary" size="mini" @click="getTeacher">添加人员</el-button>
+                <el-button type="primary" size="mini" @click="getTeacher(addCyperType)">添加人员</el-button>
             </div>
              <el-table
                 :data="cypersontableData"
-                style="width: 100%" v-loading="cypersonloading">
+                style="width: 100%" 
+				height="600"
+				v-loading="cypersonloading">
                 <el-table-column
                     prop="name"
                     label="名称"
@@ -517,66 +519,72 @@
             :before-close="handleClose"
             class="addNewPP customWidth"
             >
-            <div class="people">
-            <div class="people_top">
-            <div class="people_top_right">
-                <div class="people_search">
-                <el-input
-                    placeholder="搜索成员名称"
-                    v-model="searchTN"
-                    @keyup.enter.native="getTeacher"
-                ></el-input>
-                <div class="search_img" @click="getTeacher">
-                    <img src="../assets/search.png" alt />
-                </div>
-                </div>
-            </div>
-            <div class="people_nav" style="display: flex; align-items: center">
-                <div class="check_class_left_title">选择成员</div>
-                <div style="display: flex; align-items: center; margin-left: auto">
-                <el-checkbox
-                    v-model="checkAll"
-                    @change="handleCheckAllChange2"
-                    class="all_check"
-                    >全选</el-checkbox
-                >
-                </div>
-            </div>
-            </div>
-            <div class="t_j_box" style="padding: 15px 10px 0;box-sizing: border-box;">
-                <div>姓名</div>
-                <div>账号</div>
-                <div>学校</div>
-            </div>
-            <el-checkbox-group
-                v-model="checkboxList3"
-                class="people_name"
-                @change="handleCheckedCitiesChange"
-                v-if="teacherJuri.length"
-                >
-                <el-checkbox
-                    v-for="item in teacherJuri"
-                    :key="item.userid"
-                    :label="item.userid"
-                >
-                    <div class="t_j_box">
-                        <el-tooltip
-                            placement="top"
-                            :content="item.name ? item.name : '暂无姓名'"
-                        >
-                            <div>{{ item.name ? item.name : "暂无姓名" }}</div>
-                        </el-tooltip>
-                        <el-tooltip placement="top" :content="item.accountNumber.split('@')[0]">
-                            <div>{{ item.accountNumber.split('@')[0] }}</div>
-                        </el-tooltip>
-                        <el-tooltip placement="top" :content="item.organizationname">
-                            <div>{{ item.organizationname }}</div>
-                        </el-tooltip>
-                    </div>
-                </el-checkbox>
-            </el-checkbox-group>
-            <div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
-        </div>
+			<div class="cypersonBox">
+				<div class="cypersonBoxLeft">
+					<span @click="getTeacher(1)" :class="addCyperType == 1 ? 'cybck' : '' ">教师</span>
+					<span @click="getTeacher(2)" :class="addCyperType == 2 ? 'cybck' : '' ">学生</span>
+				</div>
+				<div class="people">
+					<div class="people_top">
+						<div class="people_top_right">
+							<div class="people_search">
+							<el-input
+								placeholder="搜索成员名称"
+								v-model="searchTN"
+								@keyup.enter.native="getTeacher(addCyperType)"
+							></el-input>
+							<div class="search_img" @click="getTeacher(addCyperType)">
+								<img src="../assets/search.png" alt />
+							</div>
+							</div>
+						</div>
+						<div class="people_nav" style="display: flex; align-items: center">
+							<div class="check_class_left_title">选择成员</div>
+							<div style="display: flex; align-items: center; margin-left: auto">
+							<el-checkbox
+								v-model="checkAll"
+								@change="handleCheckAllChange2"
+								class="all_check"
+								>全选</el-checkbox
+							>
+							</div>
+						</div>
+					</div>
+					<div class="t_j_box" style="padding: 15px 10px 0;box-sizing: border-box;">
+						<div>姓名</div>
+						<div>账号</div>
+						<div>学校</div>
+					</div>
+					<el-checkbox-group
+						v-model="checkboxList3"
+						class="people_name"
+						@change="handleCheckedCitiesChange"
+						v-if="teacherJuri.length"
+						>
+						<el-checkbox
+							v-for="item in teacherJuri"
+							:key="item.userid"
+							:label="item.userid"
+						>
+							<div class="t_j_box">
+								<el-tooltip
+									placement="top"
+									:content="item.name ? item.name : '暂无姓名'"
+								>
+									<div>{{ item.name ? item.name : "暂无姓名" }}</div>
+								</el-tooltip>
+								<el-tooltip placement="top" :content="item.accountNumber.split('@')[0]">
+									<div>{{ item.accountNumber.split('@')[0] }}</div>
+								</el-tooltip>
+								<el-tooltip placement="top" :content="item.organizationname">
+									<div>{{ item.organizationname }}</div>
+								</el-tooltip>
+							</div>
+						</el-checkbox>
+					</el-checkbox-group>
+					<div style="text-align: center; margin-top: 10px" v-else>暂无数据</div>
+				</div>
+			</div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogaddCyperson = false">取 消</el-button>
                 <el-button type="primary" @click="addcyperson">确定</el-button>
@@ -666,6 +674,7 @@ export default {
 			graName:'',
 			graoid:'',
 			graclaid:'',
+			addCyperType: 1, //1教师 2学生
 			isaddGra:0, //0是添加 1是修改
 			// 点击组织操作添加社区弹框
             dialogcommunity:false,
@@ -1679,10 +1688,12 @@ export default {
 				});
         },
         // 添加社区人员获取人员列表
-        getTeacher() {
+        getTeacher(val = 1) {
+			this.addCyperType = val
             let params = {
                 oid: this.cyInfo.org ? this.cyInfo.org : this.cyInfo.id,
                 inp: this.searchTN,
+				typ: this.addCyperType,
                 page: 1,
                 num: 10
             };
@@ -1982,4 +1993,26 @@ export default {
 	flex-direction: column;
 	gap: 10px;
 }
+.cypersonBox{
+	display: flex;
+	gap: 5px;
+}
+.cypersonBoxLeft{
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+	width: 100px;
+}
+
+.cypersonBox span{
+	width: 100%;
+	padding: 10px 0;
+	text-align: center;
+	border-radius: 5px;
+	cursor: pointer;
+}
+.cybck{
+    background: #308fff;
+    color: #fff;
+}
 </style>