学生资助、学生奖惩等内容提交

src/views/teacher/basicmessage/index.vue

@@ -100,6 +100,9 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="职称" prop="professionalTitle" style="margin-left: 80px;">
+            <el-input v-model="form.professionalTitle" placeholder="请输入职称" />
+          </el-form-item>
           <br>
           <el-form-item label="参加工作时间" prop="joinWorkHours">
             <el-input v-model="form.joinWorkHours" placeholder="请输入参加工作时间" />
@@ -125,62 +128,14 @@
             <el-input v-model="form.email" placeholder="请输入电子邮箱" />
           </el-form-item>
           <el-divider content-position="center">带班情况</el-divider>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-plus" size="mini"
-                         @click="handleAddSysTeacherTakeclass"
-              >添加</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="danger" icon="el-icon-delete" size="mini"
-                         @click="handleDeleteSysTeacherTakeclass"
-              >删除</el-button>
-            </el-col>
-          </el-row>
           <el-table ref="sysTeacherTakeclass" :data="sysTeacherTakeclassList"
-                    :row-class-name="rowSysTeacherTakeclassIndex" @selection-change="handleSysTeacherTakeclassSelectionChange"
+                    :row-class-name="rowSysTeacherTakeclassIndex"
           >
-            <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="序号" align="center" prop="index" width="50" />
-            <el-table-column label="带班学院" prop="college" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.college" placeholder="请选择带班学院"
-                           @change="getGrade(scope.row)"
-                >
-                  <el-option v-for="item in collegeList" :key="item.label" :label="item.label"
-                             :value="item.label"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班年级" prop="grade" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.grade" :disabled="scope.row.setGrade"
-                           placeholder="请选择带班年级" @change="getClass(scope.row)"
-                >
-                  <el-option v-for="item in gradeList" :label="item.gradeName"
-                             :value="item.gradeName"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班班级" prop="classteam" width="150">
-              <template slot-scope="scope">
-
-                <el-select v-model="scope.row.classteam" :disabled="scope.row.setClass"
-                           placeholder="请选择带班班级"
-                >
-                  <el-option v-for="item in classList" :label="item.className"
-                             :value="item.className"
-                  />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="带班人数" prop="number" width="150">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.number" placeholder="请输入带班人数" />
-              </template>
-            </el-table-column>
+            <el-table-column label="序号" align="center" prop="index" width="60" />
+            <el-table-column label="学院" prop="deptName" width="180" />
+            <el-table-column label="专业" prop="majorName" width="200" />
+            <el-table-column label="班级" prop="className" width="200" />
+            <el-table-column label="总人数" prop="stuCount" width="120" />
           </el-table>
         </el-form>
 
@@ -278,7 +233,7 @@ import {
 	delAchievementcheck
 } from '@/api/teacher/achievementcheck'
 //获取学院、年级、班级信息
-import { listClass, getClass, delClass, addClass, updateClass, getMajorsName } from '@/api/stuCQS/basedata/class'
+import { listClass, getClass, delClass, addClass, updateClass, getMajorsName, listOwnClass } from '@/api/stuCQS/basedata/class'
 import { listGrade, getGrade, queryGrade } from '@/api/stuCQS/basedata/grade'
 import { getDeptName } from '@/api/system/dept'
 export default {
@@ -454,6 +409,7 @@ export default {
 				level2units: null,
 				serviceHours: null,
 				jobNature: null,
+				professionalTitle: null,
 				joinWorkHours: null,
 				highestEducation: null,
 				educated: null,
@@ -466,33 +422,8 @@ export default {
 			},
 			// 表单参数
 			form: {},
-			// 表单校验
-			rules: {
-				teacherId: [{ validator: validateAwardTime, trigger: 'blur' }],
-				name: [{ validator: validateAwardTime, trigger: 'blur' }],
-				gender: [{ validator: validateAwardTime, trigger: 'blur' }],
-				birthday: [{ validator: validateAwardTime, trigger: 'blur' }],
-				nation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				photo: [{ validator: validateAwardTime, trigger: 'blur' }],
-				political: [{ validator: validateAwardTime, trigger: 'blur' }],
-				wechat: [{ validator: validateWechat, trigger: 'blur' }],
-				address: [{ validator: validateAwardTime, trigger: 'blur' }],
-				identity: [{ validator: validateIdentity, trigger: 'blur' }],
-				qqnumber: [{ validator: validateQqnumber, trigger: 'blur' }],
-				marriage: [{ validator: validateAwardTime, trigger: 'blur' }],
-				anotherDuties: [{ validator: validateAwardTime, trigger: 'blur' }],
-				level2units: [{ validator: validateAwardTime, trigger: 'blur' }],
-				serviceHours: [{ validator: validateAwardTime, trigger: 'blur' }],
-				jobNature: [{ validator: validateAwardTime, trigger: 'blur' }],
-				joinWorkHours: [{ validator: validateAwardTime, trigger: 'blur' }],
-				highestEducation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				educated: [{ validator: validateAwardTime, trigger: 'blur' }],
-				study: [{ validator: validateAwardTime, trigger: 'blur' }],
-				lastestEducation: [{ validator: validateAwardTime, trigger: 'blur' }],
-				awardingInstitutions: [{ validator: validateAwardTime, trigger: 'blur' }],
-				email: [{ validator: validateAwardTime, trigger: 'blur' }],
-				phone: [{ validator: validatePhone, trigger: 'blur' }],
-			},
+			// 表单校验（已按要求取消非必填校验）
+			rules: {},
 			collegeList: [],//学院列表
 			gradeList: [],//年级列表
 			classList: [],//班级列表
@@ -501,6 +432,7 @@ export default {
 	created() {
 		this.getList()
 		this.getUser()
+		this.getOwnClassList()
 	},
 	methods: {
 		/** 查询basicMessage列表 */
@@ -524,6 +456,19 @@ export default {
 				this.loading = false
 			})
 		},
+		// 从“我的班级”拉取带班信息列表
+		async getOwnClassList() {
+			try {
+				const res = await listOwnClass()
+				if (res && res.code === 200) {
+					this.sysTeacherTakeclassList = Array.isArray(res.rows)
+						? res.rows
+						: (Array.isArray(res.data) ? res.data : [])
+				}
+			} catch (e) {
+				// 忽略错误，保持页面可用
+			}
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false
@@ -548,6 +493,7 @@ export default {
 				level2units: null,
 				serviceHours: null,
 				jobNature: null,
+				professionalTitle: null,
 				joinWorkHours: null,
 				highestEducation: null,
 				educated: null,
@@ -588,7 +534,6 @@ export default {
 			const teacherId = row.teacherId || this.ids
 			getBasicmessage(teacherId).then(response => {
 				this.form = response.data
-				this.sysTeacherTakeclassList = response.data.sysTeacherTakeclassList
 				this.open = true
 				this.title = '修改基础信息'
 			})
@@ -696,7 +641,6 @@ export default {
 				getBasicmessage(teacherIds).then(response => {
 					if (response.data != undefined) {
 						this.form = response.data
-						this.sysTeacherTakeclassList = response.data.sysTeacherTakeclassList
 						this.open = true
 						this.title = '修改基础信息'
 					} else {