555

src/views/system/graduateStudent/UserForm.vue

@@ -45,6 +45,36 @@
           </el-form-item>
         </el-col>
       </el-row>
+
+      <el-row  v-if="formType === 'create-S' || formType === 'update-S'">
+        <el-col :span="12">
+          <el-form-item label="专业" prop="major">
+            <!-- <el-input v-model="formData.major" placeholder="请输入专业" /> -->
+            <el-select v-model="formData.major" placeholder="请选择专业">
+              <el-option
+                v-for="option in majorOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专硕" prop="masterType">
+            <!-- <el-input v-model="formData.masterType" placeholder="请输入学位类型" /> -->
+            <el-select v-model="formData.masterType" placeholder="请选择学位类型">
+              <el-option
+                v-for="option in masterTypeOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
@@ -189,7 +219,9 @@ const formData = ref({
   supervisor:'',
   supervisorId:'',
   supervisorMobile: '',
-  workPlace:""
+  workPlace:"",
+  major: "",
+  masterType: "",
 })
 const formRules = reactive<FormRules>({
   nickname: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
@@ -237,6 +269,19 @@ const gradeOptions = computed(() => {
   ];
 });
 
+// 获取所有专业
+const majorOptions = [
+  { value: '测绘工程' },
+  { value: '地理信息系统' },
+  { value: '遥感科学' },
+]
+
+// 获取所有学位类型
+const masterTypeOptions = [
+  { value: '硕士' },
+  { value: '博士' },
+]
+
 //获取所有导师
 const users = ref()
 const getSupervisor= async () => {
@@ -329,7 +374,9 @@ const resetForm = () => {
     supervisor:'',
     supervisorId:'',
     supervisorMobile: '',
-    workPlace:""
+    workPlace:"",
+    major: "",
+    masterType: "",
   }
   formRef.value?.resetFields()
 }

src/views/system/graduateStudent/index.vue

@@ -53,6 +53,24 @@
               class="!w-240px"
             />
           </el-form-item>
+          <el-form-item label="专业" prop="major">
+            <el-input
+              v-model="queryParams.major"
+              placeholder="请输入专业"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item label="专硕" prop="masterType"> 
+            <el-input
+              v-model="queryParams.masterType"
+              placeholder="请输入学位类型"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
@@ -192,6 +210,8 @@
 
           <el-table-column label="年级" align="center" prop="grade" width="120" />
           <el-table-column label="学号" align="center" prop="userNumber" width="150" />
+          <el-table-column label="专业" align="center" prop="major" width="120" />
+          <el-table-column label="专硕" align="center" prop="masterType" width="120" />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
           <el-table-column label="邮箱" align="center" prop="email" width="120" />
 
@@ -347,6 +367,8 @@ const queryParams = reactive({
   grade: undefined,
   userNumber: undefined,
   email: undefined,
+  major: undefined,
+  masterType: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 

src/views/system/workroomCollege/user/UserForm.vue

@@ -26,6 +26,34 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row  v-if="formType === 'create-S' || formType === 'update-S'">
+        <el-col :span="12">
+          <el-form-item label="专业" prop="major">
+            <!-- <el-input v-model="formData.major" placeholder="请输入专业" /> -->
+            <el-select v-model="formData.major" placeholder="请选择专业">
+              <el-option
+                v-for="option in majorOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专硕" prop="masterType">
+            <!-- <el-input v-model="formData.masterType" placeholder="请输入学位类型" /> -->
+            <el-select v-model="formData.masterType" placeholder="请选择学位类型">
+              <el-option
+                v-for="option in masterTypeOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
@@ -151,16 +179,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
-          <el-form-item label="专业" prop="major" v-if="formType === 'create-S' || formType === 'update-S'">
-            <el-input v-model="formData.major" placeholder="请输入专业" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" v-if="formType === 'create-S' || formType === 'update-S'">
-          <el-form-item label="学位类型" prop="masterType" v-if="formType === 'create-S' || formType === 'update-S'">
-            <el-input v-model="formData.masterType" placeholder="请输入学位类型" />
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <!-- <el-row>
@@ -293,6 +311,19 @@ const userTypes = computed(() => {
   return types;
 });
 
+// 获取所有专业
+const majorOptions = [
+  { value: '测绘工程' },
+  { value: '地理信息系统' },
+  { value: '遥感科学' },
+]
+
+// 获取所有学位类型
+const masterTypeOptions = [
+  { value: '硕士' },
+  { value: '博士' },
+]
+
 
 //获取所有导师
 const users = ref()

src/views/system/workroomCollege/user/student.vue

@@ -44,6 +44,24 @@
               class="!w-240px"
             />
           </el-form-item>
+          <el-form-item label="专业" prop="major">
+            <el-input
+              v-model="queryParams.major"
+              placeholder="请输入专业"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item label="专硕" prop="masterType"> 
+            <el-input
+              v-model="queryParams.masterType"
+              placeholder="请输入学位类型"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item> 
           <el-form-item label="手机号码" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
@@ -178,6 +196,8 @@
             prop="userNumber"
             :show-overflow-tooltip="true"
           />
+          <el-table-column label="专业" align="center" prop="major" width="120" />
+          <el-table-column label="专硕" align="center" prop="masterType" width="120" />
           <el-table-column
             label="工作间"
             align="center"
@@ -350,6 +370,8 @@ const queryParams = reactive({
   isGraduate: undefined,
   supervisor: undefined,
   supervisorId: undefined,
+  major: undefined,
+  masterType: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 

src/views/system/workroomTeacher/user/UserForm.vue

@@ -27,6 +27,34 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row  v-if="formType === 'create-S' || formType === 'update-S'">
+        <el-col :span="12">
+          <el-form-item label="专业" prop="major">
+            <!-- <el-input v-model="formData.major" placeholder="请输入专业" /> -->
+            <el-select v-model="formData.major" placeholder="请选择专业">
+              <el-option
+                v-for="option in majorOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="专硕" prop="masterType">
+            <!-- <el-input v-model="formData.masterType" placeholder="请输入学位类型" /> -->
+            <el-select v-model="formData.masterType" placeholder="请选择学位类型">
+              <el-option
+                v-for="option in masterTypeOptions"
+                :key="option.value"
+                :label="option.value"
+                :value="option.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号码" prop="mobile">
@@ -266,6 +294,20 @@ const userTypes = computed(() => {
   return types;
 });
 
+// 获取所有专业
+const majorOptions = [
+  { value: '测绘工程' },
+  { value: '地理信息系统' },
+  { value: '遥感科学' },
+]
+
+// 获取所有学位类型
+const masterTypeOptions = [
+  { value: '硕士' },
+  { value: '博士' },
+]
+
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true;

src/views/system/workroomTeacher/user/student.vue

@@ -39,6 +39,24 @@
               class="!w-240px"
             />
           </el-form-item>
+          <el-form-item label="专业" prop="major">
+            <el-input
+              v-model="queryParams.major"
+              placeholder="请输入专业"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
+          <el-form-item label="专硕" prop="masterType"> 
+            <el-input
+              v-model="queryParams.masterType"
+              placeholder="请输入学位类型"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+            />
+          </el-form-item>
           <!-- <el-form-item label="工作间" prop="deptName">
             <el-input v-model="queryParams.deptName" placeholder="请输入工作间" clearable @keyup.enter="handleQuery" class="!w-240px" />
           </el-form-item> -->
@@ -150,6 +168,8 @@
             prop="userNumber"
             :show-overflow-tooltip="true"
           />
+          <el-table-column label="专业" align="center" prop="major" width="120" />
+          <el-table-column label="专硕" align="center" prop="masterType" width="120" />
           <!-- <el-table-column
             label="工作间"
             align="center"
@@ -307,6 +327,8 @@ const queryParams = reactive({
   deptName: undefined,
   createTime: [],
   isGraduate: undefined,
+  major: undefined,
+  masterType: undefined,
 })
 const queryFormRef = ref() // 搜索的表单