qd

src/views/bpm/processInstance/detail/index.vue

@@ -229,7 +229,7 @@ const handleAudit = async (task, pass) => {
 /** 转派审批人 */
 const taskTransferFormRef = ref()
 const openTaskUpdateAssigneeForm = (id: string) => {
-  taskTransferFormRef.value.open(id)ddsdsdsdddddddddsdsd
+  taskTransferFormRef.value.open(id)
 }
 
 /** 处理审批退回的操作 */

src/views/system/studentSelection/studentSelectSupervisorRecord/studentSelectSupervisorRecordForm.vue

@@ -13,7 +13,7 @@
       @submit.prevent="handleFormSubmit"
     >
       <!-- 学生信息 -->
-      <div class="section"  v-if="userInfo.userType==='4' ||userInfo.userType==='3'" >
+      <div class="section"  v-if="userInfo.userType==='4' || userInfo.userType==='3'|| userInfo.userType==='5'" >
         <el-row>
           <el-col :span="11">
             <el-form-item label="学生姓名">
@@ -48,7 +48,7 @@
       </div>
 
       <!-- 学生志愿 -->
-      <div class="section" v-if="userInfo.userType !== '4' || formType === 'end'">
+      <div class="section" v-if="userInfo.userType !== '4' || formType === 'end' || userInfo.userType==='5'">
         <h4>学生志愿</h4>
         <el-row>
           <el-col :span="12">
@@ -92,13 +92,13 @@
                 </div>
               </div>
               <div v-if="formType !== 'create'">
-                <p v-if="userInfo.userType==='3' || formType === 'end'">★ 本人签字</p>
+                <p v-if="userInfo.userType==='3'|| userInfo.userType==='5' || formType === 'end'">★ 本人签字</p>
                 <div>
-                  <img v-if="(userInfo.userType==='3' || formType === 'end') && formData.studentSignature" :src="formData.studentSignature" alt="学生签名" style="width: 300px; height: 100px; margin-right: 10px; background-color: white;"/>
+                  <img v-if="(userInfo.userType==='3'|| userInfo.userType==='5' || formType === 'end') && formData.studentSignature" :src="formData.studentSignature" alt="学生签名" style="width: 300px; height: 100px; margin-right: 10px; background-color: white;"/>
                   <img v-else src="/none.png" />
                 </div>
                 <div>
-                  <p v-if="(userInfo.userType==='3' || formType === 'end') && formData.studentSignature">日期：{{formattedStudentSignDate}}</p>
+                  <p v-if="(userInfo.userType==='3'|| userInfo.userType==='5' || formType === 'end') && formData.studentSignature">日期：{{formattedStudentSignDate}}</p>
                   <p v-else></p>
                 </div>
               </div>
@@ -107,7 +107,7 @@
         </el-row>
       </div>
       <!-- 导师意见 -->
-      <div class="section" v-if="userInfo.userType==='3'&& formType !== 'end'">
+      <div class="section" v-if="(userInfo.userType==='3' || userInfo.userType==='5')&& formType !== 'end'">
         <p style="margin-bottom: 10px;">导师意见:同意</p>
         <p style="margin-bottom: 10px;">导师签字</p>
         <div v-show="lastSupervisorSignature">
@@ -124,7 +124,16 @@
           </div>
         </div>
         <div v-show="!lastSupervisorSignature">
-          ;
+          <canvas
+            id="canvasT"
+            ref="canvasT"
+            width="400"
+            height="100"
+            @mousedown="handleMouseDownT"
+            @mousemove="handleMouseMoveT"
+            @mouseup="handleMouseUp"
+            style="border:1px solid #e0e0e0; border-radius: 4px; background-color: white;"
+          ></canvas>
           <div style="display: flex; justify-content: flex-start; margin-top: 10px;">
             <el-button type="primary" @click="handleSupervisorSignatureSave" size="small">保存</el-button>
             <el-button  @click="ClearSupervisorSignature" size="small">清空</el-button>
@@ -719,7 +728,7 @@ const handleFormSubmit = () => {
   console.log('Form submit prevented');
 };
 
-const isSupervisor = computed(() => userInfo.value.userType === '3');
+const isSupervisor = computed(() => userInfo.value.userType === '3' || userInfo.value.userType==='5');
 
 // 直接改导师（志愿编辑）
 const handleSupervisorChange = (supervisorId?:number) => {
@@ -747,7 +756,7 @@ const resetForm = () => {
 onMounted( async () => {
   getSupervisor()
   getUserInfo()
-  if (userInfo.value.userType === '3'){
+  if (userInfo.value.userType === '3' || userInfo.value.userType==='5'){
     await getSupervisorSignature()
   }
 })

src/views/system/studentSelection/studentSelectionNo/index.vue

@@ -73,9 +73,10 @@
         type="primary"
         @click="exportExcel"
         :loading="exportLoading"
-        v-hasPermi="['system:user:exportStudentUnPassedExcel']"
       >
-        批量导出
+<!--        v-hasPermi="['system:user:exportStudentUnPassedExcel']"-->
+
+        Excel导出
       </el-button>
     </el-form-item>
     </el-form>

src/views/system/studentSelection/studentSelectionProject/index.vue

@@ -150,19 +150,19 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="120px" >
-        <template #default="scope">
-          <!--学院查看招生详情-->
-          <el-button
-            type="text"
-            @click="openStudentSelectSupervisorRecord2(scope.row.projectId,scope.row.supervisorId)"
-            v-hasPermi="['system:student-select-supervisor-record:query']"
-          >
-            <Icon icon="ep:bell" />
-            招生详情
-          </el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" min-width="120px" >-->
+<!--        <template #default="scope">-->
+<!--          &lt;!&ndash;学院查看招生详情&ndash;&gt;-->
+<!--          <el-button-->
+<!--            type="text"-->
+<!--            @click="openStudentSelectSupervisorRecord2(scope.row.projectId,scope.row.supervisorId)"-->
+<!--            v-hasPermi="['system:student-select-supervisor-record:query']"-->
+<!--          >-->
+<!--            <Icon icon="ep:bell" />-->
+<!--            招生详情-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
   </ContentWrap>
   <!-- 导师详情弹窗-->

src/views/system/studentSelection/studentSelectionYes/index.vue

@@ -77,9 +77,10 @@
         type="primary"
         @click="exportExcel"
         :loading="exportLoading"
-        v-hasPermi="['system:user:exportStudentPassedExcel']"
       >
-        批量导出
+<!--        v-hasPermi="['system:user:exportStudentPassedExcel']"-->
+
+        Excel导出
       </el-button>
     </el-form-item>
     </el-form>

src/views/system/supervisorSelectionSetting/index.vue

@@ -141,43 +141,38 @@
       </el-table-column>
 
       <!--  学生志愿填报 -->
-      <el-table-column label="志愿填报" align="center" min-width="120px"  v-if=" userInfo?.userType === '1' && selectStatus.value === 0">
+      <el-table-column label="志愿填报" align="center" min-width="120px"  v-if=" userInfo?.userType === '1'   ">
         <template #default="scope">
           <el-button
             type="primary"
             link
             @click="openStudentSelectSupervisorPop('create', scope.row.projectId,scope.row.supervisorId)"
             v-hasPermi="['system:student-select-supervisor-record:create']"
-            v-if="userInfo?.userType === '1'"
+            v-if="userInfo?.userType === '1' && selectStatus === 0"
           >
             <Icon icon="ep:bell" />
             选择
           </el-button>
-        </template>
-      </el-table-column>
-      <!--  学生志愿填报后直接跳转记录页面 -->
-      <el-table-column label="详情" align="center" min-width="120px"  v-if=" userInfo?.userType === '1' && selectStatus.value !== 0">
-        <template #default="scope">
           <el-button
-            type="primary"
-            link
-            @click="openRecord()"
-            v-if="scope.row.selectType"
+              type="primary"
+              link
+              @click="openRecord()"
+              v-hasPermi="['system:student-select-supervisor-record:create']"
+              v-else-if="userInfo?.userType === '1' && selectStatus !== 0"
           >
             <Icon icon="ep:bell" />
             详情
           </el-button>
-        </template>  
+        </template>
       </el-table-column>
 
-
       <el-table-column label="操作" align="center" min-width="120px" v-if="userInfo?.userType === '4'" >
         <template #default="scope">
           <!--学院查看招生详情-->
           <el-button 
             type="text"  
             v-if="userInfo?.userType === '4'" 
-            @click="openStudentSelectSupervisorRecord(scope.row.projectId,scope.row.supervisorId)" 
+            @click="openStudentSelectSupervisorRecord(scope.row.projectId,scope.row.supervisorId)"
             v-hasPermi="['system:student-select-supervisor-record:query']"
           >
             <Icon icon="ep:bell" />

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

@@ -52,17 +52,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <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>
@@ -126,8 +116,25 @@
         </el-col>
         <el-col :span="12" v-if="formType === 'create-T' || formType === 'update-T'">
           <el-form-item label="用户类型" prop="userType">
-            <el-input  v-model="userTypeT" value="导师" placeholder="导师" :disabled="true"/>
+            <el-select
+                class="!w-full"
+                v-model="formData.userType"
+                placeholder="请选择导师类型"
+                clearable
+                filterable
+            >
+              <el-option
+                  v-for="option in userTypes"
+                  :key="option.value"
+                  :label="option.label"
+                  :value="option.value"
+              />
+            </el-select>
           </el-form-item>
+
+<!--          <el-form-item label="用户类型" prop="userType">-->
+<!--            <el-input  v-model="userTypeT" value="导师" placeholder="导师" :disabled="true"/>-->
+<!--          </el-form-item>-->
           <!-- <el-form-item label="用户类型" prop="userType">
             <span style="margin-left: 10px;">导师</span>
             <input type="hidden" v-model="formData.userType" value="3" />
@@ -185,7 +192,22 @@
         </el-col>
       </el-row>
 
-      
+      <el-row>
+        <el-col :span="12">
+         <el-form-item label="硕士类型" prop="masterType" v-if="formType === 'create-S' || formType === 'update-S'">
+           <el-select v-model="formData.masterType" placeholder="请选择学位类型">
+             <el-option
+               v-for="option in masterTypeOptions"
+               :key="option.key"
+               :label="option.value"
+               :value="option.key"
+             />
+           </el-select>
+         </el-form-item>
+        </el-col>
+
+      </el-row>
+
 
       <!-- <el-row>
         <el-col :span="24" v-if="formType === 'update-S'">
@@ -273,22 +295,7 @@ const formRules = reactive<FormRules>({
   username: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
   nickname: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
   // password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
-  email: [
-    { required: true, message: '邮箱不能为空', trigger: 'blur' }, // 确保这是必填
-    {
-      type: 'email',
-      message: '请输入正确的邮箱地址',
-      trigger: ['blur', 'change']
-    }
-  ],
-  mobile: [
-    { required: true, message: '手机号码不能为空', trigger: 'blur' },
-    {
-      pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
-      message: '请输入正确的手机号码',
-      trigger: 'blur'
-    }
-  ],
+
   parentMobile: [
     { required: true, message: '家长号码不能为空', trigger: 'blur' }, // 确保这是必填
     {
@@ -314,7 +321,8 @@ const userTypes = computed(() => {
     types.push({ label: '毕业生', value: "2" });
   }
   if (formType.value === 'create-T' || formType.value === 'update-T') {
-    types.push({ label: '导师', value: "3" });
+    types.push({ label: '校内导师', value: "3" });
+    types.push({ label: '校外导师', value: "5" });
   }
   return types;
 });
@@ -339,8 +347,8 @@ const majorOptions = [
 
 // 获取所有学位类型
 const masterTypeOptions = [
-  { value: '学硕' },
-  { value: '专硕' },
+  { key:2, value: '学硕' },
+  { key:1, value: '专硕' },
 ]